diff options
| author | Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> | 2019-09-15 10:56:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 10:56:16 +0300 |
| commit | 7d4406254a6ad5d98ad0664ea5d65ac5b1b69c75 (patch) | |
| tree | fb6291c82b6bf6d89b6a98ff65a9d8535d149891 | |
| parent | aba4b722af9eb7bcf7dcc75038e4b6346bbb6387 (diff) | |
| parent | 70091726c93fb9330007407aad0b00183b511f03 (diff) | |
Merge branch 'master' into fix_urlscheme_warning
206 files changed, 31224 insertions, 18528 deletions
diff --git a/.drone.yml b/.drone.yml index d750c5519..9410c1bb5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -328,7 +328,26 @@ trigger: event: - pull_request - push +--- +kind: pipeline +name: Debian +steps: +- name: build + image: nextcloudci/client-debian-ci:client-debian-ci-2 + commands: + - /bin/bash -c "./admin/linux/debian/drone-build.sh" + environment: + DEBIAN_SECRET_KEY: + from_secret: DEBIAN_SECRET_KEY + DEBIAN_SECRET_IV: + from_secret: DEBIAN_SECRET_IV +trigger: + branch: + - master + event: + - pull_request + - push --- kind: pipeline name: Documentation diff --git a/.github/issue_template.md b/.github/issue_template.md index 6238a82ba..7bcd37e0a 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,9 +1,14 @@ -<!--- -Please try to only report a bug if it happens with the latest version -The latest version can be seen by checking https://download.nextcloud.com/desktop/ -For support try our forums: https://help.nextcloud.com ----> - +<!-- +Dear user, +Please understand that at the moment, we are very busy with customer issues +and some high priority development work. A lot of issues are getting reported. +Right now we can't keep up and timely respond to all of them. +We're sorry for that and are expanding our team, if you're looking for a C++ +job or know somebody who is, please point them to https://nextcloud.com/jobs +Don't forget that Github is not a support system or a place to ask for +features but only a place to report verified bugs - see nextcloud.com/support +for support options! +--> ### Expected behaviour Tell us what should happen @@ -18,6 +23,11 @@ Tell us what happens instead ### Client configuration Client version: +<!--- +Please try to only report a bug if it happens with the latest version +The latest version can be seen by checking https://download.nextcloud.com/desktop/ +For support try our forums: https://help.nextcloud.com +---> Operating system: @@ -34,15 +44,6 @@ Installation path of client: <!--- Optional section. It depends on the issue. ---> - -Operating system: - -Web server: - -Database: - -PHP version: - Nextcloud version: Storage backend (external storage): @@ -52,8 +53,6 @@ Storage backend (external storage): Please use Gist (https://gist.github.com/) or a similar code paster for longer logs. -```Template for output < 10 lines``` - 1. Client logfile: Output of `nextcloud --logwindow` or `nextcloud --logfile log.txt` (On Windows using `cmd.exe`, you might need to first `cd` into the Nextcloud directory) (See also https://docs.nextcloud.com/desktop/2.3/troubleshooting.html#log-files) diff --git a/.gitignore b/.gitignore index 0b9b16727..27472ed92 100644 --- a/.gitignore +++ b/.gitignore @@ -15,9 +15,18 @@ cscope.* tags t1.cfg +## Ignore Visual Studio Code config & environment files + +.vs/ +.vscode/ + ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. +# CMake integration on VS2019+ + +CMakeSettings.json + # User-specific files *.suo *.user @@ -171,3 +180,4 @@ CPackConfig.cmake CPackOptions.cmake CPackSourceConfig.cmake +compile_commands.json diff --git a/.tx/nextcloud.client-desktop/de_translation b/.tx/nextcloud.client-desktop/de_translation index 09564e030..e3d9ad406 100644 --- a/.tx/nextcloud.client-desktop/de_translation +++ b/.tx/nextcloud.client-desktop/de_translation @@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3 # Translations -Icon[de_DE]=@APPLICATION_ICON_NAME@ -Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation -Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation -GenericName[de_DE]=Synchronisationsordner +Icon[de]=@APPLICATION_ICON_NAME@ +Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation +Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation +GenericName[de]=Synchronisationsordner diff --git a/.tx/nextcloud.client-desktop/hr_translation b/.tx/nextcloud.client-desktop/hr_translation index 467dd56a6..ad7a34f14 100644 --- a/.tx/nextcloud.client-desktop/hr_translation +++ b/.tx/nextcloud.client-desktop/hr_translation @@ -198,6 +198,7 @@ X-GNOME-Autostart-Delay=3 # Translations -Name[hr]=sinkronizacija računala -Comment[hr]=klijent za sinkronizaciju računala +Icon[hr]=@APPLICATION_ICON_NAME@ +Name[hr]=@APPLICATION_NAME@ klijent za sink. računala +Comment[hr]=@APPLICATION_NAME@ klijent za sinkronizaciju računala GenericName[hr]=Sinkronizacija mapa diff --git a/.tx/nextcloud.client-desktop/mk_translation b/.tx/nextcloud.client-desktop/mk_translation new file mode 100644 index 000000000..e4dd36e86 --- /dev/null +++ b/.tx/nextcloud.client-desktop/mk_translation @@ -0,0 +1,204 @@ +[Desktop Entry] +Categories=Utility;X-SuSE-SyncUtility; +Type=Application +Exec=@APPLICATION_EXECUTABLE@ +Name=@APPLICATION_NAME@ desktop sync client +Comment=@APPLICATION_NAME@ desktop synchronization client +GenericName=Folder Sync +Icon=@APPLICATION_ICON_NAME@ +Keywords=@APPLICATION_NAME@;syncing;file;sharing; +X-GNOME-Autostart-Delay=3 +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations + + +# Translations +Icon[mk]=@APPLICATION_ICON_NAME@ +Name[mk]=@APPLICATION_NAME@ клиент за синхронизација на компјутер +Comment[mk]=@APPLICATION_NAME@ клиент за синхронизација на компјутер +GenericName[mk]=Папка за синхронизација diff --git a/.tx/nextcloud.client-desktop/pt_BR_translation b/.tx/nextcloud.client-desktop/pt_BR_translation index 73979d5e2..c9b711e96 100644 --- a/.tx/nextcloud.client-desktop/pt_BR_translation +++ b/.tx/nextcloud.client-desktop/pt_BR_translation @@ -201,4 +201,4 @@ X-GNOME-Autostart-Delay=3 Icon[pt_BR]=@APPLICATION_ICON_NAME@ Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop -GenericName[pt_BR]=Sincronizar Pasta +GenericName[pt_BR]=Sincronizar pasta @@ -1,5 +1,138 @@ -ChangeLog -========= +2.5 Series ChangeLog +==================== + +version 2.5.3 (release 2019-07-22) +* Fix empty file wording in error log (small) +* Add Qt-5.12 to CI +* Fix a minor typo +* Libcloudproviders: Add missing check for Qt5DBus +* Fix several memory leaks in cloudproviders and add translation support +* Share link fixing +* New drone config +* Uses configuraion to determine if it should show empty folder popup. +* Simplify cmake command to make copy-pastable +* Updated default remote poll to 5 seconds #1115 +* Fix memory leak with device pointer +* Added a nice UI for the E2E-enabled account first connect +* This should fix issue #1000 +* Adds parameter to retrieve shares with its reshares. +* Fixed typo +* Fixed typo in "certificate" +* WebView: Properly handle usernames with spaces and plus signs in it +* Add error category for http file lock error status 423. +* Displays the uid_owner of a shared file. +* Minor text change in the link to help in the tab 'General'. + +version 2.5.2 (release 2019-04-11) +* Handle spaces in username properly in login flow +* Wizard: show an error message if there is no enough free space in the local folder +* Removed whitespace from string +* Do not add double slash to login flow url +* Fix login flow with system proxy +* Start with easier theming +* Do not display dismissed notifications +* Fixed l18n issue. Added space for separating string +* Add invalid certiticate messagebox +* Correct app passwords link +* Be less verbose with logging +* Fix typo in translation string +* Add a command line option to launch the client in the background +* Support Ubuntu Disco Dingo +* Added missing Include +* Make sure _profile and _page are deleted in the correct order +* Fix KDEInstallDirs deprecation warnings +* Removed Stylesheet + +version 2.5.1 (release 2019-01-06) +* Fixup the port in server notification URLs +* GUI: let Clang-Tidy modernize nullptr & override usage +* Improve the slide show +* Libsync: let Clang-Tidy modernize nullptr & override usage +* SettingsDialog: fix a little glitch in the account tool button size +* SettingsDialog: tweak color aware icons +* More verbose error and proper app name on configuration read error +* Fix cmake build using WITH_PROVIDERS=OFF +* Debian/Ubuntu target repository update +* Change man page names and contents for nextcloud +* Share dialog alignment +* Fixed typo +* Change link to docs for NC 15 +* Do not fetch activities if they are not enabled +* Do not read system exclude list if user exclude is present +* Fix the activity loop +* Write the actual folder to the log +* Fix appname for Nautilus integration script + +version 2.5.0 (release 2018-11-14) +* End to end encryption +* New Web login flow +* UI improvements: Notifications +* UI improvements: refactoring of Activities +* SyncJournal: Clear etag filter before sync +* Partial local discovery: Fix scheduling logic +* Sync hidden files by default +* Larger Windows App Icon +* Show a tray message when a folder watcher becomes unreliable #6119 +* Create symlinks for the small-letter application icon file names +* In setup wizard put link to nextcloud installation +* Web view scales vertically +* Add a WebFlowCredentialsAccessManager +* Mac Application Icon +* Ensure GETFileJob notices finishing #6581 +* OAuth2: Try to refresh the token even if the credentials weren't ready. +* Tray workarounds #6545 +* UpdateInfo: Remove unused code +* OAuth: Remove the timeout +* TestOAuth: Don't have global static QObject +* Log: Adjust update/reconcile log verbosity +* Reconcile: When detecting a local move, keep the local mtime +* Wizard enhancement +* FolderMan::checkPathValidityForNewFolder: make sure to work when fold… +* Update: Report on readdir() errors #6610 +* Use encode()/decode() with Python 3 only +* Sqlite: Update bundled version to 3.24.0 +* Do not require server replies to contain an mtime +* Settings: Attempt to fix rename issue on old macOS +* Support higher resolution theme icons +* OAuth: Fix infinite loop when the refresh token is expired +* Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY +* Data-Fingerprint: Fix backup detection when fingerprint is empty +* Nautilus: Fix GET_MENU_ITEMS with utf8 filenames #6643 +* Windows: Release handle/fd when file open fails #6699 +* SettingsDialog: Show the page for the newly created account +* Updates submodule qtmacgoodies. +* Fixes #665 Adds slot for confirmShare button. +* Rename INSTALL to INSTALL.md for Preview :) +* Add cmake temporary stuff +* Inform user that configuration is not writable +* Uses QByteArray to store private key. +* Fix cmake command for linux in README too +* Build fix: remove an unused QtSvg/QSvgRenderer include +* Qtkeychain: 0.8.0 -> 0.9.1 +* Setup wizard: implement an animated and interactive slide show +* Theming for general settings ui +* Make the "Add Folder Sync Connection" button act like a button +* Allow to use the login flow with a self signed certificate +* Fix warning in ShareUserGroupWidget +* Copy over config file to new location on windows +* Update to translate strings +* Migrate http auth to webflow +* Margins +* Qt 5.5 compatibility patch for Xenial +* Fix cmake build of documentation +* Use Nextcloud +* Update isntaller background for OSX +* Fix ActivityWidget palette +* SettingsDialog: disable unnecessary wrapping for the about label +* Added default scheme when server returns just a host +* Removed explicit initialization; Fixed RAND_bytes not found +* Actually open the activity view on a click for more info +* Use a format that supports alpha channels for avatars +* L10n. Added space for correct grammar. + + +2.4 Series ChangeLog +==================== version 2.4.1 (2017-02-xx) * Ignore files with file names that can't be encoded for the filesystem (#6287, #5676, #5719) @@ -114,6 +247,10 @@ version 2.4.0 (2017-12-21) * Compile with stack-smashing protection * Updater: Rudimentary support for beta channel (#6048) + +2.3 Series ChangeLog +==================== + version 2.3.4 (2017-11-02) * Checksums: Use addData function to avoid endless loop CPU load issues with Office files * Packaging: Require ZLIB @@ -184,6 +321,10 @@ version 2.3.0 (2017-03-03) * Improved documentation * Crash fixes + +2.2 Series ChangeLog +==================== + version 2.2.4 (release 2016-09-27) * Dolphin Plugin: Use the Application name for the socket path (#5172) * SyncEngine: Fix renaming of folder when file are changed (#5195) @@ -248,6 +389,10 @@ version 2.2.0 (release 2016-05-12) * Update of QtKeyChain to support Windows credential store * Packaging of dolphin overlay icon module for bleeding edge distros + +2.1 Series ChangeLog +==================== + version 2.1.1 (release 2016-02-10) * UI improvements for HiDPI screens, error messages, RTL languages * Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used @@ -281,8 +426,8 @@ version 2.1 (release 2015-12-03) * Improved reconnecting after network change/disconnect (#4167 #3969 ...) * Improved performance in Windows file system discovery * Removed libneon-based propagator. As a consequence, The client can no - longer provide bandwith limiting on Linux-distributions where it is - using Qt < 5.4 +* longer provide bandwith limiting on Linux-distributions where it is +* using Qt < 5.4 * Performance improvements in the logging functions * Ensured that local disk space problems are handled gracefully (#2939) * Improved handling of checksums: transport validation, db (#3735) @@ -318,6 +463,10 @@ version 2.1 (release 2015-12-03) * Organized patches to our base Qt version into admin/qt/patches * Plus: A lot of unmentioned improvements and fixes + +2.0 Series ChangeLog +==================== + version 2.0.2 (release 2015-10-21) * csync_file_stat_s: Save a bit of memory * Shibboleth: Add our base user agent to WebKit @@ -393,6 +542,10 @@ version 2.0.0 (release 2015-08-25) * Bandwidth Throttling: Provide automatic limit setting for downloads (#3084) * Systray: Workaround for issue with Qt 5.5.0 #3656 + +1.8 Series ChangeLog +==================== + version 1.8.4 (release 2015-07-13) * Release to ship a security release of openSSL. No source changes of the ownCloud Client code. @@ -402,7 +555,7 @@ version 1.8.3 (release 2015-06-23) * Ignores: Force a remote discovery after ignore list change (#3172) * Shibboleth: Avoid crash by letting the webview use its own QNAM (#3359) * System Ignores: Removed *.tmp from system ignore again. If a user - wants to ignore *.tmp, it needs to be added to the user ignore list. +* wants to ignore *.tmp, it needs to be added to the user ignore list. version 1.8.2 (release 2015-06-08) * Improve reporting of server error messages (#3220) @@ -415,16 +568,16 @@ version 1.8.2 (release 2015-06-08) * HTTP: Add the branding name to the UserAgent string * ConnectonValidator: Always run with new credentials (#3266) * Recall Feature: Admins can trigger an upload of a file from - client to server again (#3246) +* client to server again (#3246) * Propagator: Add 'Content-Length: 0' header to MKCOL request (#3256) * Switch on checksum verification through branding or config * Add ability for checksum verification of up and download * Fix opening external links for some labels (#3135) * AccountState: Run only a single validator, allow error message - overriding (#3236, #3153) +* overriding (#3236, #3153) * SyncJournalDB: Minor fixes and simplificatons * SyncEngine: Force re-read of folder Etags for upgrades from - 1.8.0 and 1.8.1 +* 1.8.0 and 1.8.1 * Propagator: Limit length of temporary file name (#2789) * ShareDialog: Password ui fixes (#3189) * Fix startup hang by removing QSettings lock file (#3175) @@ -445,12 +598,12 @@ version 1.8.2 (release 2015-06-08) version 1.8.1 (release 2015-05-07) * Make "operation canceled" error a soft error * Do not throw an error for files that are scheduled to be removed, - but can not be found on the server. #2919 +* but can not be found on the server. #2919 * Windows: Reset QNAM to proper function after hibernation. #2899 #2895 #2973 * Fix argument verification of --confdir #2453 * Fix a crash when accessing a dangling UploadDevice pointer #2984 * Add-folder wizard: Make sure there is a scrollbar if folder names - are too long #2962 +* are too long #2962 * Add-folder Wizard: Select the newly created folder * Activity: Correctly restore column sizes #3005 * SSL Button: do not crash on empty certificate chain @@ -458,8 +611,8 @@ version 1.8.1 (release 2015-05-07) * Lookup system proxy async to avoid hangs #2993 #2802 * ShareDialog: Some GUI refinements * ShareDialog: On creation of a share always retrieve the share - This makes sure that if a default expiration date is set this is reflected - in the dialog. #2889 +* This makes sure that if a default expiration date is set this is reflected +* in the dialog. #2889 * ShareDialog: Only show share dialog if we are connected. * HttpCreds: Fill pw dialog with previous password. #2848 #2879 * HttpCreds: Delete password from old location. #2186 @@ -468,7 +621,7 @@ version 1.8.1 (release 2015-05-07) * ProtocolWidget: Always add seconds to the DateTime locale. #2535 * Updater: Give context as to which app is about to be updated #3040 * Windows: Add version information for owncloud.exe. This should help us know - what version or build number a crash report was generated with. +* what version or build number a crash report was generated with. * Fix a crash on shutdown in ~SocketApi #3057 * SyncEngine: Show more timing measurements #3064 * Discovery: Add warning if returned etag is 0 @@ -491,8 +644,8 @@ version 1.8.1 (release 2015-05-07) version 1.8.0 (release 2015-03-17) * Mac OS: HIDPI support * Support Sharing from desktop: Added a share dialog that can be - opened by context menu in the file managers (Win, Mac, Nautilus) - Supports public links with password enforcement +* opened by context menu in the file managers (Win, Mac, Nautilus) +* Supports public links with password enforcement * Enhanced usage of parallel HTTP requests for ownCloud 8 servers * Renamed github repository from mirall to client. * Mac OS: Use native notification support @@ -505,7 +658,7 @@ version 1.8.0 (release 2015-03-17) * Build with Qt 5.4 * Dropped libneon dependency if Qt 5.4 is available * Keep files open very short, that avoid lock problems on Windows - especially with office software but also others. +* especially with office software but also others. * Merged some NetBSD patches * Selective sync support for owncloudcmd * Reorganize the source repository @@ -514,13 +667,17 @@ version 1.8.0 (release 2015-03-17) * A huge amount of bug fixes in all areas of the client. * almost 700 commits since 1.7.1 + +1.7 Series ChangeLog +==================== + version 1.7.1 (release 2014-12-18) * Documentation fixes and updates * Nautilus Python plugin fixed for Python 3 * GUI wording fixes plus improved log messages * Fix hidning of the database files in the sync directories * Compare http download size with the header value to avoid broken - downloads, bug #2528 +* downloads, bug #2528 * Avoid initial ETag fetch job at startup, which is not needed. * Add chunk size http header to PUT requests * Fixed deteteCookie method of our CookieJar, fix for Shibboleth @@ -543,21 +700,20 @@ version 1.7.1 (release 2014-12-18) * Win32: Improve reliability of Installer, fix removal of Shell Extensions version 1.7.0 (release 2014-11-07) - * oC7 Sharing: Handle new sharing options of ownCloud 7 correctly. * Added Selective sync: Ability to unselect server folders which are - excluded from syncing, plus GUI and setup GUI +* excluded from syncing, plus GUI and setup GUI * Added overlay icons for Windows Explorer, Mac OS Finder and GNOME Nautilus. - Information is provided by the client via a local socket / named pipe API - which provides information about the sync status of files. +* Information is provided by the client via a local socket / named pipe API +* which provides information about the sync status of files. * Improved local change detection: consider file size, detect files - with ongoing changes and do not upload immediately +* with ongoing changes and do not upload immediately * Improved HTTP request timeout handler: all successful requests reset - the timeout counter +* the timeout counter * Improvements for syncing command line tool: netrc support, improved - SSL support, non interactive mode +* SSL support, non interactive mode * Permission system: ownCloud 7 delivers file and folder permissions, - added ability to deal with it for shared folders and more. +* added ability to deal with it for shared folders and more. * Ignore handling: Do not recurse into ignored or excluded directories * Major sync journal database improvements for more stability and performance * New library interface to sqlite3 @@ -566,35 +722,40 @@ version 1.7.0 (release 2014-11-07) * Improved logging: more useful meta info, removed noise * Updated to latest Qt5 versions on Windows and OS X * Fixed data loss when renaming a download temporary fails and there was - a conflict at the same time. +* a conflict at the same time. * Fixed missing warnings about reusing a sync folder when the back button - was used in the advanced folder setup wizard. +* was used in the advanced folder setup wizard. * The 'Retry Sync' button now also restarts all downloads. * Clean up temporary downloads and some extra database files when wiping a - folder. +* folder. * OS X: Sparkle update to provide pkg format properly * OS X: Change distribution format from dmg to pkg with new installer. * Windows: Fix handling of filenames with trailing dot or space * Windows: Don't use the wrong way to get file mtimes in the legacy propagator. + + +1.6 Series ChangeLog +==================== + version 1.6.4 (release 2014-10-22) * Fix startup logic, fixes bug #1989 * Fix raise dialog on X11 * Win32: fix overflow when computing the size of file > 4GiB * Use a fixed function to get files modification time, the - original one was broken for certain timezone issues, see - core bug #9781 for details +* original one was broken for certain timezone issues, see +* core bug #9781 for details * Added some missing copyright headers * Avoid data corruption due to wrong error handling, bug #2280 * Do improved request timeout handling to reduce the number of - timed out jobs, bug #2155 - version 1.6.3 (release 2014-09-03) +* timed out jobs, bug #2155 +* version 1.6.3 (release 2014-09-03) * Fixed updater on OS X * Fixed memory leak in SSL button that could lead to quick memory draining * Fixed upload problem with files >4 GB * MacOSX, Linux: Bring Settings window to front properly * Branded clients: If no configuration is detected, try to import the data - from a previously configured community edition. +* from a previously configured community edition. version 1.6.2 (release 2014-07-28 ) * Limit the HTTP buffer size when downloading to limit memory consumption. @@ -602,7 +763,7 @@ version 1.6.2 (release 2014-07-28 ) * Fix local file name clash detection for MacOSX. * Limit maximum wait time to ten seconds in network limiting. * Fix data corruption while trying to resume and the server does - not support it. +* not support it. * HTTP Credentials: Read password from legacy place if not found. * Shibboleth: Fix the waiting curser that would not disapear (#1915) * Limit memory usage to avoid mem wasting and crashes @@ -616,18 +777,18 @@ version 1.6.1 (release 2014-06-26 ) * Fix openSSL problems for windows deployment * Fix syncing a folder with '#' in the name * Fix #1845: do not update parent directory etag before sub - directories are removed +* directories are removed * Fix reappearing directories if dirs are removed during its - upload +* upload * Fix app version in settings dialog, General tab * Fix crash in FolderWizard when going offline * Shibboleth fixes * More specific error messages (file remove during upload, open - local sync file) +* local sync file) * Use QSet rather than QHash in SyncEngine (save memory) * Fix some memory leaks * Fix some thread race problems, ie. wait for neon thread to finish - before the propagator is shut down +* before the propagator is shut down * Fix a lot of issues and warnings found by Coverity * Fix Mac some settings dialog problems @@ -650,16 +811,16 @@ version 1.6.0 (release 2014-05-30 ) * Introduce a general timeout of 300s for network operations * Improve error handling, blacklisting * Job-based change propagation, enables faster parallel up/downloads - (right now only if no bandwidth limit is set and no proxy is used) +* (right now only if no bandwidth limit is set and no proxy is used) * Significantly reduced CPU load when checking for local and remote changes * Speed up file stat code on Windows * Enforce Qt5 for Windows and Mac OS X builds * Improved owncloudcmd: SSL support, documentation * Added advanced logging of operations (file .???.log in sync - directory) +* directory) * Avoid creating a temporary copy of the sync database (.ctmp) * Enable support for TLS 1.2 negotiation on platforms that use - Qt 5.2 or later +* Qt 5.2 or later * Forward server exception messages to client error messages * Mac OS X: Support Notification Center in OS X 10.8+ * Mac OS X: Use native settings dialog @@ -668,11 +829,15 @@ version 1.6.0 (release 2014-05-30 ) * Remove vio abstraction in csync * Avoid data loss when a client file system is not case sensitive + +1.5 Series ChangeLog +==================== + version 1.5.3 (release 2014-03-10 ) * Fix usage of proxies after first sync run (#1502, #1524, #1459, #1521) * Do not wipe the credentials from config for reconnect (#1499, #1503) * Do not erase the full account config if an old version of the client stored - the password (related to above) +* the password (related to above) * Fix layout of the network tab (fixes #1491) * Handle authentication requests by a Shibboleth IdP * Shibboleth: If no connection is available, don't open the login window @@ -701,34 +866,34 @@ version 1.5.2 (release 2014-02-26 ) version 1.5.1 (release 2014-02-13 ) * Added an auto updater that updates the client if a - more recent version was found automatically (Windows, Mac OS X) +* more recent version was found automatically (Windows, Mac OS X) * Added a button to the account dialog that gives information - about the encryption layer used for communication, plus a - certificate information widget +* about the encryption layer used for communication, plus a +* certificate information widget * Preserve the permission settings of local files rather than - setting them to a default (Bug #820) +* setting them to a default (Bug #820) * Handle windows lnk files correctly (Bug #1307) * Detect removes and renames in read only shares and - restore the gone away files. (Bug #1386) +* restore the gone away files. (Bug #1386) * Fixes sign in/sign out and password dialog. (Bug #1353) * Fixed error messages (Bug #1394) * Lots of fixes for building with Qt5 * Changes to network limits are now also applied during a - sync run +* sync run * Fixed mem leak after via valgrind on Mac * Imported the ocsync library into miralls repository. - Adopted all build systems and packaging to that. +* Adopted all build systems and packaging to that. * Introduce a new linux packaging scheme following the - debian upstream scheme +* debian upstream scheme * Use a refactored Linux file system watcher based on - inotify, incl. unit tests +* inotify, incl. unit tests * Wizard: Gracefully fall back to HTTP if HTTPS connection - fails, issuing a warning +* fails, issuing a warning * Fixed translation misses in the propagator * Fixes in proxy configuration * Fixes in sync journal handling * Fix the upload progress if the local source is still - changing when the upload begins. +* changing when the upload begins. * Add proxy support to owncloud commandline client * NSIS fixes * A lot of other fixes and minor improvements @@ -765,6 +930,10 @@ version 1.5.0 (release 2013-12-12 ), csync 0.91.4 required * Windows: Fix rename of temporary files * Windows: Fix move file operation + +1.4 Series ChangeLog +==================== + version 1.4.2 (release 2013-10-18 ), csync 0.90.4 required * Do not show the warning icon in the tray (#944) * Fix manual proxy support when switching (#1016) @@ -780,12 +949,11 @@ version 1.4.2 (release 2013-10-18 ), csync 0.90.4 required * Progress: Show number of deletes. version 1.4.1 (release 2013-09-24 ), csync 0.90.1 required - * Translation and documentation fixes. * Fixed error display in settings/status dialog, displays multi - line error messages now correctly. +* line error messages now correctly. * Wait up to 30 secs before complaining about missing systray - Fixes bug #949 +* Fixes bug #949 * Fixed utf8 issues with basic auth authentication, fixes bug #941 * Fixed remote folder selector, avoid recursive syncing, fixes bug #962 * Handle and display network problems at startup correctly. @@ -802,7 +970,6 @@ version 1.4.1 (release 2013-09-24 ), csync 0.90.1 required * Various minor code fixes version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required - * New Scheduler: Only sync when there are actual changes in the server * Add a Settings Dialog, move Proxy Settings there * Transform folder Status Dialog into Account Settings, provide feedback via context menu @@ -813,7 +980,7 @@ version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required * Move ability to switch to mono icons from a switch to a Settings option * Add "Launch on System Startup" GUI option * Add "Show Desktop Nofications"GUI option (enabled by default) - top optionally disable sync notifications +* top optionally disable sync notifications * Add Help item, pointing to online reference * Implement graphical selection of remote folders in FolderWizard * Allow custom ignore patterns @@ -832,11 +999,14 @@ version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required * Require Qt 4.7 * Known issue: Under certain conditions, a file will only get uploaded after up to five minutes -version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required +1.3 Series ChangeLog +==================== + +version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required * Default proxy port to 8080 * Don't lose proxy settings when changing passwords - * Support SOCKS5 proxy (useful in combination with ssh *D) + * Support SOCKS5 proxy (useful in combination with ssh* *D) * Propagate proxy changes to csync at runtime * Improve proxy wizard * Display proxy errors @@ -852,7 +1022,7 @@ version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required * Remove journal when reusing a directory that used to have a journal before * Visual clean up of status dialog items * Wizard: When changing the URL or user name, allow the user to push his data - to the new location or wipe the folder and start from scratch +* to the new location or wipe the folder and start from scratch * Wizard: Make setting a custom folder as a sync target work again * Fix application icon * User-Agent now contains "Mozilla/5.0" and the Platform name (for firewall/proxy compat) @@ -860,6 +1030,10 @@ version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required * New setup wizard, defaulting to root syncing (only for new setups) * Improved thread stop/termination + +1.2 Series ChangeLog +==================== + version 1.2.5 (release 2013-04-23 ), csync 0.70.7 required * [Fixes] NSIS installer fixes * [Fixes] Fix crash race by making certificateChain() thread safe @@ -925,6 +1099,10 @@ version 1.2.0 (release 2013-01-24 ), csync 0.70.2 required * [Platform] cmake fixes. * [Platform] Improved, more detailed error reporting. + +1.1 Series ChangeLog +==================== + version 1.1.4 (release 2012-12-19 ), csync 0.60.4 required * No changes to mirall, only csync fixes. @@ -934,7 +1112,7 @@ version 1.1.3 (release 2012-11-30 ), csync 0.60.3 required version 1.1.2 (release 2012-11-26 ), csync 0.60.2 required * [Fixes] Allow to properly cancel the password dialog. * [Fixes] Share folder name correctly percent encoded with old Qt - 4.6 builds ie. Debian. +* * * * 4.6 builds ie. Debian. * [Fixes] If local sync dir is not existing, create it. * [Fixes] lots of other minor fixes. * [GUI] Display error messages in status dialog. @@ -942,30 +1120,30 @@ version 1.1.2 (release 2012-11-26 ), csync 0.60.2 required * [GUI] Show username for connection in statusdialog. * [GUI] Show intro wizard on new connection setup. * [APP] Use CredentialStore to better support various credential - backends. +* * * backends. * [APP] Handle missing local folder more robust: Create it if - missing instead of ignoring. +* * * missing instead of ignoring. * [APP] Simplify treewalk code. * [Platform] Fix Mac building version 1.1.1 (release 2012-10-18), csync 0.60.1 required - * [GUI] Allow changing folder name in single folder mode - * [GUI] Windows: Add license to installer - * [GUI] owncloud --logwindow will bring up the log window - in an already running instance + * [GUI]* Allow changing folder name in single folder mode + * [GUI]* Windows: Add license to installer + * [GUI]* owncloud --logwindow will bring up the log window +* * * * in an already running instance * [Fixes] Make sure SSL errors are always handled * [Fixes] Allow special characters in folder alias * [Fixes] Proper workaround for Menu bug in Ubuntu * [Fixes] csync: Fix improper memory cleanup which could - cause memory leaks and crashes +* * * * cause memory leaks and crashes * [Fixes] csync: Fix memory leak * [Fixes] csync: Allow single quote (') in file names * [Fixes] csync: Remove stray temporary files - * [GUI] Reworked tray context menu. - * [GUI] Users can now sync the server root folder. + * [GUI]* Reworked tray context menu. + * [GUI]* Users can now sync the server root folder. * [Fixes] Proxy support: now supports Proxy Auto-Configuration (PAC) - on Windows, reliability fixes across all OSes. +* * * * on Windows, reliability fixes across all OSes. * [Fixes] Url entry field in setup assistant handles http/https correctly. * [Fixes] Button enable state in status dialog. * [Fixes] Crash fixed on ending the client, tray icon related. @@ -978,11 +1156,15 @@ version 1.1.1 (release 2012-10-18), csync 0.60.1 required * [Platform] Windows: ownCloud gets added to autorun by default. * [Platform] insert correct version info from cmake. * [Platform] csync conf file and database were moved to the users app data - directory, away from the .csync dir. - * Renamed exclude.lst to sync-exclude.lst and moved it to - /etc/appName()/ for more clean packaging. From the user path, - still exclude.lst is read if sync-exclude.lst is not existing. - * Placed custom.ini with customization options to /etc/appName() +* * * * * directory, away from the .csync dir. + ** * * Renamed exclude.lst to sync-exclude.lst and moved it to +* * * * /etc/appName()/ for more clean packaging. From the user path, +* * * * still exclude.lst is read if sync-exclude.lst is not existing. + ** * * Placed custom.ini with customization options to /etc/appName() + + +1.0 Series ChangeLog +==================== version 1.0.5 (release 2012-08-14), csync 0.50.8 required * [Fixes] Fixed setup dialog: Really use https if checkbox is activated. @@ -1000,23 +1182,23 @@ version 1.0.4 (release 2012-08-10), csync 0.50.8 required * [GUI] Removed Log Window Button, log available through command line. * [GUI] Proxy configuration dialog added. * [GUI] Added Translations to languages Slovenian, Polish, Catalan, - Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak, - French, Russian, Japanese, Swedish, Portuguese (Portugal) - all with translation rate >90%. +* * * Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak, +* * * French, Russian, Japanese, Swedish, Portuguese (Portugal) +* * * all with translation rate >90%. * [Fixes] Loading of self signed certs into Networkmanager (#oc-843) * [Fixes] Win32: Handle SSL dll loading correctly. * [Fixes] Many other small fixes and improvements. version 1.0.3 (release 2012-06-19), csync 0.50.7 required * [GUI] Added a log window which catches the logging if required and - allows to save for information. +* * * allows to save for information. * [CMI] Added options --help, --logfile and --logflush * [APP] Allow to specify sync frequency in the config file. * [Fixes] Do not use csync database files from a sync before. * [Fixes] In Connection wizard, write the final config onyl if - the user really accepted. Also remove the former database. +* * * * the user really accepted. Also remove the former database. * [Fixes] More user expected behaviour deletion of sync folder local - and remote. +* * * * and remote. * [Fixes] Allow special characters in the sync directory names * [Fixes] Win32: Fixed directory removal with special character dirs. * [Fixes] MacOS: Do not flood the system log any more @@ -1035,7 +1217,7 @@ version 1.0.2 (release 2012-05-18), csync 0.50.6 required * [Fixes] Dialogs comes to front on click * [Fixes] Open local sync folder from tray and status for win32 * [Fixes] Load exclude.lst correctly on MacOSX - + csync fixes. +* + csync fixes. version 1.0.1 (release 2012-04-18), csync 0.50.5 required * [Security] Support SSL Connections diff --git a/NEXTCLOUD.cmake b/NEXTCLOUD.cmake index 7cc321c14..b6bc79c6b 100644 --- a/NEXTCLOUD.cmake +++ b/NEXTCLOUD.cmake @@ -3,10 +3,10 @@ set( APPLICATION_SHORTNAME "Nextcloud" ) set( APPLICATION_EXECUTABLE "nextcloud" ) set( APPLICATION_DOMAIN "nextcloud.com" ) set( APPLICATION_VENDOR "Nextcloud GmbH" ) -set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE string "URL for updater" ) -set( APPLICATION_HELP_URL "" CACHE string "URL for the help menu" ) +set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE STRING "URL for updater" ) +set( APPLICATION_HELP_URL "" CACHE STRING "URL for the help menu" ) set( APPLICATION_ICON_NAME "Nextcloud" ) -set( APPLICATION_SERVER_URL "" CACHE string "URL for the server to use. If entered the server can only connect to this instance" ) +set( APPLICATION_SERVER_URL "" CACHE STRING "URL for the server to use. If entered the server can only connect to this instance" ) set( LINUX_PACKAGE_SHORTNAME "nextcloud" ) @@ -20,14 +20,14 @@ set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-back # set( APPLICATION_LICENSE "${OEM_THEME_DIR}/license.txt ) option( WITH_CRASHREPORTER "Build crashreporter" OFF ) -#set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" ) +#set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE STRING "URL for crash reporter" ) #set( CRASHREPORTER_ICON ":/owncloud-icon.png" ) option( WITH_PROVIDERS "Build with providers list" ON ) ## Theming options -set( APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR "#0082c9" CACHE string "Hex color of the wizard header background") -set( APPLICATION_WIZARD_HEADER_TITLE_COLOR "#ffffff" CACHE string "Hex color of the text in the wizard header") +set( APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR "#0082c9" CACHE STRING "Hex color of the wizard header background") +set( APPLICATION_WIZARD_HEADER_TITLE_COLOR "#ffffff" CACHE STRING "Hex color of the text in the wizard header") option( APPLICATION_WIZARD_USE_CUSTOM_LOGO "Use the logo from ':/client/theme/colored/wizard_logo.png' else the default application icon is used" ON ) diff --git a/VERSION.cmake b/VERSION.cmake index b08e6f944..8f780835c 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,6 +1,6 @@ set( MIRALL_VERSION_MAJOR 2 ) -set( MIRALL_VERSION_MINOR 5 ) -set( MIRALL_VERSION_PATCH 3 ) +set( MIRALL_VERSION_MINOR 7 ) +set( MIRALL_VERSION_PATCH 0 ) set( MIRALL_VERSION_YEAR 2019 ) set( MIRALL_SOVERSION 0 ) diff --git a/admin/linux/debian/debian.cosmic/changelog b/admin/linux/debian/debian.eoan/changelog index 5316d79c5..184153cbc 100644 --- a/admin/linux/debian/debian.cosmic/changelog +++ b/admin/linux/debian/debian.eoan/changelog @@ -1,22 +1,22 @@ -nextcloud-client (2.3.3-1.0~cosmic1) cosmic; urgency=medium +nextcloud-client (2.3.3-1.0~eoan1) eoan; urgency=medium * Debian build support for the forked client. -- István Váradi <ivaradi@varadiistvan.hu> Mon, 6 Nov 2017 20:20:04 +0100 -nextcloud-client (2.3.1-1.0~cosmic1) cosmic; urgency=medium +nextcloud-client (2.3.1-1.0~eoan1) eoan; urgency=medium * New upstream version -- István Váradi <ivaradi@varadiistvan.hu> Thu, 23 Mar 2017 19:07:36 +0100 -nextcloud-client (2.3.0-1.0~cosmic1) cosmic; urgency=medium +nextcloud-client (2.3.0-1.0~eoan1) eoan; urgency=medium * New upstream version -- István Váradi <ivaradi@varadiistvan.hu> Tue, 21 Mar 2017 19:34:13 +0100 -nextcloud-client (2.2.4-1.4~cosmic1) cosmic; urgency=medium +nextcloud-client (2.2.4-1.4~eoan1) eoan; urgency=medium * The locale-specific icon names are correct too diff --git a/admin/linux/debian/debian.eoan/control b/admin/linux/debian/debian.eoan/control new file mode 100644 index 000000000..f1ee4ce6a --- /dev/null +++ b/admin/linux/debian/debian.eoan/control @@ -0,0 +1,89 @@ +Source: nextcloud-client +Section: contrib/devel +Priority: optional +Maintainer: István Váradi <ivaradi@varadiistvan.hu> +Build-Depends: cmake, + debhelper, + cdbs, + dh-python, + extra-cmake-modules (>= 5.16), + kdelibs5-dev, + libkf5kio-dev, + libcmocka-dev, + libhttp-dav-perl, + libinotify-dev [kfreebsd-any], + libqt5svg5-dev, + libqt5webkit5-dev, + libsqlite3-dev, + libssl-dev (>= 1.1.0), + zlib1g-dev, + optipng, + pkg-kde-tools, + python-sphinx | python3-sphinx, + python3-all, + qt5keychain-dev, + qtwebengine5-dev, + qtdeclarative5-dev, + qttools5-dev, + qttools5-dev-tools, + xvfb +Standards-Version: 3.9.8 +Homepage: https://github.com/nextcloud/client_theming +#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git +#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git + +Package: nextcloud-client +Architecture: any +Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n +Description: Nextcloud desktop sync client + Use the desktop client to keep your files synchronized + between your Nextcloud server and your desktop. Select + one or more directories on your local machine and always + have access to your latest files wherever you are. + +Package: libnextcloudsync0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Nextcloud sync library + Used by the Nextcloud desktop client as the synchronization engine. + +Package: libnextcloudsync-dev +Architecture: any +Section: contrib/libdevel +Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends} +Description: Nextcloud sync library development files + The headers and development library for the Nextcloud sync library. + +Package: nextcloud-client-l10n +Architecture: all +Depends: ${misc:Depends} +Description: Nextcloud client internatialization files + The translation files. + +Package: nextcloud-client-nautilus +Architecture: all +Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends} +Description: Nautilus plugin for Nextcloud + This package contains a Nautilus plugin to display + synchronization status icons for Nextcloud files. + +Package: nextcloud-client-nemo +Architecture: all +Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends} +Description: Nemo plugin for Nextcloud + This package contains a Nemo plugin to display + synchronization status icons for Nextcloud files. + +Package: nextcloud-client-caja +Architecture: all +Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends} +Description: Caja plugin for Nextcloud + This package contains a Caja plugin to display + synchronization status icons for Nextcloud files. + +Package: nextcloud-client-dolphin +Architecture: any +Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends} +Description: Dolphin plugin for Nextcloud + This package contains a Dolphin plugin to display + synchronization status icons for Nextcloud files. diff --git a/admin/linux/debian/debian.xenial/post-patches/qt5.5-compat.patch b/admin/linux/debian/debian.xenial/post-patches/qt5.5-compat.patch index 7d7710513..70c71d462 100644 --- a/admin/linux/debian/debian.xenial/post-patches/qt5.5-compat.patch +++ b/admin/linux/debian/debian.xenial/post-patches/qt5.5-compat.patch @@ -1,40 +1,12 @@ ---- nextcloud-client-2.4.0.orig/src/gui/wizard/owncloudoauthcredspage.cpp -+++ nextcloud-client-2.4.0/src/gui/wizard/owncloudoauthcredspage.cpp -@@ -53,10 +53,8 @@ OwncloudOAuthCredsPage::OwncloudOAuthCredsPage() - _ui.openLinkButton->setContextMenuPolicy(Qt::CustomContextMenu); - QObject::connect(_ui.openLinkButton, &QWidget::customContextMenuRequested, [this](const QPoint &pos) { - auto menu = new QMenu(_ui.openLinkButton); -- menu->addAction(tr("Copy link to clipboard"), this, [this] { -- if (_asyncAuth) -- QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded)); -- }); -+ auto action = menu->addAction(tr("Copy link to clipboard")); -+ connect(action, &QAction::triggered, this, &OwncloudOAuthCredsPage::copyLinkToClipboard); - menu->setAttribute(Qt::WA_DeleteOnClose); - menu->popup(_ui.openLinkButton->mapToGlobal(pos)); - }); -@@ -131,4 +129,11 @@ bool OwncloudOAuthCredsPage::isComplete() const - return false; /* We can never go forward manually */ +--- nextcloud-client-2.5.3.orig/src/3rdparty/kmessagewidget/kmessagewidget.cpp 2019-07-26 18:40:34.949349387 +0000 ++++ nextcloud-client-2.5.3/src/3rdparty/kmessagewidget/kmessagewidget.cpp 2019-07-26 18:41:39.866478051 +0000 +@@ -105,6 +105,9 @@ + q->setMessageType(KMessageWidget::Information); } -+void OwncloudOAuthCredsPage::copyLinkToClipboard() -+{ -+ if (_asyncAuth) -+ QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded)); -+} ++template <typename T> ++constexpr typename std::add_const<T>::type &qAsConst(T &t) noexcept { return t; } + -+ - } // namespace OCC ---- nextcloud-client-2.4.0.orig/src/gui/wizard/owncloudoauthcredspage.h -+++ nextcloud-client-2.4.0/src/gui/wizard/owncloudoauthcredspage.h -@@ -57,6 +57,10 @@ public: - QString _refreshToken; - QScopedPointer<OAuth> _asyncAuth; - Ui_OwncloudOAuthCredsPage _ui; -+ -+protected slots: -+ void copyLinkToClipboard(); -+ - }; - - } // namespace OCC + void KMessageWidgetPrivate::createLayout() + { + delete content->layout(); diff --git a/admin/linux/debian/drone-build.sh b/admin/linux/debian/drone-build.sh index c97e130a7..0909a262a 100755 --- a/admin/linux/debian/drone-build.sh +++ b/admin/linux/debian/drone-build.sh @@ -51,7 +51,7 @@ if ! wget http://ppa.launchpad.net/${repo}/ubuntu/pool/main/n/nextcloud-client/n origsourceopt="-sa" fi -for distribution in xenial bionic cosmic disco stable; do +for distribution in xenial bionic disco eoan stable; do rm -rf nextcloud-client_${basever} cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever} diff --git a/admin/linux/debian/scripts/git2changelog.py b/admin/linux/debian/scripts/git2changelog.py index 58bf9859d..3a1b44fb6 100755 --- a/admin/linux/debian/scripts/git2changelog.py +++ b/admin/linux/debian/scripts/git2changelog.py @@ -70,7 +70,9 @@ def collectEntries(baseCommit, baseVersion, kind): lastVersionTag = None lastCMAKEVersion = None for line in output.splitlines(): - (commit, name, email, date, revdate, subject) = line.split("\t") + words = line.split("\t") + (commit, name, email, date, revdate) = words[0:5] + subject = "\t".join(words[5:]) revdate = datetime.datetime.utcfromtimestamp(long(revdate)).strftime("%Y%m%d.%H%M%S") kind = "beta" diff --git a/admin/win/nsi/installer.ico b/admin/win/nsi/installer.ico Binary files differindex d7d4a81a1..1d1c18005 100644 --- a/admin/win/nsi/installer.ico +++ b/admin/win/nsi/installer.ico diff --git a/admin/win/nsi/page_header.bmp b/admin/win/nsi/page_header.bmp Binary files differindex e43824425..0a0a74715 100644 --- a/admin/win/nsi/page_header.bmp +++ b/admin/win/nsi/page_header.bmp diff --git a/admin/win/nsi/welcome.bmp b/admin/win/nsi/welcome.bmp Binary files differindex a3c8b45c0..519ea636f 100644 --- a/admin/win/nsi/welcome.bmp +++ b/admin/win/nsi/welcome.bmp diff --git a/client.qrc b/client.qrc index 00db6b163..f9952965a 100644 --- a/client.qrc +++ b/client.qrc @@ -1,14 +1,5 @@ <RCC> <qresource prefix="/client"> - <file>resources/dialog-close.png</file> - <file>resources/dialog-ok.png</file> - <file>resources/dialog-cancel.png</file> - <file>resources/folder-sync.png</file> - <file>resources/folder-sync@2x.png</file> - <file>resources/task-ongoing.png</file> - <file>resources/view-refresh.png</file> - <file>resources/warning.png</file> - <file>resources/warning@2x.png</file> <file>resources/settings.png</file> <file>resources/settings@2x.png</file> <file>resources/activity.png</file> @@ -26,7 +17,6 @@ <file>resources/bell.svg</file> <file>resources/link.svg</file> <file>resources/files.svg</file> - <file>resources/folder-grey.png</file> <file>resources/state-error.svg</file> <file>resources/state-warning.svg</file> <file>resources/folder.svg</file> @@ -38,6 +28,7 @@ <file>resources/copy.svg</file> <file>resources/state-sync.svg</file> <file>resources/add.png</file> + <file>resources/state-info.svg</file> </qresource> <qresource prefix="/"/> </RCC> diff --git a/cmake/modules/AddAppIconMacro.cmake b/cmake/modules/AddAppIconMacro.cmake index 5d9d9d855..4453a287e 100644 --- a/cmake/modules/AddAppIconMacro.cmake +++ b/cmake/modules/AddAppIconMacro.cmake @@ -47,7 +47,13 @@ macro (KDE4_ADD_APP_ICON appsources pattern) endif (fn MATCHES ".*128.*") if (fn MATCHES ".*256.*" ) list (APPEND _icons ${it}) - endif (fn MATCHES ".*256.*") + endif (fn MATCHES ".*256.*") + if (fn MATCHES ".*512.*" ) + list (APPEND _icons ${it}) + endif (fn MATCHES ".*512.*") + if (fn MATCHES ".*1024.*" ) + list (APPEND _icons ${it}) + endif (fn MATCHES ".*1024.*") endforeach (it) if (_icons) add_custom_command(OUTPUT ${_outfilename}.ico ${_outfilename}.rc @@ -104,14 +110,14 @@ macro (KDE4_ADD_APP_ICON appsources pattern) foreach (it ${files}) if (it MATCHES ".*sidebar-16.*") configure_file(${it} ${appsources}.iconset/sidebar_16x16.png COPYONLY) - elseif (it MATCHES ".*sidebar-18.*") - configure_file(${it} ${appsources}.iconset/sidebar_18x18.png COPYONLY) elseif (it MATCHES ".*sidebar-32.*") + configure_file(${it} ${appsources}.iconset/sidebar_18x18.png COPYONLY) configure_file(${it} ${appsources}.iconset/sidebar_16x16@2x.png COPYONLY) - configure_file(${it} ${appsources}.iconset/sidebar_32x32.png COPYONLY) - elseif (it MATCHES ".*sidebar-36.*") - configure_file(${it} ${appsources}.iconset/sidebar_18x18@2x.png COPYONLY) elseif (it MATCHES ".*sidebar-64.*") + configure_file(${it} ${appsources}.iconset/sidebar_18x18@2x.png COPYONLY) + elseif (it MATCHES ".*sidebar-128.*") + configure_file(${it} ${appsources}.iconset/sidebar_32x32.png COPYONLY) + elseif (it MATCHES ".*sidebar-256.*") configure_file(${it} ${appsources}.iconset/sidebar_32x32@2x.png COPYONLY) endif() endforeach (it) diff --git a/cmake/modules/ECMAddAppIcon.cmake b/cmake/modules/ECMAddAppIcon.cmake index 6932584fb..3934491bd 100644 --- a/cmake/modules/ECMAddAppIcon.cmake +++ b/cmake/modules/ECMAddAppIcon.cmake @@ -8,8 +8,8 @@ # # ecm_add_app_icon(<sources_var> # ICONS <icon> [<icon> [...]] -# [SIDEBAR_ICONS <icon> [<icon> [...]] # Since 5.4x -# [OUTFILE_BASE <name>]) # Since 5.4x +# [SIDEBAR_ICONS <icon> [<icon> [...]] # Since 5.49 +# [OUTFILE_BASENAME <name>]) # Since 5.49 # ) # # The given icons, whose names must match the pattern:: @@ -27,20 +27,21 @@ # # ``SIDEBAR_ICONS`` can be used to add Mac OS X sidebar # icons to the generated iconset. They are used when a folder monitored by the -# application is dragged into Finder's sidebar. Since 5.4x. +# application is dragged into Finder's sidebar. Since 5.49. # -# ``OUTFILE_BASE`` will be used as the basename for the icon file. If -# you specify it, the icon file will be called ``<OUTFILE_BASE>.icns`` on Mac OS X -# and ``<OUTFILE_BASE>.ico`` on Windows. If you don't specify it, it defaults -# to ``<sources_var>.<ext>``. Since 5.4x. +# ``OUTFILE_BASENAME`` will be used as the basename for the icon file. If +# you specify it, the icon file will be called ``<OUTFILE_BASENAME>.icns`` on Mac OS X +# and ``<OUTFILE_BASENAME>.ico`` on Windows. If you don't specify it, it defaults +# to ``<sources_var>.<ext>``. Since 5.49. # # # Windows notes # * Icons are compiled into the executable using a resource file. # * Icons may not show up in Windows Explorer if the executable # target does not have the ``WIN32_EXECUTABLE`` property set. -# * The tool png2ico is required. See :find-module:`FindPng2Ico`. -# * Supported sizes: 16, 32, 48, 64, 128. +# * One of the tools png2ico (See :find-module:`FindPng2Ico`) or +# icotool (see :find-module:`FindIcoTool`) is required. +# * Supported sizes: 16, 24, 32, 48, 64, 128, 256, 512 and 1024. # # Mac OS X notes # * The executable target must have the ``MACOSX_BUNDLE`` property set. @@ -101,7 +102,7 @@ include(CMakeParseArguments) function(ecm_add_app_icon appsources) set(options) - set(oneValueArgs OUTFILE_BASE) + set(oneValueArgs OUTFILE_BASENAME) set(multiValueArgs ICONS SIDEBAR_ICONS) cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) @@ -138,9 +139,9 @@ function(ecm_add_app_icon appsources) endif() - _ecm_add_app_icon_categorize_icons("${ARG_ICONS}" "icons" "16;32;48;64;128;256;512;1024") + _ecm_add_app_icon_categorize_icons("${ARG_ICONS}" "icons" "16;24;32;48;64;128;256;512;1024") if(ARG_SIDEBAR_ICONS) - _ecm_add_app_icon_categorize_icons("${ARG_SIDEBAR_ICONS}" "sidebar_icons" "16;18;32;36;64") + _ecm_add_app_icon_categorize_icons("${ARG_SIDEBAR_ICONS}" "sidebar_icons" "16;32;64;128;256") endif() set(mac_icons @@ -151,31 +152,37 @@ function(ecm_add_app_icon appsources) ${icons_at_128px} ${icons_at_256px} ${icons_at_512px} - ${icons_at_1024px} + ${icons_at_1024px}) + set(mac_sidebar_icons # Sidebar Icons: https://developer.apple.com/library/content/documentation/General/Conceptual/ExtensibilityPG/Finder.html#//apple_ref/doc/uid/TP40014214-CH15-SW15 ${sidebar_icons_at_16px} - ${sidebar_icons_at_18px} ${sidebar_icons_at_32px} - ${sidebar_icons_at_36px} - ${sidebar_icons_at_64px}) - if (NOT icons_at_128px) - message(AUTHOR_WARNING "No 128px icon provided; this will not work on Mac OS X") + ${sidebar_icons_at_64px} + ${sidebar_icons_at_128px} + ${sidebar_icons_at_256px}) + + if (NOT (mac_icons OR mac_sidebar_icons)) + message(AUTHOR_WARNING "No icons suitable for use on macOS provided") endif() - set(windows_icons ${icons_at_16px} - ${icons_at_32px} - ${icons_at_48px} - ${icons_at_64px} - ${icons_at_128px} - ${icons_at_256px}) - if (NOT windows_icons) + set(windows_icons ${icons_at_16px} + ${icons_at_24px} + ${icons_at_32px} + ${icons_at_48px} + ${icons_at_64px} + ${icons_at_128px} + ${icons_at_256px} + ${icons_at_512px} + ${icons_at_1024px}) + + if (NOT (windows_icons)) message(AUTHOR_WARNING "No icons suitable for use on Windows provided") endif() - if (ARG_OUTFILE_BASE) - set (_outfilebasename "${ARG_OUTFILE_BASE}") + if (ARG_OUTFILE_BASENAME) + set (_outfilebasename "${ARG_OUTFILE_BASENAME}") else() set (_outfilebasename "${appsources}") endif() @@ -185,26 +192,15 @@ function(ecm_add_app_icon appsources) set(saved_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_FIND_MODULE_DIR}) find_package(Png2Ico) + find_package(IcoTool) set(CMAKE_MODULE_PATH "${saved_CMAKE_MODULE_PATH}") - if (Png2Ico_FOUND) - if (Png2Ico_HAS_RCFILE_ARGUMENT) - add_custom_command( - OUTPUT "${_outfilename}.rc" "${_outfilename}.ico" - COMMAND Png2Ico::Png2Ico - ARGS - --rcfile "${_outfilename}.rc" - "${_outfilename}.ico" - ${windows_icons} - DEPENDS ${windows_icons} - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - ) - else() + function(create_windows_icon_and_rc command args deps) add_custom_command( OUTPUT "${_outfilename}.ico" - COMMAND Png2Ico::Png2Ico - ARGS "${_outfilename}.ico" ${windows_icons} - DEPENDS ${windows_icons} + COMMAND ${command} + ARGS ${args} + DEPENDS ${deps} WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" ) # this bit's a little hacky to make the dependency stuff work @@ -216,12 +212,72 @@ function(ecm_add_app_icon appsources) DEPENDS "${_outfilename}.ico" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) - endif() + endfunction() + + if (IcoTool_FOUND) + list(APPEND icotool_args "-c" "-o" "${_outfilename}.ico") + + # According to https://stackoverflow.com/a/40851713/2886832 + # Windows always chooses the first icon above 255px, all other ones will be ignored + set(maxSize 0) + foreach(size 256 512 1024) + if(icons_at_${size}px) + set(maxSize "${size}") + endif() + endforeach() + + foreach(size 16 24 32 48 64 128 ${maxSize}) + if(NOT icons_at_${size}px) + continue() + endif() + + set(icotool_icon_arg "") + if(size STREQUAL "${maxSize}") + # maxSize icon needs to be included as raw png + list(APPEND icotool_args "-r") + endif() + + foreach(icon ${icons_at_${size}px}) + list(APPEND icotool_args "${icons_at_${size}px}") + endforeach() + endforeach() + + create_windows_icon_and_rc(IcoTool::IcoTool "${icotool_args}" "${windows_icons_modern}") set(${appsources} "${${appsources}};${_outfilename}.rc" PARENT_SCOPE) + + # standard png2ico has no rcfile argument + # NOTE: We generally use https://github.com/hiiamok/png2ImageMagickICO + # or similar on windows, which is why we provide resolutions >= 256px here. + # Standard png2ico will fail with this. + elseif(Png2Ico_FOUND AND NOT Png2Ico_HAS_RCFILE_ARGUMENT AND windows_icons) + set(png2ico_args) + list(APPEND png2ico_args "${_outfilename}.ico") + list(APPEND png2ico_args "${windows_icons}") + create_windows_icon_and_rc(Png2Ico::Png2Ico "${png2ico_args}" "${windows_icons}") + + set(${appsources} "${${appsources}};${_outfilename}.rc" PARENT_SCOPE) + + # png2ico from kdewin provides rcfile argument + elseif(Png2Ico_FOUND AND windows_icons) + add_custom_command( + OUTPUT "${_outfilename}.rc" "${_outfilename}.ico" + COMMAND Png2Ico::Png2Ico + ARGS + --rcfile "${_outfilename}.rc" + "${_outfilename}.ico" + ${windows_icons} + DEPENDS ${windows_icons} + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) + + set(${appsources} "${${appsources}};${_outfilename}.rc" PARENT_SCOPE) + + # else none of the supported tools was found else() - message(WARNING "Unable to find the png2ico utility - application will not have an application icon!") + message(WARNING "Unable to find the png2ico or icotool utilities or icons in matching sizes - application will not have an application icon!") endif() - elseif (APPLE AND mac_icons) + + elseif (APPLE AND (mac_icons OR mac_sidebar_icons)) # first generate .iconset directory structure, then convert to .icns format using the Mac OS X "iconutil" utility, # to create retina compatible icon, you need png source files in pixel resolution 16x16, 32x32, 64x64, 128x128, # 256x256, 512x512, 1024x1024 @@ -246,8 +302,11 @@ function(ecm_add_app_icon appsources) WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" ) list(APPEND iconset_icons - "${_outfilename}.iconset/${type}_${sizename}.png") + "${_outfilename}.iconset/${type}_${sizename}.png") endmacro() + + # List of supported sizes and filenames taken from: + # https://developer.apple.com/library/content/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/Optimizing/Optimizing.html#//apple_ref/doc/uid/TP40012302-CH7-SW4 foreach(size 16 32 128 256 512) math(EXPR double_size "2 * ${size}") foreach(file ${icons_at_${size}px}) @@ -258,14 +317,25 @@ function(ecm_add_app_icon appsources) endforeach() endforeach() - foreach(size 16 18 32) - math(EXPR double_size "2 * ${size}") - foreach(file ${sidebar_icons_at_${size}px}) - copy_icon("${file}" "${size}x${size}" "sidebar") - endforeach() - foreach(file ${sidebar_icons_at_${double_size}px}) - copy_icon("${file}" "${size}x${size}@2x" "sidebar") - endforeach() + # List of supported sizes and filenames taken from: + # https://developer.apple.com/library/content/documentation/General/Conceptual/ExtensibilityPG/Finder.html#//apple_ref/doc/uid/TP40014214-CH15-SW15 + foreach(file ${sidebar_icons_at_16px}) + copy_icon("${file}" "16x16" "sidebar") + endforeach() + foreach(file ${sidebar_icons_at_32px}) + copy_icon("${file}" "16x16@2x" "sidebar") + endforeach() + foreach(file ${sidebar_icons_at_32px}) + copy_icon("${file}" "18x18" "sidebar") + endforeach() + foreach(file ${sidebar_icons_at_64px}) + copy_icon("${file}" "18x18@2x" "sidebar") + endforeach() + foreach(file ${sidebar_icons_at_128px}) + copy_icon("${file}" "32x32" "sidebar") + endforeach() + foreach(file ${sidebar_icons_at_256px}) + copy_icon("${file}" "32x32@2x" "sidebar") endforeach() # generate .icns icon file diff --git a/doc/visualtour.rst b/doc/visualtour.rst index 2feb9fd6b..8fd976666 100644 --- a/doc/visualtour.rst +++ b/doc/visualtour.rst @@ -99,7 +99,7 @@ Activity .. index:: activity, recent changes, sync activity The Activity window, which can be invoked either from the main menu (``Recent -Changes -> Details…``) or the Activity tab on the left side of the settings +Changes -> View more activity…``) or the Activity tab on the left side of the settings window, provides an in-depth account of the recent sync activity. It will show files that have not been synced because they are on the ignored files list, or because they cannot be synced in a cross-platform manner due to containing diff --git a/resources/dialog-cancel.png b/resources/dialog-cancel.png Binary files differdeleted file mode 100644 index fd285bc5c..000000000 --- a/resources/dialog-cancel.png +++ /dev/null diff --git a/resources/dialog-close.png b/resources/dialog-close.png Binary files differdeleted file mode 100644 index 8d7f19f2b..000000000 --- a/resources/dialog-close.png +++ /dev/null diff --git a/resources/dialog-ok.png b/resources/dialog-ok.png Binary files differdeleted file mode 100644 index 391434035..000000000 --- a/resources/dialog-ok.png +++ /dev/null diff --git a/resources/folder-grey.png b/resources/folder-grey.png Binary files differdeleted file mode 100644 index 9d681839a..000000000 --- a/resources/folder-grey.png +++ /dev/null diff --git a/resources/folder-sync.png b/resources/folder-sync.png Binary files differdeleted file mode 100644 index f55b773c2..000000000 --- a/resources/folder-sync.png +++ /dev/null diff --git a/resources/folder-sync@2x.png b/resources/folder-sync@2x.png Binary files differdeleted file mode 100644 index e4f26106f..000000000 --- a/resources/folder-sync@2x.png +++ /dev/null diff --git a/resources/state-info.svg b/resources/state-info.svg new file mode 100644 index 000000000..14b52e326 --- /dev/null +++ b/resources/state-info.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4.2333 4.2333" version="1.1" height="16" width="16"><g id="g3830" transform="matrix(.87498 0 0 .87498 .26458 -255.9)"><circle id="circle3818" stroke-width=".25066" fill="#2268ab" r="2.1167" cy="294.88" cx="2.1167" /><g id="g3828" stroke-linejoin="round" stroke-linecap="round" fill="none" /></g><path style="fill:#ffffff;stroke-width:0.17859235" d="m 1.6076619,2.1122981 c 0.027682,0.068222 0.058043,0.1232286 0.115014,0.043934 0.072686,-0.047862 0.314322,-0.2548509 0.29682,-0.061078 C 1.953774,2.4553739 1.8705497,2.8125586 1.8105428,3.1738508 1.7403561,3.3728027 1.9237704,3.5430012 2.1028984,3.4078068 2.295421,3.3181535 2.4582973,3.1779584 2.6256382,3.0488362 2.599921,2.9911507 2.5809903,2.9077482 2.5191973,2.9868644 2.4356161,3.0297263 2.2566665,3.2222491 2.2163047,3.07116 2.2725613,2.681829 2.3904322,2.3041062 2.4600833,1.9170966 2.5309844,1.7376113 2.3950755,1.5200858 2.210054,1.6736753 1.985742,1.7836882 1.8010774,1.9562083 1.6076619,2.1122981 Z M 2.4041839,0.77839186 C 2.1702279,0.77446305 2.0636081,1.1609366 2.2889917,1.2561264 2.4716917,1.3236342 2.659928,1.1286114 2.6086721,0.94358974 2.5911701,0.8467927 2.5018738,0.77035521 2.4038266,0.77749894 Z" /></svg>
\ No newline at end of file diff --git a/resources/task-ongoing.png b/resources/task-ongoing.png Binary files differdeleted file mode 100644 index ae2e5e527..000000000 --- a/resources/task-ongoing.png +++ /dev/null diff --git a/resources/view-refresh.png b/resources/view-refresh.png Binary files differdeleted file mode 100644 index 0b08b2388..000000000 --- a/resources/view-refresh.png +++ /dev/null diff --git a/resources/warning.png b/resources/warning.png Binary files differdeleted file mode 100644 index 43ca31a31..000000000 --- a/resources/warning.png +++ /dev/null diff --git a/resources/warning@2x.png b/resources/warning@2x.png Binary files differdeleted file mode 100644 index 8e9133789..000000000 --- a/resources/warning@2x.png +++ /dev/null diff --git a/src/3rdparty/kmessagewidget/kmessagewidget.cpp b/src/3rdparty/kmessagewidget/kmessagewidget.cpp new file mode 100644 index 000000000..cd3563a1d --- /dev/null +++ b/src/3rdparty/kmessagewidget/kmessagewidget.cpp @@ -0,0 +1,512 @@ +/* This file is part of the KDE libraries + * + * Copyright (c) 2011 Aurélien Gâteau <agateau@kde.org> + * Copyright (c) 2014 Dominik Haumann <dhaumann@kde.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#include "kmessagewidget.h" + +#include <QAction> +#include <QApplication> +#include <QEvent> +#include <QGridLayout> +#include <QHBoxLayout> +#include <QLabel> +#include <QPainter> +#include <QShowEvent> +#include <QTimeLine> +#include <QToolButton> +#include <QStyle> + +//--------------------------------------------------------------------- +// KMessageWidgetPrivate +//--------------------------------------------------------------------- +class KMessageWidgetPrivate +{ +public: + void init(KMessageWidget *); + + KMessageWidget *q; + QFrame *content = nullptr; + QLabel *iconLabel = nullptr; + QLabel *textLabel = nullptr; + QToolButton *closeButton = nullptr; + QTimeLine *timeLine = nullptr; + QIcon icon; + bool ignoreShowEventDoingAnimatedShow = false; + + KMessageWidget::MessageType messageType; + bool wordWrap; + QList<QToolButton *> buttons; + QPixmap contentSnapShot; + + void createLayout(); + void applyStyleSheet(); + void updateSnapShot(); + void updateLayout(); + void slotTimeLineChanged(qreal); + void slotTimeLineFinished(); + + int bestContentHeight() const; +}; + +void KMessageWidgetPrivate::init(KMessageWidget *q_ptr) +{ + q = q_ptr; + + q->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); + + // Note: when changing the value 500, also update KMessageWidgetTest + timeLine = new QTimeLine(500, q); + QObject::connect(timeLine, SIGNAL(valueChanged(qreal)), q, SLOT(slotTimeLineChanged(qreal))); + QObject::connect(timeLine, SIGNAL(finished()), q, SLOT(slotTimeLineFinished())); + + content = new QFrame(q); + content->setObjectName(QStringLiteral("contentWidget")); + content->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + + wordWrap = false; + + iconLabel = new QLabel(content); + iconLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + iconLabel->hide(); + + textLabel = new QLabel(content); + textLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + textLabel->setTextInteractionFlags(Qt::TextBrowserInteraction); + QObject::connect(textLabel, &QLabel::linkActivated, q, &KMessageWidget::linkActivated); + QObject::connect(textLabel, &QLabel::linkHovered, q, &KMessageWidget::linkHovered); + + QAction *closeAction = new QAction(q); + closeAction->setText(KMessageWidget::tr("&Close")); + closeAction->setToolTip(KMessageWidget::tr("Close message")); + closeAction->setIcon(QIcon(":/client/resources/close.svg")); // ivan: NC customization + + QObject::connect(closeAction, &QAction::triggered, q, &KMessageWidget::animatedHide); + + closeButton = new QToolButton(content); + closeButton->setAutoRaise(true); + closeButton->setDefaultAction(closeAction); + + q->setMessageType(KMessageWidget::Information); +} + +void KMessageWidgetPrivate::createLayout() +{ + delete content->layout(); + + content->resize(q->size()); + + qDeleteAll(buttons); + buttons.clear(); + + Q_FOREACH (QAction *action, q->actions()) { + QToolButton *button = new QToolButton(content); + button->setDefaultAction(action); + button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + buttons.append(button); + } + + // AutoRaise reduces visual clutter, but we don't want to turn it on if + // there are other buttons, otherwise the close button will look different + // from the others. + closeButton->setAutoRaise(buttons.isEmpty()); + + if (wordWrap) { + QGridLayout *layout = new QGridLayout(content); + // Set alignment to make sure icon does not move down if text wraps + layout->addWidget(iconLabel, 0, 0, 1, 1, Qt::AlignHCenter | Qt::AlignTop); + layout->addWidget(textLabel, 0, 1); + + if (buttons.isEmpty()) { + // Use top-vertical alignment like the icon does. + layout->addWidget(closeButton, 0, 2, 1, 1, Qt::AlignHCenter | Qt::AlignTop); + } else { + // Use an additional layout in row 1 for the buttons. + QHBoxLayout *buttonLayout = new QHBoxLayout; + buttonLayout->addStretch(); + Q_FOREACH (QToolButton *button, buttons) { + // For some reason, calling show() is necessary if wordwrap is true, + // otherwise the buttons do not show up. It is not needed if + // wordwrap is false. + button->show(); + buttonLayout->addWidget(button); + } + buttonLayout->addWidget(closeButton); + layout->addItem(buttonLayout, 1, 0, 1, 2); + } + } else { + QHBoxLayout *layout = new QHBoxLayout(content); + layout->addWidget(iconLabel); + layout->addWidget(textLabel); + + for (QToolButton *button : qAsConst(buttons)) { + layout->addWidget(button); + } + + layout->addWidget(closeButton); + }; + + if (q->isVisible()) { + q->setFixedHeight(content->sizeHint().height()); + } + q->updateGeometry(); +} + +void KMessageWidgetPrivate::applyStyleSheet() +{ + QColor bgBaseColor; + + // We have to hardcode colors here because KWidgetsAddons is a tier 1 framework + // and therefore can't depend on any other KDE Frameworks + // The following RGB color values come from the "default" scheme in kcolorscheme.cpp + switch (messageType) { + case KMessageWidget::Positive: + bgBaseColor.setRgb(39, 174, 96); // Window: ForegroundPositive + break; + case KMessageWidget::Information: + bgBaseColor.setRgb(61, 174, 233); // Window: ForegroundActive + break; + case KMessageWidget::Warning: + bgBaseColor.setRgb(246, 116, 0); // Window: ForegroundNeutral + break; + case KMessageWidget::Error: + bgBaseColor.setRgb(218, 68, 83); // Window: ForegroundNegative + break; + } + const qreal bgBaseColorAlpha = 0.2; + bgBaseColor.setAlphaF(bgBaseColorAlpha); + + const QPalette palette = QGuiApplication::palette(); + const QColor windowColor = palette.window().color(); + const QColor textColor = palette.text().color(); + const QColor border = bgBaseColor; + + // Generate a final background color from overlaying bgBaseColor over windowColor + const int newRed = (bgBaseColor.red() * bgBaseColorAlpha) + (windowColor.red() * (1 - bgBaseColorAlpha)); + const int newGreen = (bgBaseColor.green() * bgBaseColorAlpha) + (windowColor.green() * (1 - bgBaseColorAlpha)); + const int newBlue = (bgBaseColor.blue() * bgBaseColorAlpha) + (windowColor.blue() * (1 - bgBaseColorAlpha)); + + const QColor bgFinalColor = QColor(newRed, newGreen, newBlue); + + content->setStyleSheet( + QString::fromLatin1(".QFrame {" + "background-color: %1;" + "border-radius: 4px;" + "border: 2px solid %2;" + "margin: %3px;" + "}" + ".QLabel { color: %4; }" + ) + .arg(bgFinalColor.name()) + .arg(border.name()) + // DefaultFrameWidth returns the size of the external margin + border width. We know our border is 1px, so we subtract this from the frame normal QStyle FrameWidth to get our margin + .arg(q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, nullptr, q) - 1) + .arg(textColor.name()) + ); +} + +void KMessageWidgetPrivate::updateLayout() +{ + if (content->layout()) { + createLayout(); + } +} + +void KMessageWidgetPrivate::updateSnapShot() +{ + // Attention: updateSnapShot calls QWidget::render(), which causes the whole + // window layouts to be activated. Calling this method from resizeEvent() + // can lead to infinite recursion, see: + // https://bugs.kde.org/show_bug.cgi?id=311336 + contentSnapShot = QPixmap(content->size() * q->devicePixelRatio()); + contentSnapShot.setDevicePixelRatio(q->devicePixelRatio()); + contentSnapShot.fill(Qt::transparent); + content->render(&contentSnapShot, QPoint(), QRegion(), QWidget::DrawChildren); +} + +void KMessageWidgetPrivate::slotTimeLineChanged(qreal value) +{ + q->setFixedHeight(qMin(value * 2, qreal(1.0)) * content->height()); + q->update(); +} + +void KMessageWidgetPrivate::slotTimeLineFinished() +{ + if (timeLine->direction() == QTimeLine::Forward) { + // Show + // We set the whole geometry here, because it may be wrong if a + // KMessageWidget is shown right when the toplevel window is created. + content->setGeometry(0, 0, q->width(), bestContentHeight()); + + // notify about finished animation + emit q->showAnimationFinished(); + } else { + // hide and notify about finished animation + q->hide(); + emit q->hideAnimationFinished(); + } +} + +int KMessageWidgetPrivate::bestContentHeight() const +{ + int height = content->heightForWidth(q->width()); + if (height == -1) { + height = content->sizeHint().height(); + } + return height; +} + +//--------------------------------------------------------------------- +// KMessageWidget +//--------------------------------------------------------------------- +KMessageWidget::KMessageWidget(QWidget *parent) + : QFrame(parent) + , d(new KMessageWidgetPrivate) +{ + d->init(this); +} + +KMessageWidget::KMessageWidget(const QString &text, QWidget *parent) + : QFrame(parent) + , d(new KMessageWidgetPrivate) +{ + d->init(this); + setText(text); +} + +KMessageWidget::~KMessageWidget() +{ + delete d; +} + +QString KMessageWidget::text() const +{ + return d->textLabel->text(); +} + +void KMessageWidget::setText(const QString &text) +{ + d->textLabel->setText(text); + updateGeometry(); +} + +KMessageWidget::MessageType KMessageWidget::messageType() const +{ + return d->messageType; +} + +void KMessageWidget::setMessageType(KMessageWidget::MessageType type) +{ + d->messageType = type; + d->applyStyleSheet(); +} + +QSize KMessageWidget::sizeHint() const +{ + ensurePolished(); + return d->content->sizeHint(); +} + +QSize KMessageWidget::minimumSizeHint() const +{ + ensurePolished(); + return d->content->minimumSizeHint(); +} + +bool KMessageWidget::event(QEvent *event) +{ + if (event->type() == QEvent::Polish && !d->content->layout()) { + d->createLayout(); + } else if (event->type() == QEvent::PaletteChange) { + d->applyStyleSheet(); + } else if (event->type() == QEvent::Show && !d->ignoreShowEventDoingAnimatedShow) { + if ((height() != d->content->height()) || (d->content->pos().y() != 0)) { + d->content->move(0, 0); + setFixedHeight(d->content->height()); + } + } + return QFrame::event(event); +} + +void KMessageWidget::resizeEvent(QResizeEvent *event) +{ + QFrame::resizeEvent(event); + + if (d->timeLine->state() == QTimeLine::NotRunning) { + d->content->resize(width(), d->bestContentHeight()); + } +} + +int KMessageWidget::heightForWidth(int width) const +{ + ensurePolished(); + return d->content->heightForWidth(width); +} + +void KMessageWidget::paintEvent(QPaintEvent *event) +{ + QFrame::paintEvent(event); + if (d->timeLine->state() == QTimeLine::Running) { + QPainter painter(this); + painter.setOpacity(d->timeLine->currentValue() * d->timeLine->currentValue()); + painter.drawPixmap(0, 0, d->contentSnapShot); + } +} + +bool KMessageWidget::wordWrap() const +{ + return d->wordWrap; +} + +void KMessageWidget::setWordWrap(bool wordWrap) +{ + d->wordWrap = wordWrap; + d->textLabel->setWordWrap(wordWrap); + QSizePolicy policy = sizePolicy(); + policy.setHeightForWidth(wordWrap); + setSizePolicy(policy); + d->updateLayout(); + // Without this, when user does wordWrap -> !wordWrap -> wordWrap, a minimum + // height is set, causing the widget to be too high. + // Mostly visible in test programs. + if (wordWrap) { + setMinimumHeight(0); + } +} + +bool KMessageWidget::isCloseButtonVisible() const +{ + return d->closeButton->isVisible(); +} + +void KMessageWidget::setCloseButtonVisible(bool show) +{ + d->closeButton->setVisible(show); + updateGeometry(); +} + +void KMessageWidget::addAction(QAction *action) +{ + QFrame::addAction(action); + d->updateLayout(); +} + +void KMessageWidget::removeAction(QAction *action) +{ + QFrame::removeAction(action); + d->updateLayout(); +} + +void KMessageWidget::animatedShow() +{ + // Test before styleHint, as there might have been a style change while animation was running + if (isHideAnimationRunning()) { + d->timeLine->stop(); + emit hideAnimationFinished(); + } + + if (!style()->styleHint(QStyle::SH_Widget_Animate, nullptr, this) + || (parentWidget() && !parentWidget()->isVisible())) { + show(); + emit showAnimationFinished(); + return; + } + + if (isVisible() && (d->timeLine->state() == QTimeLine::NotRunning) && (height() == d->bestContentHeight()) && (d->content->pos().y() == 0)) { + emit showAnimationFinished(); + return; + } + + d->ignoreShowEventDoingAnimatedShow = true; + show(); + d->ignoreShowEventDoingAnimatedShow = false; + setFixedHeight(0); + int wantedHeight = d->bestContentHeight(); + d->content->setGeometry(0, -wantedHeight, width(), wantedHeight); + + d->updateSnapShot(); + + d->timeLine->setDirection(QTimeLine::Forward); + if (d->timeLine->state() == QTimeLine::NotRunning) { + d->timeLine->start(); + } +} + +void KMessageWidget::animatedHide() +{ + // test this before isVisible, as animatedShow might have been called directly before, + // so the first timeline event is not yet done and the widget is still hidden + // And before styleHint, as there might have been a style change while animation was running + if (isShowAnimationRunning()) { + d->timeLine->stop(); + emit showAnimationFinished(); + } + + if (!style()->styleHint(QStyle::SH_Widget_Animate, nullptr, this)) { + hide(); + emit hideAnimationFinished(); + return; + } + + if (!isVisible()) { + // explicitly hide it, so it stays hidden in case it is only not visible due to the parents + hide(); + emit hideAnimationFinished(); + return; + } + + d->content->move(0, -d->content->height()); + d->updateSnapShot(); + + d->timeLine->setDirection(QTimeLine::Backward); + if (d->timeLine->state() == QTimeLine::NotRunning) { + d->timeLine->start(); + } +} + +bool KMessageWidget::isHideAnimationRunning() const +{ + return (d->timeLine->direction() == QTimeLine::Backward) + && (d->timeLine->state() == QTimeLine::Running); +} + +bool KMessageWidget::isShowAnimationRunning() const +{ + return (d->timeLine->direction() == QTimeLine::Forward) + && (d->timeLine->state() == QTimeLine::Running); +} + +QIcon KMessageWidget::icon() const +{ + return d->icon; +} + +void KMessageWidget::setIcon(const QIcon &icon) +{ + d->icon = icon; + if (d->icon.isNull()) { + d->iconLabel->hide(); + } else { + const int size = style()->pixelMetric(QStyle::PM_ToolBarIconSize); + d->iconLabel->setPixmap(d->icon.pixmap(size)); + d->iconLabel->show(); + } +} + +#include "moc_kmessagewidget.cpp" + diff --git a/src/3rdparty/kmessagewidget/kmessagewidget.h b/src/3rdparty/kmessagewidget/kmessagewidget.h new file mode 100644 index 000000000..cc2767bf9 --- /dev/null +++ b/src/3rdparty/kmessagewidget/kmessagewidget.h @@ -0,0 +1,346 @@ +/* This file is part of the KDE libraries + * + * Copyright (c) 2011 Aurélien Gâteau <agateau@kde.org> + * Copyright (c) 2014 Dominik Haumann <dhaumann@kde.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#ifndef KMESSAGEWIDGET_H +#define KMESSAGEWIDGET_H + +#include <QFrame> + +class KMessageWidgetPrivate; + +/** + * @class KMessageWidget kmessagewidget.h KMessageWidget + * + * @short A widget to provide feedback or propose opportunistic interactions. + * + * KMessageWidget can be used to provide inline positive or negative + * feedback, or to implement opportunistic interactions. + * + * As a feedback widget, KMessageWidget provides a less intrusive alternative + * to "OK Only" message boxes. If you want to avoid a modal KMessageBox, + * consider using KMessageWidget instead. + * + * Examples of KMessageWidget look as follows, all of them having an icon set + * with setIcon(), and the first three show a close button: + * + * \image html kmessagewidget.png "KMessageWidget with different message types" + * + * <b>Negative feedback</b> + * + * The KMessageWidget can be used as a secondary indicator of failure: the + * first indicator is usually the fact the action the user expected to happen + * did not happen. + * + * Example: User fills a form, clicks "Submit". + * + * @li Expected feedback: form closes + * @li First indicator of failure: form stays there + * @li Second indicator of failure: a KMessageWidget appears on top of the + * form, explaining the error condition + * + * When used to provide negative feedback, KMessageWidget should be placed + * close to its context. In the case of a form, it should appear on top of the + * form entries. + * + * KMessageWidget should get inserted in the existing layout. Space should not + * be reserved for it, otherwise it becomes "dead space", ignored by the user. + * KMessageWidget should also not appear as an overlay to prevent blocking + * access to elements the user needs to interact with to fix the failure. + * + * <b>Positive feedback</b> + * + * KMessageWidget can be used for positive feedback but it shouldn't be + * overused. It is often enough to provide feedback by simply showing the + * results of an action. + * + * Examples of acceptable uses: + * + * @li Confirm success of "critical" transactions + * @li Indicate completion of background tasks + * + * Example of unadapted uses: + * + * @li Indicate successful saving of a file + * @li Indicate a file has been successfully removed + * + * <b>Opportunistic interaction</b> + * + * Opportunistic interaction is the situation where the application suggests to + * the user an action he could be interested in perform, either based on an + * action the user just triggered or an event which the application noticed. + * + * Example of acceptable uses: + * + * @li A browser can propose remembering a recently entered password + * @li A music collection can propose ripping a CD which just got inserted + * @li A chat application may notify the user a "special friend" just connected + * + * @author Aurélien Gâteau <agateau@kde.org> + * @since 4.7 + */ +class KMessageWidget : public QFrame +{ + Q_OBJECT + + Q_PROPERTY(QString text READ text WRITE setText) + Q_PROPERTY(bool wordWrap READ wordWrap WRITE setWordWrap) + Q_PROPERTY(bool closeButtonVisible READ isCloseButtonVisible WRITE setCloseButtonVisible) + Q_PROPERTY(MessageType messageType READ messageType WRITE setMessageType) + Q_PROPERTY(QIcon icon READ icon WRITE setIcon) +public: + + /** + * Available message types. + * The background colors are chosen depending on the message type. + */ + enum MessageType { + Positive, + Information, + Warning, + Error + }; + Q_ENUM(MessageType) + + /** + * Constructs a KMessageWidget with the specified @p parent. + */ + explicit KMessageWidget(QWidget *parent = nullptr); + + /** + * Constructs a KMessageWidget with the specified @p parent and + * contents @p text. + */ + explicit KMessageWidget(const QString &text, QWidget *parent = nullptr); + + /** + * Destructor. + */ + ~KMessageWidget() override; + + /** + * Get the text of this message widget. + * @see setText() + */ + QString text() const; + + /** + * Check whether word wrap is enabled. + * + * If word wrap is enabled, the message widget wraps the displayed text + * as required to the available width of the widget. This is useful to + * avoid breaking widget layouts. + * + * @see setWordWrap() + */ + bool wordWrap() const; + + /** + * Check whether the close button is visible. + * + * @see setCloseButtonVisible() + */ + bool isCloseButtonVisible() const; + + /** + * Get the type of this message. + * By default, the type is set to KMessageWidget::Information. + * + * @see KMessageWidget::MessageType, setMessageType() + */ + MessageType messageType() const; + + /** + * Add @p action to the message widget. + * For each action a button is added to the message widget in the + * order the actions were added. + * + * @param action the action to add + * @see removeAction(), QWidget::actions() + */ + void addAction(QAction *action); + + /** + * Remove @p action from the message widget. + * + * @param action the action to remove + * @see KMessageWidget::MessageType, addAction(), setMessageType() + */ + void removeAction(QAction *action); + + /** + * Returns the preferred size of the message widget. + */ + QSize sizeHint() const override; + + /** + * Returns the minimum size of the message widget. + */ + QSize minimumSizeHint() const override; + + /** + * Returns the required height for @p width. + * @param width the width in pixels + */ + int heightForWidth(int width) const override; + + /** + * The icon shown on the left of the text. By default, no icon is shown. + * @since 4.11 + */ + QIcon icon() const; + + /** + * Check whether the hide animation started by calling animatedHide() + * is still running. If animations are disabled, this function always + * returns @e false. + * + * @see animatedHide(), hideAnimationFinished() + * @since 5.0 + */ + bool isHideAnimationRunning() const; + + /** + * Check whether the show animation started by calling animatedShow() + * is still running. If animations are disabled, this function always + * returns @e false. + * + * @see animatedShow(), showAnimationFinished() + * @since 5.0 + */ + bool isShowAnimationRunning() const; + +public Q_SLOTS: + /** + * Set the text of the message widget to @p text. + * If the message widget is already visible, the text changes on the fly. + * + * @param text the text to display, rich text is allowed + * @see text() + */ + void setText(const QString &text); + + /** + * Set word wrap to @p wordWrap. If word wrap is enabled, the text() + * of the message widget is wrapped to fit the available width. + * If word wrap is disabled, the message widget's minimum size is + * such that the entire text fits. + * + * @param wordWrap disable/enable word wrap + * @see wordWrap() + */ + void setWordWrap(bool wordWrap); + + /** + * Set the visibility of the close button. If @p visible is @e true, + * a close button is shown that calls animatedHide() if clicked. + * + * @see closeButtonVisible(), animatedHide() + */ + void setCloseButtonVisible(bool visible); + + /** + * Set the message type to @p type. + * By default, the message type is set to KMessageWidget::Information. + * Appropriate colors are chosen to mimic the appearance of Kirigami's + * InlineMessage. + * + * @see messageType(), KMessageWidget::MessageType + */ + void setMessageType(KMessageWidget::MessageType type); + + /** + * Show the widget using an animation. + */ + void animatedShow(); + + /** + * Hide the widget using an animation. + */ + void animatedHide(); + + /** + * Define an icon to be shown on the left of the text + * @since 4.11 + */ + void setIcon(const QIcon &icon); + +Q_SIGNALS: + /** + * This signal is emitted when the user clicks a link in the text label. + * The URL referred to by the href anchor is passed in contents. + * @param contents text of the href anchor + * @see QLabel::linkActivated() + * @since 4.10 + */ + void linkActivated(const QString &contents); + + /** + * This signal is emitted when the user hovers over a link in the text label. + * The URL referred to by the href anchor is passed in contents. + * @param contents text of the href anchor + * @see QLabel::linkHovered() + * @since 4.11 + */ + void linkHovered(const QString &contents); + + /** + * This signal is emitted when the hide animation is finished, started by + * calling animatedHide(). If animations are disabled, this signal is + * emitted immediately after the message widget got hidden. + * + * @note This signal is @e not emitted if the widget was hidden by + * calling hide(), so this signal is only useful in conjunction + * with animatedHide(). + * + * @see animatedHide() + * @since 5.0 + */ + void hideAnimationFinished(); + + /** + * This signal is emitted when the show animation is finished, started by + * calling animatedShow(). If animations are disabled, this signal is + * emitted immediately after the message widget got shown. + * + * @note This signal is @e not emitted if the widget was shown by + * calling show(), so this signal is only useful in conjunction + * with animatedShow(). + * + * @see animatedShow() + * @since 5.0 + */ + void showAnimationFinished(); + +protected: + void paintEvent(QPaintEvent *event) override; + + bool event(QEvent *event) override; + + void resizeEvent(QResizeEvent *event) override; + +private: + KMessageWidgetPrivate *const d; + friend class KMessageWidgetPrivate; + + Q_PRIVATE_SLOT(d, void slotTimeLineChanged(qreal)) + Q_PRIVATE_SLOT(d, void slotTimeLineFinished()) +}; + +#endif /* KMESSAGEWIDGET_H */ diff --git a/src/common/utility_win.cpp b/src/common/utility_win.cpp index e3e4234e8..3706a4605 100644 --- a/src/common/utility_win.cpp +++ b/src/common/utility_win.cpp @@ -87,9 +87,36 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName, } } +// TODO: Right now only detection on toggle/startup, not when windows theme is switched while nextcloud is running static inline bool hasDarkSystray_private() { - return true; + bool hasDarkSystray = true; + // Open registry key first, continue only on success (may be legitimately absent in earlier windows versions) + HKEY hKey; + LONG lRes = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", 0, KEY_READ, &hKey); + + // classical windows function - preserve buff size for DWORD, call ExW version, store regkey value in nResult + if (lRes == ERROR_SUCCESS) { + DWORD dwBufferSize(sizeof(DWORD)); + DWORD nResult(0); + + // https://docs.microsoft.com/en-us/windows/win32/api/winreg/nf-winreg-regqueryvalueexw + LONG nError = ::RegQueryValueExW(hKey, + L"SystemUsesLightTheme", + NULL, + NULL, + reinterpret_cast<LPBYTE>(&nResult), + &dwBufferSize); + + // if RegQuery returned no error and light theme was found, change systray return value + if (nError == ERROR_SUCCESS && nResult == 1) + hasDarkSystray = false; + + return hasDarkSystray; + } else { + // fallback to true if regkey could not be determined + return hasDarkSystray; + } } QVariant Utility::registryGetKeyValue(HKEY hRootKey, const QString &subKey, const QString &valueName) diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp index e3146a099..9a4f196ed 100644 --- a/src/csync/csync_exclude.cpp +++ b/src/csync/csync_exclude.cpp @@ -236,13 +236,29 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(const char *path, bool excludeC return match; } +static QByteArray leftIncludeLast(const QByteArray & arr, char c) +{ + // left up to and including `c` + return arr.left(arr.lastIndexOf(c, arr.size() - 2) + 1); +} using namespace OCC; -ExcludedFiles::ExcludedFiles() +ExcludedFiles::ExcludedFiles(QString localPath) + : _localPath(std::move(localPath)) { + Q_ASSERT(_localPath.endsWith("/")); // Windows used to use PathMatchSpec which allows *foo to match abc/deffoo. _wildcardsMatchSlash = Utility::isWindows(); + + // We're in a detached exclude probably coming from a partial sync or test + if (_localPath.isEmpty()) + return; + + // Load exclude file from base dir + QFileInfo fi(_localPath + ".sync-exclude.lst"); + if (fi.isReadable()) + addInTreeExcludeFilePath(fi.absoluteFilePath()); } ExcludedFiles::~ExcludedFiles() @@ -251,7 +267,13 @@ ExcludedFiles::~ExcludedFiles() void ExcludedFiles::addExcludeFilePath(const QString &path) { - _excludeFiles.insert(path); + _excludeFiles[_localPath.toUtf8()].append(path); +} + +void ExcludedFiles::addInTreeExcludeFilePath(const QString &path) +{ + BasePathByteArray basePath = leftIncludeLast(path.toUtf8(), '/'); + _excludeFiles[basePath].append(path); } void ExcludedFiles::setExcludeConflictFiles(bool onoff) @@ -261,9 +283,18 @@ void ExcludedFiles::setExcludeConflictFiles(bool onoff) void ExcludedFiles::addManualExclude(const QByteArray &expr) { - _manualExcludes.append(expr); - _allExcludes.append(expr); - prepare(); + addManualExclude(expr, _localPath.toUtf8()); +} + +void ExcludedFiles::addManualExclude(const QByteArray &expr, const QByteArray &basePath) +{ + Q_ASSERT(basePath.startsWith('/')); + Q_ASSERT(basePath.endsWith('/')); + + auto key = basePath; + _manualExcludes[key].append(expr); + _allExcludes[key].append(expr); + prepare(key); } void ExcludedFiles::clearManualExcludes() @@ -278,26 +309,47 @@ void ExcludedFiles::setWildcardsMatchSlash(bool onoff) prepare(); } +bool ExcludedFiles::loadExcludeFile(const QByteArray & basePath, const QString & file) +{ + QFile f(file); + if (!f.open(QIODevice::ReadOnly)) + return false; + + while (!f.atEnd()) { + QByteArray line = f.readLine().trimmed(); + if (line.isEmpty() || line.startsWith('#')) + continue; + csync_exclude_expand_escapes(line); + _allExcludes[basePath].append(line); + } + prepare(basePath); + return true; +} + bool ExcludedFiles::reloadExcludeFiles() { _allExcludes.clear(); + // clear all regex + _bnameTraversalRegexFile.clear(); + _bnameTraversalRegexDir.clear(); + _fullTraversalRegexFile.clear(); + _fullTraversalRegexDir.clear(); + _fullRegexFile.clear(); + _fullRegexDir.clear(); + bool success = true; - foreach (const QString &file, _excludeFiles) { - QFile f(file); - if (!f.open(QIODevice::ReadOnly)) { - success = false; - continue; - } - while (!f.atEnd()) { - QByteArray line = f.readLine().trimmed(); - if (line.isEmpty() || line.startsWith('#')) - continue; - csync_exclude_expand_escapes(line); - _allExcludes.append(line); + for (auto basePath : _excludeFiles.keys()) { + for (auto file : _excludeFiles.value(basePath)) { + success = loadExcludeFile(basePath, file); } } - _allExcludes.append(_manualExcludes); - prepare(); + + auto endManual = _manualExcludes.cend(); + for (auto kv = _manualExcludes.cbegin(); kv != endManual; ++kv) { + _allExcludes[kv.key()].append(kv.value()); + prepare(kv.key()); + } + return success; } @@ -311,13 +363,15 @@ bool ExcludedFiles::isExcluded( return true; } + //TODO this seems a waste, hidden files are ignored before hitting this function it seems if (excludeHidden) { QString path = filePath; // Check all path subcomponents, but to *not* check the base path: // We do want to be able to sync with a hidden folder as the target. while (path.size() > basePath.size()) { QFileInfo fi(path); - if (fi.isHidden() || fi.fileName().startsWith(QLatin1Char('.'))) { + if (fi.fileName() != ".sync-exclude.lst" + && (fi.isHidden() || fi.fileName().startsWith(QLatin1Char('.')))) { return true; } @@ -340,7 +394,7 @@ bool ExcludedFiles::isExcluded( return fullPatternMatch(relativePath.toUtf8(), type) != CSYNC_NOT_EXCLUDED; } -CSYNC_EXCLUDE_TYPE ExcludedFiles::traversalPatternMatch(const char *path, ItemType filetype) const +CSYNC_EXCLUDE_TYPE ExcludedFiles::traversalPatternMatch(const char *path, ItemType filetype) { auto match = _csync_excluded_common(path, _excludeConflictFiles); if (match != CSYNC_NOT_EXCLUDED) @@ -348,6 +402,15 @@ CSYNC_EXCLUDE_TYPE ExcludedFiles::traversalPatternMatch(const char *path, ItemTy if (_allExcludes.isEmpty()) return CSYNC_NOT_EXCLUDED; + // Directories are guaranteed to be visited before their files + if (filetype == ItemTypeDirectory) { + QFileInfo fi = QFileInfo(_localPath + path + "/.sync-exclude.lst"); + if (fi.isReadable()) { + addInTreeExcludeFilePath(fi.absoluteFilePath()); + loadExcludeFile(fi.absolutePath().toUtf8(), fi.absoluteFilePath()); + } + } + // Check the bname part of the path to see whether the full // regex should be run. @@ -359,35 +422,53 @@ CSYNC_EXCLUDE_TYPE ExcludedFiles::traversalPatternMatch(const char *path, ItemTy } QString bnameStr = QString::fromUtf8(bname); - QRegularExpressionMatch m; - if (filetype == ItemTypeDirectory) { - m = _bnameTraversalRegexDir.match(bnameStr); - } else { - m = _bnameTraversalRegexFile.match(bnameStr); - } - if (!m.hasMatch()) - return CSYNC_NOT_EXCLUDED; - if (m.capturedStart(QStringLiteral("exclude")) != -1) { - return CSYNC_FILE_EXCLUDE_LIST; - } else if (m.capturedStart(QStringLiteral("excluderemove")) != -1) { - return CSYNC_FILE_EXCLUDE_AND_REMOVE; - } - - // third capture: full path matching is triggered - QString pathStr = QString::fromUtf8(path); + QByteArray basePath(_localPath.toUtf8() + path); + while (basePath.size() > _localPath.size()) { + basePath = leftIncludeLast(basePath, '/'); + QRegularExpressionMatch m; + if (filetype == ItemTypeDirectory + && _bnameTraversalRegexDir.contains(basePath)) { + m = _bnameTraversalRegexDir[basePath].match(bnameStr); + } else if (filetype == ItemTypeFile + && _bnameTraversalRegexFile.contains(basePath)) { + m = _bnameTraversalRegexFile[basePath].match(bnameStr); + } else { + continue; + } - if (filetype == ItemTypeDirectory) { - m = _fullTraversalRegexDir.match(pathStr); - } else { - m = _fullTraversalRegexFile.match(pathStr); - } - if (m.hasMatch()) { + if (!m.hasMatch()) + return CSYNC_NOT_EXCLUDED; if (m.capturedStart(QStringLiteral("exclude")) != -1) { return CSYNC_FILE_EXCLUDE_LIST; } else if (m.capturedStart(QStringLiteral("excluderemove")) != -1) { return CSYNC_FILE_EXCLUDE_AND_REMOVE; } } + + // third capture: full path matching is triggered + QString pathStr = QString::fromUtf8(path); + basePath = _localPath.toUtf8() + path; + while (basePath.size() > _localPath.size()) { + basePath = leftIncludeLast(basePath, '/'); + QRegularExpressionMatch m; + if (filetype == ItemTypeDirectory + && _fullTraversalRegexDir.contains(basePath)) { + m = _fullTraversalRegexDir[basePath].match(pathStr); + } else if (filetype == ItemTypeFile + && _fullTraversalRegexFile.contains(basePath)) { + m = _fullTraversalRegexFile[basePath].match(pathStr); + } else { + continue; + } + + if (m.hasMatch()) { + if (m.capturedStart(QStringLiteral("exclude")) != -1) { + return CSYNC_FILE_EXCLUDE_LIST; + } else if (m.capturedStart(QStringLiteral("excluderemove")) != -1) { + return CSYNC_FILE_EXCLUDE_AND_REMOVE; + } + } + } return CSYNC_NOT_EXCLUDED; } @@ -400,23 +481,38 @@ CSYNC_EXCLUDE_TYPE ExcludedFiles::fullPatternMatch(const char *path, ItemType fi return CSYNC_NOT_EXCLUDED; QString p = QString::fromUtf8(path); - QRegularExpressionMatch m; - if (filetype == ItemTypeDirectory) { - m = _fullRegexDir.match(p); - } else { - m = _fullRegexFile.match(p); - } - if (m.hasMatch()) { - if (m.capturedStart(QStringLiteral("exclude")) != -1) { - return CSYNC_FILE_EXCLUDE_LIST; - } else if (m.capturedStart(QStringLiteral("excluderemove")) != -1) { - return CSYNC_FILE_EXCLUDE_AND_REMOVE; + // `path` seems to always be relative to `_localPath`, the tests however have not been + // written that way... this makes the tests happy for now. TODO Fix the tests at some point + if (path[0] == '/') + ++path; + + QByteArray basePath(_localPath.toUtf8() + path); + while (basePath.size() > _localPath.size()) { + basePath = leftIncludeLast(basePath, '/'); + QRegularExpressionMatch m; + if (filetype == ItemTypeDirectory + && _fullRegexDir.contains(basePath)) { + m = _fullRegexDir[basePath].match(p); + } else if (filetype == ItemTypeFile + && _fullRegexFile.contains(basePath)) { + m = _fullRegexFile[basePath].match(p); + } else { + continue; + } + + if (m.hasMatch()) { + if (m.capturedStart(QStringLiteral("exclude")) != -1) { + return CSYNC_FILE_EXCLUDE_LIST; + } else if (m.capturedStart(QStringLiteral("excluderemove")) != -1) { + return CSYNC_FILE_EXCLUDE_AND_REMOVE; + } } } + return CSYNC_NOT_EXCLUDED; } -auto ExcludedFiles::csyncTraversalMatchFun() const +auto ExcludedFiles::csyncTraversalMatchFun() -> std::function<CSYNC_EXCLUDE_TYPE(const char *path, ItemType filetype)> { return [this](const char *path, ItemType filetype) { return this->traversalPatternMatch(path, filetype); }; @@ -555,6 +651,22 @@ static QString extractBnameTrigger(const QString &exclude, bool wildcardsMatchSl void ExcludedFiles::prepare() { + // clear all regex + _bnameTraversalRegexFile.clear(); + _bnameTraversalRegexDir.clear(); + _fullTraversalRegexFile.clear(); + _fullTraversalRegexDir.clear(); + _fullRegexFile.clear(); + _fullRegexDir.clear(); + + for (auto const & basePath : _allExcludes.keys()) + prepare(basePath); +} + +void ExcludedFiles::prepare(const BasePathByteArray & basePath) +{ + Q_ASSERT(_allExcludes.contains(basePath)); + // Build regular expressions for the different cases. // // To compose the _bnameTraversalRegex, _fullTraversalRegex and _fullRegex @@ -596,7 +708,7 @@ void ExcludedFiles::prepare() pattern.append(appendMe); }; - for (auto exclude : _allExcludes) { + for (auto exclude : _allExcludes.value(basePath)) { if (exclude[0] == '\n') continue; // empty line if (exclude[0] == '\r') @@ -618,6 +730,15 @@ void ExcludedFiles::prepare() auto &fullFileDir = removeExcluded ? fullFileDirRemove : fullFileDirKeep; auto &fullDir = removeExcluded ? fullDirRemove : fullDirKeep; + if (fullPath) { + // The full pattern is matched against a path relative to _localPath, however exclude is + // relative to basePath at this point. + // We know for sure that both _localPath and basePath are absolute and that basePath is + // contained in _localPath. So we can simply remove it from the begining. + auto relPath = basePath.mid(_localPath.size()); + // Make exclude relative to _localPath + exclude.prepend(relPath); + } auto regexExclude = convertToRegexpSyntax(QString::fromUtf8(exclude), _wildcardsMatchSlash); if (!fullPath) { regexAppend(bnameFileDir, bnameDir, regexExclude, matchDirOnly); @@ -654,11 +775,11 @@ void ExcludedFiles::prepare() // (exclude)|(excluderemove)|(bname triggers). // If the third group matches, the fullActivatedRegex needs to be applied // to the full path. - _bnameTraversalRegexFile.setPattern( + _bnameTraversalRegexFile[basePath].setPattern( "^(?P<exclude>" + bnameFileDirKeep + ")$|" + "^(?P<excluderemove>" + bnameFileDirRemove + ")$|" + "^(?P<trigger>" + bnameTriggerFileDir + ")$"); - _bnameTraversalRegexDir.setPattern( + _bnameTraversalRegexDir[basePath].setPattern( "^(?P<exclude>" + bnameFileDirKeep + "|" + bnameDirKeep + ")$|" + "^(?P<excluderemove>" + bnameFileDirRemove + "|" + bnameDirRemove + ")$|" + "^(?P<trigger>" + bnameTriggerFileDir + "|" + bnameTriggerDir + ")$"); @@ -667,13 +788,13 @@ void ExcludedFiles::prepare() // the bname regex matches. Its basic form is (exclude)|(excluderemove)". // This pattern can be much simpler than fullRegex since we can assume a traversal // situation and doesn't need to look for bname patterns in parent paths. - _fullTraversalRegexFile.setPattern( + _fullTraversalRegexFile[basePath].setPattern( QLatin1String("") // Full patterns are anchored to the beginning + "^(?P<exclude>" + fullFileDirKeep + ")(?:$|/)" + "|" + "^(?P<excluderemove>" + fullFileDirRemove + ")(?:$|/)"); - _fullTraversalRegexDir.setPattern( + _fullTraversalRegexDir[basePath].setPattern( QLatin1String("") + "^(?P<exclude>" + fullFileDirKeep + "|" + fullDirKeep + ")(?:$|/)" + "|" @@ -681,7 +802,7 @@ void ExcludedFiles::prepare() // The full regex is applied to the full path and incorporates both bname and // full-path patterns. It has the form "(exclude)|(excluderemove)". - _fullRegexFile.setPattern( + _fullRegexFile[basePath].setPattern( QLatin1String("(?P<exclude>") // Full patterns are anchored to the beginning + "^(?:" + fullFileDirKeep + ")(?:$|/)" + "|" @@ -697,7 +818,7 @@ void ExcludedFiles::prepare() + "(?:^|/)(?:" + bnameFileDirRemove + ")(?:$|/)" + "|" + "(?:^|/)(?:" + bnameDirRemove + ")/" + ")"); - _fullRegexDir.setPattern( + _fullRegexDir[basePath].setPattern( QLatin1String("(?P<exclude>") + "^(?:" + fullFileDirKeep + "|" + fullDirKeep + ")(?:$|/)" + "|" + "(?:^|/)(?:" + bnameFileDirKeep + "|" + bnameDirKeep + ")(?:$|/)" @@ -711,16 +832,16 @@ void ExcludedFiles::prepare() QRegularExpression::PatternOptions patternOptions = QRegularExpression::NoPatternOption; if (OCC::Utility::fsCasePreserving()) patternOptions |= QRegularExpression::CaseInsensitiveOption; - _bnameTraversalRegexFile.setPatternOptions(patternOptions); - _bnameTraversalRegexFile.optimize(); - _bnameTraversalRegexDir.setPatternOptions(patternOptions); - _bnameTraversalRegexDir.optimize(); - _fullTraversalRegexFile.setPatternOptions(patternOptions); - _fullTraversalRegexFile.optimize(); - _fullTraversalRegexDir.setPatternOptions(patternOptions); - _fullTraversalRegexDir.optimize(); - _fullRegexFile.setPatternOptions(patternOptions); - _fullRegexFile.optimize(); - _fullRegexDir.setPatternOptions(patternOptions); - _fullRegexDir.optimize(); + _bnameTraversalRegexFile[basePath].setPatternOptions(patternOptions); + _bnameTraversalRegexFile[basePath].optimize(); + _bnameTraversalRegexDir[basePath].setPatternOptions(patternOptions); + _bnameTraversalRegexDir[basePath].optimize(); + _fullTraversalRegexFile[basePath].setPatternOptions(patternOptions); + _fullTraversalRegexFile[basePath].optimize(); + _fullTraversalRegexDir[basePath].setPatternOptions(patternOptions); + _fullTraversalRegexDir[basePath].optimize(); + _fullRegexFile[basePath].setPatternOptions(patternOptions); + _fullRegexFile[basePath].optimize(); + _fullRegexDir[basePath].setPatternOptions(patternOptions); + _fullRegexDir[basePath].optimize(); } diff --git a/src/csync/csync_exclude.h b/src/csync/csync_exclude.h index 249ec7bff..0b1147791 100644 --- a/src/csync/csync_exclude.h +++ b/src/csync/csync_exclude.h @@ -66,7 +66,7 @@ class OCSYNC_EXPORT ExcludedFiles : public QObject { Q_OBJECT public: - ExcludedFiles(); + ExcludedFiles(QString localPath = "/"); ~ExcludedFiles(); /** @@ -75,6 +75,7 @@ public: * Does not load the file. Use reloadExcludeFiles() afterwards. */ void addExcludeFilePath(const QString &path); + void addInTreeExcludeFilePath(const QString &path); /** * Whether conflict files shall be excluded. @@ -95,12 +96,13 @@ public: bool excludeHidden) const; /** - * Adds an exclude pattern. + * Adds an exclude pattern anchored to base path * * Primarily used in tests. Patterns added this way are preserved when * reloadExcludeFiles() is called. */ void addManualExclude(const QByteArray &expr); + void addManualExclude(const QByteArray &expr, const QByteArray &basePath); /** * Removes all manually added exclude patterns. @@ -121,7 +123,7 @@ public: * Careful: The function will only be valid for as long as this * ExcludedFiles instance stays alive. */ - auto csyncTraversalMatchFun() const + auto csyncTraversalMatchFun() -> std::function<CSYNC_EXCLUDE_TYPE(const char *path, ItemType filetype)>; public slots: @@ -129,6 +131,10 @@ public slots: * Reloads the exclude patterns from the registered paths. */ bool reloadExcludeFiles(); + /** + * Loads the exclude patterns from file the registered base paths. + */ + bool loadExcludeFile(const QByteArray & basePath, const QString & file); private: /** @@ -156,10 +162,32 @@ private: * Note that this only matches patterns. It does not check whether the file * or directory pointed to is hidden (or whether it even exists). */ - CSYNC_EXCLUDE_TYPE traversalPatternMatch(const char *path, ItemType filetype) const; + CSYNC_EXCLUDE_TYPE traversalPatternMatch(const char *path, ItemType filetype); + + // Our BasePath need to end with '/' + class BasePathByteArray : public QByteArray + { + public: + BasePathByteArray(QByteArray && other) + : QByteArray(std::move(other)) + { + Q_ASSERT(this->endsWith('/')); + } + + BasePathByteArray(const QByteArray & other) + : QByteArray(other) + { + Q_ASSERT(this->endsWith('/')); + } + + BasePathByteArray(const char * data, int size = -1) + : BasePathByteArray(QByteArray(data, size)) + { + } + }; /** - * Generate optimized regular expressions for the exclude patterns. + * Generate optimized regular expressions for the exclude patterns anchored to basePath. * * The optimization works in two steps: First, all supported patterns are put * into _fullRegexFile/_fullRegexDir. These regexes can be applied to the full @@ -187,24 +215,28 @@ private: * full matcher would exclude. Example: "b" is excluded. traversal("b/c") * returns not-excluded because "c" isn't a bname activation pattern. */ + void prepare(const BasePathByteArray & basePath); + void prepare(); + + QString _localPath; /// Files to load excludes from - QSet<QString> _excludeFiles; + QMap<BasePathByteArray, QList<QString>> _excludeFiles; /// Exclude patterns added with addManualExclude() - QList<QByteArray> _manualExcludes; + QMap<BasePathByteArray, QList<QByteArray>> _manualExcludes; /// List of all active exclude patterns - QList<QByteArray> _allExcludes; + QMap<BasePathByteArray, QList<QByteArray>> _allExcludes; /// see prepare() - QRegularExpression _bnameTraversalRegexFile; - QRegularExpression _bnameTraversalRegexDir; - QRegularExpression _fullTraversalRegexFile; - QRegularExpression _fullTraversalRegexDir; - QRegularExpression _fullRegexFile; - QRegularExpression _fullRegexDir; + QMap<BasePathByteArray, QRegularExpression> _bnameTraversalRegexFile; + QMap<BasePathByteArray, QRegularExpression> _bnameTraversalRegexDir; + QMap<BasePathByteArray, QRegularExpression> _fullTraversalRegexFile; + QMap<BasePathByteArray, QRegularExpression> _fullTraversalRegexDir; + QMap<BasePathByteArray, QRegularExpression> _fullRegexFile; + QMap<BasePathByteArray, QRegularExpression> _fullRegexDir; bool _excludeConflictFiles = true; diff --git a/src/csync/csync_update.cpp b/src/csync/csync_update.cpp index fd6c6ec95..ecea21cae 100644 --- a/src/csync/csync_update.cpp +++ b/src/csync/csync_update.cpp @@ -124,7 +124,9 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f * because it's a hidden file that should not be synced. * This code should probably be in csync_exclude, but it does not have the fs parameter. * Keep it here for now */ - if (ctx->ignore_hidden_files && (fs->is_hidden)) { + if (ctx->ignore_hidden_files + && fs->is_hidden + && !fs->path.endsWith(".sync-exclude.lst")) { qCInfo(lcUpdate, "file excluded because it is a hidden file: %s", fs->path.constData()); excluded = CSYNC_FILE_EXCLUDE_HIDDEN; } diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 4e739e25a..e806bebba 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -22,6 +22,7 @@ set(client_UI_SRCS generalsettings.ui legalnotice.ui ignorelisteditor.ui + ignorelisttablewidget.ui networksettings.ui activitywidget.ui synclogdialog.ui @@ -38,6 +39,8 @@ set(client_UI_SRCS wizard/owncloudconnectionmethoddialog.ui wizard/owncloudhttpcredspage.ui wizard/owncloudoauthcredspage.ui + wizard/flow2authcredspage.ui + wizard/flow2authwidget.ui wizard/owncloudsetupnocredspage.ui wizard/owncloudwizardresultpage.ui wizard/webview.ui @@ -59,6 +62,7 @@ set(client_SRCS generalsettings.cpp legalnotice.cpp ignorelisteditor.cpp + ignorelisttablewidget.cpp lockwatcher.cpp logbrowser.cpp navigationpanehelper.cpp @@ -103,6 +107,7 @@ set(client_SRCS creds/credentialsfactory.cpp creds/httpcredentialsgui.cpp creds/oauth.cpp + creds/flow2auth.cpp creds/webflowcredentials.cpp creds/webflowcredentialsdialog.cpp wizard/postfixlineedit.cpp @@ -111,6 +116,8 @@ set(client_SRCS wizard/owncloudconnectionmethoddialog.cpp wizard/owncloudhttpcredspage.cpp wizard/owncloudoauthcredspage.cpp + wizard/flow2authcredspage.cpp + wizard/flow2authwidget.cpp wizard/owncloudsetuppage.cpp wizard/owncloudwizardcommon.cpp wizard/owncloudwizard.cpp @@ -165,6 +172,7 @@ set(3rdparty_SRC ../3rdparty/qtsingleapplication/qtlocalpeer.cpp ../3rdparty/qtsingleapplication/qtsingleapplication.cpp ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp + ../3rdparty/kmessagewidget/kmessagewidget.cpp ) if (APPLE) @@ -243,7 +251,7 @@ if(APPLE) file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-sidebar*") MESSAGE(STATUS "OWNCLOUD_SIDEBAR_ICONS: ${APPLICATION_ICON_NAME}: ${OWNCLOUD_SIDEBAR_ICONS}") endif() -ecm_add_app_icon(final_src ICONS "${OWNCLOUD_ICONS}" SIDEBAR_ICONS "${OWNCLOUD_SIDEBAR_ICONS}" OUTFILE_BASE "${APPLICATION_ICON_NAME}") +ecm_add_app_icon(final_src ICONS "${OWNCLOUD_ICONS}" SIDEBAR_ICONS "${OWNCLOUD_SIDEBAR_ICONS}" OUTFILE_BASENAME "${APPLICATION_ICON_NAME}") if(UNIX AND NOT APPLE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE") @@ -265,6 +273,9 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE) endforeach(_file) install(FILES ${client_I18N} DESTINATION ${SHAREDIR}/${APPLICATION_EXECUTABLE}/i18n) else() + file(GLOB_RECURSE VISUAL_ELEMENTS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-w10startmenu*") + install(FILES ${VISUAL_ELEMENTS} DESTINATION bin/visualelements) + install(FILES "${theme_dir}/${APPLICATION_EXECUTABLE}.VisualElementsManifest.xml" DESTINATION bin) install(FILES ${client_I18N} DESTINATION i18n) endif() @@ -329,6 +340,7 @@ target_include_directories(${APPLICATION_EXECUTABLE} PRIVATE ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile ${CMAKE_SOURCE_DIR}/src/3rdparty/qtmacgoodies/src ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication + ${CMAKE_SOURCE_DIR}/src/3rdparty/kmessagewidget ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index 8824ac7c7..ca00a4e17 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -342,9 +342,6 @@ AccountPtr AccountManager::createAccount() connect(acc.data(), &Account::proxyAuthenticationRequired, ProxyAuthHandler::instance(), &ProxyAuthHandler::handleProxyAuthenticationRequired); - connect(acc.data()->e2e(), &ClientSideEncryption::mnemonicGenerated, - &AccountManager::displayMnemonic); - return acc; } @@ -364,6 +361,7 @@ void AccountManager::displayMnemonic(const QString& mnemonic) widget->exec(); widget->resize(widget->sizeHint()); } + void AccountManager::shutdown() { auto accountsCopy = _accounts; diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 81f441f22..2fc324573 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -35,10 +35,12 @@ #include "filesystem.h" #include "clientsideencryptionjobs.h" #include "syncresult.h" +#include "ignorelisttablewidget.h" #include <math.h> #include <QDesktopServices> +#include <QDialogButtonBox> #include <QDir> #include <QListWidgetItem> #include <QMessageBox> @@ -194,6 +196,14 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) // Connect E2E stuff connect(this, &AccountSettings::requesetMnemonic, _accountState->account()->e2e(), &ClientSideEncryption::slotRequestMnemonic); connect(_accountState->account()->e2e(), &ClientSideEncryption::showMnemonic, this, &AccountSettings::slotShowMnemonic); + + connect(_accountState->account()->e2e(), &ClientSideEncryption::mnemonicGenerated, this, &AccountSettings::slotNewMnemonicGenerated); + if (_accountState->account()->e2e()->newMnemonicGenerated()) + { + slotNewMnemonicGenerated(); + } else { + ui->encryptionMessage->hide(); + } } @@ -222,6 +232,19 @@ void AccountSettings::createAccountToolbox() slotAccountAdded(_accountState); } + +void AccountSettings::slotNewMnemonicGenerated() +{ + ui->encryptionMessage->setText(tr("This account supports end-to-end encryption")); + + QAction *mnemonic = new QAction(tr("Enable encryption"), this); + connect(mnemonic, &QAction::triggered, this, &AccountSettings::requesetMnemonic); + connect(mnemonic, &QAction::triggered, ui->encryptionMessage, &KMessageWidget::hide); + + ui->encryptionMessage->addAction(mnemonic); + ui->encryptionMessage->show(); +} + void AccountSettings::slotMenuBeforeShow() { if (_menuShown) { return; @@ -401,7 +424,7 @@ bool AccountSettings::canEncryptOrDecrypt (const FolderStatusModel::SubFolderInf return true; } -void AccountSettings::slotMarkSubfolderEncrpted(const FolderStatusModel::SubFolderInfo* folderInfo) +void AccountSettings::slotMarkSubfolderEncrypted(const FolderStatusModel::SubFolderInfo* folderInfo) { if (!canEncryptOrDecrypt(folderInfo)) { return; @@ -518,6 +541,51 @@ void AccountSettings::slotLockForDecryptionError(const QByteArray& fileId, int h qDebug() << "Error Locking for decryption"; } +void AccountSettings::slotEditCurrentIgnoredFiles() +{ + Folder *f = FolderMan::instance()->folder(selectedFolderAlias()); + if (f == nullptr) + return; + openIgnoredFilesDialog(f->path()); +} + +void AccountSettings::slotEditCurrentLocalIgnoredFiles() +{ + QModelIndex selected = ui->_folderList->selectionModel()->currentIndex(); + if (!selected.isValid() || _model->classify(selected) != FolderStatusModel::SubFolder) + return; + QString fileName = _model->data(selected, FolderStatusDelegate::FolderPathRole).toString(); + openIgnoredFilesDialog(fileName); +} + +void AccountSettings::openIgnoredFilesDialog(const QString & absFolderPath) +{ + Q_ASSERT(absFolderPath.startsWith('/')); + Q_ASSERT(absFolderPath.endsWith('/')); + + const QString ignoreFile = absFolderPath + ".sync-exclude.lst"; + auto layout = new QVBoxLayout(); + auto ignoreListWidget = new IgnoreListTableWidget(this); + ignoreListWidget->readIgnoreFile(ignoreFile); + layout->addWidget(ignoreListWidget); + + auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + layout->addWidget(buttonBox); + + auto dialog = new QDialog(); + dialog->setLayout(layout); + + connect(buttonBox, &QDialogButtonBox::clicked, [=](QAbstractButton * button) { + if (buttonBox->buttonRole(button) == QDialogButtonBox::AcceptRole) + ignoreListWidget->slotWriteIgnoreFile(ignoreFile); + dialog->close(); + }); + connect(buttonBox, &QDialogButtonBox::rejected, + dialog, &QDialog::close); + + dialog->open(); +} + void AccountSettings::slotSubfolderContextMenuRequested(const QModelIndex& index, const QPoint& pos) { Q_UNUSED(pos); @@ -540,12 +608,16 @@ void AccountSettings::slotSubfolderContextMenuRequested(const QModelIndex& index if (!isEncrypted) { ac = menu.addAction(tr("Encrypt")); - connect(ac, &QAction::triggered, [this, &info] { slotMarkSubfolderEncrpted(info); }); + connect(ac, &QAction::triggered, [this, &info] { slotMarkSubfolderEncrypted(info); }); } else { // Ingore decrypting for now since it only works with an empty folder // connect(ac, &QAction::triggered, [this, &info] { slotMarkSubfolderDecrypted(info); }); } } + + ac = menu.addAction(tr("Edit Ignored Files")); + connect(ac, &QAction::triggered, this, &AccountSettings::slotEditCurrentLocalIgnoredFiles); + menu.exec(QCursor::pos()); } @@ -579,6 +651,9 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos) QAction *ac = menu->addAction(tr("Open folder")); connect(ac, &QAction::triggered, this, &AccountSettings::slotOpenCurrentFolder); + ac = menu->addAction(tr("Edit Ignored Files")); + connect(ac, &QAction::triggered, this, &AccountSettings::slotEditCurrentIgnoredFiles); + if (!ui->_folderList->isExpanded(index)) { ac = menu->addAction(tr("Choose what to sync")); ac->setEnabled(folderConnected); diff --git a/src/gui/accountsettings.h b/src/gui/accountsettings.h index e0132ae2f..ce1885d2d 100644 --- a/src/gui/accountsettings.h +++ b/src/gui/accountsettings.h @@ -80,6 +80,8 @@ protected slots: void slotRemoveCurrentFolder(); void slotOpenCurrentFolder(); // sync folder void slotOpenCurrentLocalSubFolder(); // selected subfolder in sync folder + void slotEditCurrentIgnoredFiles(); + void slotEditCurrentLocalIgnoredFiles(); void slotFolderWizardAccepted(); void slotFolderWizardRejected(); void slotDeleteAccount(); @@ -87,7 +89,7 @@ protected slots: void slotOpenAccountWizard(); void slotAccountAdded(AccountState *); void refreshSelectiveSyncStatus(); - void slotMarkSubfolderEncrpted(const FolderStatusModel::SubFolderInfo* folderInfo); + void slotMarkSubfolderEncrypted(const FolderStatusModel::SubFolderInfo* folderInfo); void slotMarkSubfolderDecrypted(const FolderStatusModel::SubFolderInfo* folderInfo); void slotSubfolderContextMenuRequested(const QModelIndex& idx, const QPoint& point); void slotCustomContextMenuRequested(const QPoint &); @@ -99,6 +101,7 @@ protected slots: // Encryption Related Stuff. void slotShowMnemonic(const QString &mnemonic); + void slotNewMnemonicGenerated(); void slotEncryptionFlagSuccess(const QByteArray &folderId); void slotEncryptionFlagError(const QByteArray &folderId, int httpReturnCode); @@ -109,7 +112,7 @@ protected slots: void slotUploadMetadataSuccess(const QByteArray& folderId); void slotUpdateMetadataError(const QByteArray& folderId, int httpReturnCode); - // Remove Encryotion Bit. + // Remove Encryption Bit. void slotLockForDecryptionSuccess(const QByteArray& folderId, const QByteArray& token); void slotLockForDecryptionError(const QByteArray& folderId, int httpReturnCode); void slotDeleteMetadataSuccess(const QByteArray& folderId); @@ -124,6 +127,7 @@ private: QStringList errors = QStringList()); bool event(QEvent *) override; void createAccountToolbox(); + void openIgnoredFilesDialog(const QString & absFolderPath); /// Returns the alias of the selected folder, empty string if none QString selectedFolderAlias() const; diff --git a/src/gui/accountsettings.ui b/src/gui/accountsettings.ui index 705f1bdad..6fd35566f 100644 --- a/src/gui/accountsettings.ui +++ b/src/gui/accountsettings.ui @@ -6,136 +6,15 @@ <rect> <x>0</x> <y>0</y> - <width>575</width> + <width>582</width> <height>557</height> </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QWidget" name="accountStatus" native="true"> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="SslButton" name="sslButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLabel" name="connectLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Connected with <server> as <user></string> - </property> - <property name="textFormat"> - <enum>Qt::RichText</enum> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - <property name="openExternalLinks"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QToolButton" name="_accountToolbox"> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="1" column="0"> - <layout class="QHBoxLayout" name="storageGroupBox"> - <item> - <widget class="QLabel" name="quotaInfoLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string/> - </property> - <property name="text"> - <string>Storage space: ...</string> - </property> - <property name="textFormat"> - <enum>Qt::PlainText</enum> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QProgressBar" name="quotaProgressBar"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>7</height> - </size> - </property> - <property name="maximum"> - <number>100</number> - </property> - <property name="value"> - <number>-1</number> - </property> - <property name="textVisible"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </item> - <item row="2" column="0"> - <widget class="OCC::FolderStatusView" name="_folderList"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>5</verstretch> - </sizepolicy> - </property> - <property name="contextMenuPolicy"> - <enum>Qt::CustomContextMenu</enum> - </property> - <property name="editTriggers"> - <set>QAbstractItemView::NoEditTriggers</set> - </property> - <property name="animated"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="0"> + <item row="4" column="0"> <widget class="QWidget" name="selectiveSyncStatus" native="true"> <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> @@ -267,6 +146,130 @@ </layout> </widget> </item> + <item row="0" column="0"> + <widget class="QWidget" name="accountStatus" native="true"> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="SslButton" name="sslButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="connectLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Connected with <server> as <user></string> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QToolButton" name="_accountToolbox"> + <property name="text"> + <string>...</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="2" column="0"> + <layout class="QHBoxLayout" name="storageGroupBox"> + <item> + <widget class="QLabel" name="quotaInfoLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>Storage space: ...</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QProgressBar" name="quotaProgressBar"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>7</height> + </size> + </property> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>-1</number> + </property> + <property name="textVisible"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + <item row="3" column="0"> + <widget class="OCC::FolderStatusView" name="_folderList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>5</verstretch> + </sizepolicy> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> + <property name="editTriggers"> + <set>QAbstractItemView::NoEditTriggers</set> + </property> + <property name="animated"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="KMessageWidget" name="encryptionMessage" native="true"/> + </item> </layout> </widget> <customwidgets> @@ -280,6 +283,12 @@ <extends>QTreeView</extends> <header>folderstatusview.h</header> </customwidget> + <customwidget> + <class>KMessageWidget</class> + <extends>QWidget</extends> + <header>kmessagewidget.h</header> + <container>1</container> + </customwidget> </customwidgets> <resources/> <connections/> diff --git a/src/gui/activitylistmodel.cpp b/src/gui/activitylistmodel.cpp index 5b084784b..d35fd1368 100644 --- a/src/gui/activitylistmodel.cpp +++ b/src/gui/activitylistmodel.cpp @@ -103,10 +103,12 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const || a._status == SyncFileItem::BlacklistedError) { return QIcon(QLatin1String(":/client/resources/state-error.svg")); } else if(a._status == SyncFileItem::SoftError - || a._status == SyncFileItem::FileIgnored || a._status == SyncFileItem::Conflict - || a._status == SyncFileItem::Restoration){ + || a._status == SyncFileItem::Restoration + || a._status == SyncFileItem::FileLocked){ return QIcon(QLatin1String(":/client/resources/state-warning.svg")); + } else if(a._status == SyncFileItem::FileIgnored){ + return QIcon(QLatin1String(":/client/resources/state-info.svg")); } return QIcon(QLatin1String(":/client/resources/state-sync.svg")); } diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp index 71a86dd28..c293a0384 100644 --- a/src/gui/activitywidget.cpp +++ b/src/gui/activitywidget.cpp @@ -121,6 +121,11 @@ void ActivityWidget::slotProgressInfo(const QString &folder, const ProgressInfo continue; } + if(activity._status == SyncFileItem::FileLocked && !QFileInfo(f->path() + activity._file).exists()){ + _model->removeActivityFromActivityList(activity); + continue; + } + if(activity._status == SyncFileItem::FileIgnored && !QFileInfo(f->path() + activity._file).exists()){ _model->removeActivityFromActivityList(activity); diff --git a/src/gui/activitywidget.ui b/src/gui/activitywidget.ui index 695e45008..7e5e9f73c 100644 --- a/src/gui/activitywidget.ui +++ b/src/gui/activitywidget.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <property name="sizeConstraint"> @@ -81,7 +81,7 @@ </sizepolicy> </property> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> diff --git a/src/gui/creds/flow2auth.cpp b/src/gui/creds/flow2auth.cpp new file mode 100644 index 000000000..e570e01d4 --- /dev/null +++ b/src/gui/creds/flow2auth.cpp @@ -0,0 +1,176 @@ +/* + * Copyright (C) by Olivier Goffart <ogoffart@woboq.com> + * Copyright (C) by Michael Schuster <michael@nextcloud.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#include <QDesktopServices> +#include <QTimer> +#include <QBuffer> +#include "account.h" +#include "creds/flow2auth.h" +#include <QJsonObject> +#include <QJsonDocument> +#include "theme.h" +#include "networkjobs.h" +#include "configfile.h" + +namespace OCC { + +Q_LOGGING_CATEGORY(lcFlow2auth, "nextcloud.sync.credentials.flow2auth", QtInfoMsg) + +Flow2Auth::~Flow2Auth() +{ +} + +void Flow2Auth::start() +{ + // Note: All startup code is in openBrowser() to allow reinitiate a new request with + // fresh tokens. Opening the same pollEndpoint link twice triggers an expiration + // message by the server (security, intended design). + openBrowser(); +} + +QUrl Flow2Auth::authorisationLink() const +{ + return _loginUrl; +} + +void Flow2Auth::openBrowser() +{ + _pollTimer.stop(); + + // Step 1: Initiate a login, do an anonymous POST request + QUrl url = Utility::concatUrlPath(_account->url().toString(), QLatin1String("/index.php/login/v2")); + + auto job = _account->sendRequest("POST", url); + job->setTimeout(qMin(30 * 1000ll, job->timeoutMsec())); + + QObject::connect(job, &SimpleNetworkJob::finishedSignal, this, [this](QNetworkReply *reply) { + auto jsonData = reply->readAll(); + QJsonParseError jsonParseError; + QJsonObject json = QJsonDocument::fromJson(jsonData, &jsonParseError).object(); + + QString pollToken = json.value("poll").toObject().value("token").toString(); + QString pollEndpoint = json.value("poll").toObject().value("endpoint").toString(); + QUrl loginUrl = json["login"].toString(); + + if (reply->error() != QNetworkReply::NoError || jsonParseError.error != QJsonParseError::NoError + || json.isEmpty() || pollToken.isEmpty() || pollEndpoint.isEmpty() || loginUrl.isEmpty()) { + QString errorReason; + QString errorFromJson = json["error"].toString(); + if (!errorFromJson.isEmpty()) { + errorReason = tr("Error returned from the server: <em>%1</em>") + .arg(errorFromJson.toHtmlEscaped()); + } else if (reply->error() != QNetworkReply::NoError) { + errorReason = tr("There was an error accessing the 'token' endpoint: <br><em>%1</em>") + .arg(reply->errorString().toHtmlEscaped()); + } else if (jsonParseError.error != QJsonParseError::NoError) { + errorReason = tr("Could not parse the JSON returned from the server: <br><em>%1</em>") + .arg(jsonParseError.errorString()); + } else { + errorReason = tr("The reply from the server did not contain all expected fields"); + } + qCWarning(lcFlow2auth) << "Error when getting the loginUrl" << json << errorReason; + emit result(Error); + return; + } + + + _loginUrl = loginUrl; + _pollToken = pollToken; + _pollEndpoint = pollEndpoint; + + + // Start polling + ConfigFile cfg; + std::chrono::milliseconds polltime = cfg.remotePollInterval(); + qCInfo(lcFlow2auth) << "setting remote poll timer interval to" << polltime.count() << "msec"; + _pollTimer.setInterval(polltime.count()); + QObject::connect(&_pollTimer, &QTimer::timeout, this, &Flow2Auth::slotPollTimerTimeout); + _pollTimer.start(); + + + // Try to open Browser + if (!QDesktopServices::openUrl(authorisationLink())) { + // We cannot open the browser, then we claim we don't support Flow2Auth. + // Our UI callee should ask the user to copy and open the link. + emit result(NotSupported, QString()); + } + }); +} + +void Flow2Auth::slotPollTimerTimeout() +{ + _pollTimer.stop(); + + // Step 2: Poll + QNetworkRequest req; + req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); + + auto requestBody = new QBuffer; + QUrlQuery arguments(QString("token=%1").arg(_pollToken)); + requestBody->setData(arguments.query(QUrl::FullyEncoded).toLatin1()); + + auto job = _account->sendRequest("POST", _pollEndpoint, req, requestBody); + job->setTimeout(qMin(30 * 1000ll, job->timeoutMsec())); + + QObject::connect(job, &SimpleNetworkJob::finishedSignal, this, [this](QNetworkReply *reply) { + auto jsonData = reply->readAll(); + QJsonParseError jsonParseError; + QJsonObject json = QJsonDocument::fromJson(jsonData, &jsonParseError).object(); + + QUrl serverUrl = json["server"].toString(); + QString loginName = json["loginName"].toString(); + QString appPassword = json["appPassword"].toString(); + + if (reply->error() != QNetworkReply::NoError || jsonParseError.error != QJsonParseError::NoError + || json.isEmpty() || serverUrl.isEmpty() || loginName.isEmpty() || appPassword.isEmpty()) { + QString errorReason; + QString errorFromJson = json["error"].toString(); + if (!errorFromJson.isEmpty()) { + errorReason = tr("Error returned from the server: <em>%1</em>") + .arg(errorFromJson.toHtmlEscaped()); + } else if (reply->error() != QNetworkReply::NoError) { + errorReason = tr("There was an error accessing the 'token' endpoint: <br><em>%1</em>") + .arg(reply->errorString().toHtmlEscaped()); + } else if (jsonParseError.error != QJsonParseError::NoError) { + errorReason = tr("Could not parse the JSON returned from the server: <br><em>%1</em>") + .arg(jsonParseError.errorString()); + } else { + errorReason = tr("The reply from the server did not contain all expected fields"); + } + qCDebug(lcFlow2auth) << "Error when polling for the appPassword" << json << errorReason; + + // Forget sensitive data + appPassword.clear(); + loginName.clear(); + + // Failed: poll again + _pollTimer.start(); + return; + } + + // Success + qCInfo(lcFlow2auth) << "Success getting the appPassword for user: " << loginName << ", server: " << serverUrl.toString(); + + _account->setUrl(serverUrl); + + emit result(LoggedIn, loginName, appPassword); + + // Forget sensitive data + appPassword.clear(); + loginName.clear(); + }); +} + +} // namespace OCC diff --git a/src/gui/creds/flow2auth.h b/src/gui/creds/flow2auth.h new file mode 100644 index 000000000..b53834a11 --- /dev/null +++ b/src/gui/creds/flow2auth.h @@ -0,0 +1,68 @@ +/* + * Copyright (C) by Olivier Goffart <ogoffart@woboq.com> + * Copyright (C) by Michael Schuster <michael@nextcloud.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#pragma once +#include <QPointer> +#include <QUrl> +#include <QTimer> +#include "accountfwd.h" + +namespace OCC { + +/** + * Job that does the authorization, grants and fetches the access token via Login Flow v2 + * + * See: https://docs.nextcloud.com/server/latest/developer_manual/client_apis/LoginFlow/index.html#login-flow-v2 + * + */ +class Flow2Auth : public QObject +{ + Q_OBJECT +public: + Flow2Auth(Account *account, QObject *parent) + : QObject(parent) + , _account(account) + { + } + ~Flow2Auth(); + + enum Result { NotSupported, + LoggedIn, + Error }; + Q_ENUM(Result); + void start(); + void openBrowser(); + QUrl authorisationLink() const; + +signals: + /** + * The state has changed. + * when logged in, appPassword has the value of the app password. + */ + void result(Flow2Auth::Result result, const QString &user = QString(), const QString &appPassword = QString()); + +private slots: + void slotPollTimerTimeout(); + +private: + Account *_account; + QUrl _loginUrl; + QString _pollToken; + QString _pollEndpoint; + QTimer _pollTimer; +}; + + +} // namespace OCC diff --git a/src/gui/creds/shibboleth/shibbolethwebview.cpp b/src/gui/creds/shibboleth/shibbolethwebview.cpp index 8f54af751..8e4465b3c 100644 --- a/src/gui/creds/shibboleth/shibbolethwebview.cpp +++ b/src/gui/creds/shibboleth/shibbolethwebview.cpp @@ -90,7 +90,7 @@ ShibbolethWebView::ShibbolethWebView(AccountPtr account, QWidget *parent) QWebView *debugView = new QWebView(this); debugView->setPage(debugPage); QMainWindow *window = new QMainWindow(this); - window->setWindowTitle(tr("SSL Chipher Debug View")); + window->setWindowTitle(tr("SSL Cipher Debug View")); window->setCentralWidget(debugView); window->show(); } diff --git a/src/gui/creds/webflowcredentials.cpp b/src/gui/creds/webflowcredentials.cpp index 0912753d3..b34e6e054 100644 --- a/src/gui/creds/webflowcredentials.cpp +++ b/src/gui/creds/webflowcredentials.cpp @@ -14,6 +14,7 @@ #include "accessmanager.h" #include "account.h" +#include "configfile.h" #include "theme.h" #include "wizard/webview.h" #include "webflowcredentialsdialog.h" @@ -24,6 +25,13 @@ namespace OCC { Q_LOGGING_CATEGORY(lcWebFlowCredentials, "sync.credentials.webflow", QtInfoMsg) +namespace { + const char userC[] = "user"; + const char clientCertificatePEMC[] = "_clientCertificatePEM"; + const char clientKeyPEMC[] = "_clientKeyPEM"; + const char clientCaCertificatePEMC[] = "_clientCaCertificatePEM"; +} // ns + class WebFlowCredentialsAccessManager : public AccessManager { public: @@ -37,13 +45,27 @@ protected: QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) override { QNetworkRequest req(request); - if (!req.attribute(HttpCredentials::DontAddCredentialsAttribute).toBool()) { + if (!req.attribute(WebFlowCredentials::DontAddCredentialsAttribute).toBool()) { if (_cred && !_cred->password().isEmpty()) { QByteArray credHash = QByteArray(_cred->user().toUtf8() + ":" + _cred->password().toUtf8()).toBase64(); req.setRawHeader("Authorization", "Basic " + credHash); } } + if (_cred && !_cred->_clientSslKey.isNull() && !_cred->_clientSslCertificate.isNull()) { + // SSL configuration + QSslConfiguration sslConfiguration = req.sslConfiguration(); + sslConfiguration.setLocalCertificate(_cred->_clientSslCertificate); + sslConfiguration.setPrivateKey(_cred->_clientSslKey); + + // Merge client side CA with system CA + auto ca = sslConfiguration.systemCaCertificates(); + ca.append(_cred->_clientSslCaCertificates); + sslConfiguration.setCaCertificates(ca); + + req.setSslConfiguration(sslConfiguration); + } + return AccessManager::createRequest(op, req, outgoingData); } @@ -53,22 +75,33 @@ private: QPointer<const WebFlowCredentials> _cred; }; +static void addSettingsToJob(Account *account, QKeychain::Job *job) +{ + Q_UNUSED(account) + auto settings = ConfigFile::settingsWithGroup(Theme::instance()->appName()); + settings->setParent(job); // make the job parent to make setting deleted properly + job->setSettings(settings.release()); +} + WebFlowCredentials::WebFlowCredentials() : _ready(false) , _credentialsValid(false) , _keychainMigration(false) + , _retryOnKeyChainError(false) { } -WebFlowCredentials::WebFlowCredentials(const QString &user, const QString &password, const QSslCertificate &certificate, const QSslKey &key) +WebFlowCredentials::WebFlowCredentials(const QString &user, const QString &password, const QSslCertificate &certificate, const QSslKey &key, const QList<QSslCertificate> &caCertificates) : _user(user) , _password(password) , _clientSslKey(key) , _clientSslCertificate(certificate) + , _clientSslCaCertificates(caCertificates) , _ready(true) , _credentialsValid(true) , _keychainMigration(false) + , _retryOnKeyChainError(false) { } @@ -102,24 +135,29 @@ bool WebFlowCredentials::ready() const { void WebFlowCredentials::fetchFromKeychain() { _wasFetched = true; - // Make sure we get the user fromt he config file + // Make sure we get the user from the config file fetchUser(); if (ready()) { emit fetched(); } else { - qCInfo(lcWebFlowCredentials()) << "Fetch from keyhchain!"; + qCInfo(lcWebFlowCredentials()) << "Fetch from keychain!"; fetchFromKeychainHelper(); } } void WebFlowCredentials::askFromUser() { - _askDialog = new WebFlowCredentialsDialog(); + // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic + bool useFlow2 = (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)); - QUrl url = _account->url(); - QString path = url.path() + "/index.php/login/flow"; - url.setPath(path); - _askDialog->setUrl(url); + _askDialog = new WebFlowCredentialsDialog(_account, useFlow2); + + if (!useFlow2) { + QUrl url = _account->url(); + QString path = url.path() + "/index.php/login/flow"; + url.setPath(path); + _askDialog->setUrl(url); + } QString msg = tr("You have been logged out of %1 as user %2. Please login again") .arg(_account->displayName(), _user); @@ -133,7 +171,7 @@ void WebFlowCredentials::askFromUser() { } void WebFlowCredentials::slotAskFromUserCredentialsProvided(const QString &user, const QString &pass, const QString &host) { - Q_UNUSED(host); + Q_UNUSED(host) if (_user != user) { qCInfo(lcWebFlowCredentials()) << "Authed with the wrong user!"; @@ -142,10 +180,12 @@ void WebFlowCredentials::slotAskFromUserCredentialsProvided(const QString &user, .arg(_user); _askDialog->setError(msg); - QUrl url = _account->url(); - QString path = url.path() + "/index.php/login/flow"; - url.setPath(path); - _askDialog->setUrl(url); + if (!_askDialog->isUsingFlow2()) { + QUrl url = _account->url(); + QString path = url.path() + "/index.php/login/flow"; + url.setPath(path); + _askDialog->setUrl(url); + } return; } @@ -178,17 +218,128 @@ void WebFlowCredentials::persist() { return; } - _account->setCredentialSetting("user", _user); + _account->setCredentialSetting(userC, _user); _account->wantsAccountSaved(_account); - //TODO: Add ssl cert and key storing + // write cert if there is one + if (!_clientSslCertificate.isNull()) { + WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName()); + addSettingsToJob(_account, job); + job->setInsecureFallback(false); + connect(job, &Job::finished, this, &WebFlowCredentials::slotWriteClientCertPEMJobDone); + job->setKey(keychainKey(_account->url().toString(), _user + clientCertificatePEMC, _account->id())); + job->setBinaryData(_clientSslCertificate.toPem()); + job->start(); + } else { + // no cert, just write credentials + slotWriteClientCertPEMJobDone(); + } +} + +void WebFlowCredentials::slotWriteClientCertPEMJobDone() +{ + // write ssl key if there is one + if (!_clientSslKey.isNull()) { + WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName()); + addSettingsToJob(_account, job); + job->setInsecureFallback(false); + connect(job, &Job::finished, this, &WebFlowCredentials::slotWriteClientKeyPEMJobDone); + job->setKey(keychainKey(_account->url().toString(), _user + clientKeyPEMC, _account->id())); + job->setBinaryData(_clientSslKey.toPem()); + job->start(); + } else { + // no key, just write credentials + slotWriteClientKeyPEMJobDone(); + } +} + +void WebFlowCredentials::writeSingleClientCaCertPEM() +{ + // write a ca cert if there is any in the queue + if (!_clientSslCaCertificatesWriteQueue.isEmpty()) { + // grab and remove the first cert from the queue + auto cert = _clientSslCaCertificatesWriteQueue.dequeue(); + + auto index = (_clientSslCaCertificates.count() - _clientSslCaCertificatesWriteQueue.count()) - 1; + + // keep the limit + if (index > (_clientSslCaCertificatesMaxCount - 1)) { + qCWarning(lcWebFlowCredentials) << "Maximum client CA cert count exceeded while writing slot" << QString::number(index) << "), cutting off after " << QString::number(_clientSslCaCertificatesMaxCount) << "certs"; + + _clientSslCaCertificatesWriteQueue.clear(); + + slotWriteClientCaCertsPEMJobDone(nullptr); + return; + } + + WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName()); + addSettingsToJob(_account, job); + job->setInsecureFallback(false); + connect(job, &Job::finished, this, &WebFlowCredentials::slotWriteClientCaCertsPEMJobDone); + job->setKey(keychainKey(_account->url().toString(), _user + clientCaCertificatePEMC + QString::number(index), _account->id())); + job->setBinaryData(cert.toPem()); + job->start(); + } else { + slotWriteClientCaCertsPEMJobDone(nullptr); + } +} + +void WebFlowCredentials::slotWriteClientKeyPEMJobDone() +{ + _clientSslCaCertificatesWriteQueue.clear(); + + // write ca certs if there are any + if (!_clientSslCaCertificates.isEmpty()) { + // queue the certs to avoid trouble on Windows (Workaround for CredWriteW used by QtKeychain) + _clientSslCaCertificatesWriteQueue.append(_clientSslCaCertificates); + + // first ca cert + writeSingleClientCaCertPEM(); + } else { + slotWriteClientCaCertsPEMJobDone(nullptr); + } +} + +void WebFlowCredentials::slotWriteClientCaCertsPEMJobDone(QKeychain::Job *incomingJob) +{ + // errors / next ca cert? + if (incomingJob && !_clientSslCaCertificates.isEmpty()) { + WritePasswordJob *writeJob = static_cast<WritePasswordJob *>(incomingJob); + + if (writeJob->error() != NoError) { + qCWarning(lcWebFlowCredentials) << "Error while writing client CA cert" << writeJob->errorString(); + } + + if (!_clientSslCaCertificatesWriteQueue.isEmpty()) { + // next ca cert + writeSingleClientCaCertPEM(); + return; + } + } + + // done storing ca certs, time for the password WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName()); + addSettingsToJob(_account, job); job->setInsecureFallback(false); + connect(job, &Job::finished, this, &WebFlowCredentials::slotWriteJobDone); job->setKey(keychainKey(_account->url().toString(), _user, _account->id())); job->setTextData(_password); job->start(); } +void WebFlowCredentials::slotWriteJobDone(QKeychain::Job *job) +{ + delete job->settings(); + switch (job->error()) { + case NoError: + break; + default: + qCWarning(lcWebFlowCredentials) << "Error while writing password" << job->errorString(); + } + WritePasswordJob *wjob = qobject_cast<WritePasswordJob *>(job); + wjob->deleteLater(); +} + void WebFlowCredentials::invalidateToken() { // clear the session cookie. _account->clearCookieJar(); @@ -201,7 +352,7 @@ void WebFlowCredentials::invalidateToken() { QTimer::singleShot(0, _account, &Account::clearQNAMCache); } -void WebFlowCredentials::forgetSensitiveData(){ +void WebFlowCredentials::forgetSensitiveData() { _password = QString(); _ready = false; @@ -219,6 +370,15 @@ void WebFlowCredentials::forgetSensitiveData(){ job->start(); invalidateToken(); + + /* IMPORTANT + /* TODO: For "Log out" & "Remove account": Remove client CA certs and KEY! + * + * Disabled as long as selecting another cert is not supported by the UI. + * + * Being able to specify a new certificate is important anyway: expiry etc. + */ + //deleteKeychainEntries(); } void WebFlowCredentials::setAccount(Account *account) { @@ -229,12 +389,12 @@ void WebFlowCredentials::setAccount(Account *account) { } QString WebFlowCredentials::fetchUser() { - _user = _account->credentialSetting("user").toString(); + _user = _account->credentialSetting(userC).toString(); return _user; } void WebFlowCredentials::slotAuthentication(QNetworkReply *reply, QAuthenticator *authenticator) { - Q_UNUSED(reply); + Q_UNUSED(reply) if (!_ready) { return; @@ -260,12 +420,139 @@ void WebFlowCredentials::slotFinished(QNetworkReply *reply) { } void WebFlowCredentials::fetchFromKeychainHelper() { + // Read client cert from keychain + const QString kck = keychainKey( + _account->url().toString(), + _user + clientCertificatePEMC, + _keychainMigration ? QString() : _account->id()); + + ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName()); + addSettingsToJob(_account, job); + job->setInsecureFallback(false); + job->setKey(kck); + connect(job, &Job::finished, this, &WebFlowCredentials::slotReadClientCertPEMJobDone); + job->start(); +} + +void WebFlowCredentials::slotReadClientCertPEMJobDone(QKeychain::Job *incomingJob) +{ +#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) + Q_ASSERT(!incomingJob->insecureFallback()); // If insecureFallback is set, the next test would be pointless + if (_retryOnKeyChainError && (incomingJob->error() == QKeychain::NoBackendAvailable + || incomingJob->error() == QKeychain::OtherError)) { + // Could be that the backend was not yet available. Wait some extra seconds. + // (Issues #4274 and #6522) + // (For kwallet, the error is OtherError instead of NoBackendAvailable, maybe a bug in QtKeychain) + qCInfo(lcWebFlowCredentials) << "Backend unavailable (yet?) Retrying in a few seconds." << incomingJob->errorString(); + QTimer::singleShot(10000, this, &WebFlowCredentials::fetchFromKeychainHelper); + _retryOnKeyChainError = false; + return; + } + _retryOnKeyChainError = false; +#endif + + // Store PEM in memory + ReadPasswordJob *readJob = static_cast<ReadPasswordJob *>(incomingJob); + if (readJob->error() == NoError && readJob->binaryData().length() > 0) { + QList<QSslCertificate> sslCertificateList = QSslCertificate::fromData(readJob->binaryData(), QSsl::Pem); + if (sslCertificateList.length() >= 1) { + _clientSslCertificate = sslCertificateList.at(0); + } + } + + // Load key too + const QString kck = keychainKey( + _account->url().toString(), + _user + clientKeyPEMC, + _keychainMigration ? QString() : _account->id()); + + ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName()); + addSettingsToJob(_account, job); + job->setInsecureFallback(false); + job->setKey(kck); + connect(job, &Job::finished, this, &WebFlowCredentials::slotReadClientKeyPEMJobDone); + job->start(); +} + +void WebFlowCredentials::slotReadClientKeyPEMJobDone(QKeychain::Job *incomingJob) +{ + // Store key in memory + ReadPasswordJob *readJob = static_cast<ReadPasswordJob *>(incomingJob); + + if (readJob->error() == NoError && readJob->binaryData().length() > 0) { + QByteArray clientKeyPEM = readJob->binaryData(); + // FIXME Unfortunately Qt has a bug and we can't just use QSsl::Opaque to let it + // load whatever we have. So we try until it works. + _clientSslKey = QSslKey(clientKeyPEM, QSsl::Rsa); + if (_clientSslKey.isNull()) { + _clientSslKey = QSslKey(clientKeyPEM, QSsl::Dsa); + } + if (_clientSslKey.isNull()) { + _clientSslKey = QSslKey(clientKeyPEM, QSsl::Ec); + } + if (_clientSslKey.isNull()) { + qCWarning(lcWebFlowCredentials) << "Could not load SSL key into Qt!"; + } + } + + // Start fetching client CA certs + _clientSslCaCertificates.clear(); + + readSingleClientCaCertPEM(); +} + +void WebFlowCredentials::readSingleClientCaCertPEM() +{ + // try to fetch a client ca cert + if (_clientSslCaCertificates.count() < _clientSslCaCertificatesMaxCount) { + const QString kck = keychainKey( + _account->url().toString(), + _user + clientCaCertificatePEMC + QString::number(_clientSslCaCertificates.count()), + _keychainMigration ? QString() : _account->id()); + + ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName()); + addSettingsToJob(_account, job); + job->setInsecureFallback(false); + job->setKey(kck); + connect(job, &Job::finished, this, &WebFlowCredentials::slotReadClientCaCertsPEMJobDone); + job->start(); + } else { + qCWarning(lcWebFlowCredentials) << "Maximum client CA cert count exceeded while reading, ignoring after " << _clientSslCaCertificatesMaxCount; + + slotReadClientCaCertsPEMJobDone(nullptr); + } +} + +void WebFlowCredentials::slotReadClientCaCertsPEMJobDone(QKeychain::Job *incomingJob) { + // Store key in memory + ReadPasswordJob *readJob = static_cast<ReadPasswordJob *>(incomingJob); + + if (readJob) { + if (readJob->error() == NoError && readJob->binaryData().length() > 0) { + QList<QSslCertificate> sslCertificateList = QSslCertificate::fromData(readJob->binaryData(), QSsl::Pem); + if (sslCertificateList.length() >= 1) { + _clientSslCaCertificates.append(sslCertificateList.at(0)); + } + + // try next cert + readSingleClientCaCertPEM(); + return; + } else { + if (readJob->error() != QKeychain::Error::EntryNotFound || + (readJob->error() == QKeychain::Error::EntryNotFound) && _clientSslCaCertificates.count() == 0) { + qCWarning(lcWebFlowCredentials) << "Unable to read client CA cert slot " << QString::number(_clientSslCaCertificates.count()) << readJob->errorString(); + } + } + } + + // Now fetch the actual server password const QString kck = keychainKey( _account->url().toString(), _user, _keychainMigration ? QString() : _account->id()); ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName()); + addSettingsToJob(_account, job); job->setInsecureFallback(false); job->setKey(kck); connect(job, &Job::finished, this, &WebFlowCredentials::slotReadPasswordJobDone); @@ -283,6 +570,10 @@ void WebFlowCredentials::slotReadPasswordJobDone(Job *incomingJob) { return; } + if (_user.isEmpty()) { + qCWarning(lcWebFlowCredentials) << "Strange: User is empty!"; + } + if (error == QKeychain::NoError) { _password = job->textData(); _ready = true; @@ -296,16 +587,29 @@ void WebFlowCredentials::slotReadPasswordJobDone(Job *incomingJob) { if (_keychainMigration && _ready) { _keychainMigration = false; persist(); - deleteOldKeychainEntries(); + deleteKeychainEntries(true); // true: delete old entries qCInfo(lcWebFlowCredentials) << "Migrated old keychain entries"; } } -void WebFlowCredentials::deleteOldKeychainEntries() { - DeletePasswordJob *job = new DeletePasswordJob(Theme::instance()->appName()); - job->setInsecureFallback(false); - job->setKey(keychainKey(_account->url().toString(), _user, QString())); - job->start(); +void WebFlowCredentials::deleteKeychainEntries(bool oldKeychainEntries) { + auto startDeleteJob = [this, oldKeychainEntries](QString user) { + DeletePasswordJob *job = new DeletePasswordJob(Theme::instance()->appName()); + addSettingsToJob(_account, job); + job->setInsecureFallback(true); + job->setKey(keychainKey(_account->url().toString(), + user, + oldKeychainEntries ? QString() : _account->id())); + job->start(); + }; + + startDeleteJob(_user); + startDeleteJob(_user + clientKeyPEMC); + startDeleteJob(_user + clientCertificatePEMC); + + for (auto i = 0; i < _clientSslCaCertificates.count(); i++) { + startDeleteJob(_user + clientCaCertificatePEMC + QString::number(i)); + } } } diff --git a/src/gui/creds/webflowcredentials.h b/src/gui/creds/webflowcredentials.h index 02814919e..0e02568ec 100644 --- a/src/gui/creds/webflowcredentials.h +++ b/src/gui/creds/webflowcredentials.h @@ -3,6 +3,8 @@ #include <QSslCertificate> #include <QSslKey> +#include <QNetworkRequest> +#include <QQueue> #include "creds/abstractcredentials.h" @@ -22,9 +24,19 @@ class WebFlowCredentialsDialog; class WebFlowCredentials : public AbstractCredentials { Q_OBJECT + friend class WebFlowCredentialsAccessManager; + public: + /// Don't add credentials if this is set on a QNetworkRequest + static constexpr QNetworkRequest::Attribute DontAddCredentialsAttribute = QNetworkRequest::User; + explicit WebFlowCredentials(); - WebFlowCredentials(const QString &user, const QString &password, const QSslCertificate &certificate = QSslCertificate(), const QSslKey &key = QSslKey()); + WebFlowCredentials( + const QString &user, + const QString &password, + const QSslCertificate &certificate = QSslCertificate(), + const QSslKey &key = QSslKey(), + const QList<QSslCertificate> &caCertificates = QList<QSslCertificate>()); QString authType() const override; QString user() const override; @@ -48,12 +60,50 @@ private slots: void slotAuthentication(QNetworkReply *reply, QAuthenticator *authenticator); void slotFinished(QNetworkReply *reply); - void slotReadPasswordJobDone(QKeychain::Job *incomingJob); void slotAskFromUserCredentialsProvided(const QString &user, const QString &pass, const QString &host); + void slotReadClientCertPEMJobDone(QKeychain::Job *incomingJob); + void slotReadClientKeyPEMJobDone(QKeychain::Job *incomingJob); + void slotReadClientCaCertsPEMJobDone(QKeychain::Job *incommingJob); + void slotReadPasswordJobDone(QKeychain::Job *incomingJob); + + void slotWriteClientCertPEMJobDone(); + void slotWriteClientKeyPEMJobDone(); + void slotWriteClientCaCertsPEMJobDone(QKeychain::Job *incomingJob); + void slotWriteJobDone(QKeychain::Job *); + private: + /* + * Windows: Workaround for CredWriteW used by QtKeychain + * + * Saving all client CA's within one credential may result in: + * Error: "Credential size exceeds maximum size of 2560" + */ + void readSingleClientCaCertPEM(); + void writeSingleClientCaCertPEM(); + + /* + * Since we're limited by Windows limits we just create our own + * limit to avoid evil things happening by endless recursion + * + * Better than storing the count and relying on maybe-hacked values + */ + static constexpr int _clientSslCaCertificatesMaxCount = 10; + QQueue<QSslCertificate> _clientSslCaCertificatesWriteQueue; + +protected: + /** Reads data from keychain locations + * + * Goes through + * slotReadClientCertPEMJobDone to + * slotReadClientKeyPEMJobDone to + * slotReadClientCaCertsPEMJobDone to + * slotReadJobDone + */ void fetchFromKeychainHelper(); - void deleteOldKeychainEntries(); + + /// Wipes legacy keychain locations + void deleteKeychainEntries(bool oldKeychainEntries = false); QString fetchUser(); @@ -61,10 +111,12 @@ private: QString _password; QSslKey _clientSslKey; QSslCertificate _clientSslCertificate; + QList<QSslCertificate> _clientSslCaCertificates; bool _ready; bool _credentialsValid; bool _keychainMigration; + bool _retryOnKeyChainError = true; // true if we haven't done yet any reading from keychain WebFlowCredentialsDialog *_askDialog; }; diff --git a/src/gui/creds/webflowcredentialsdialog.cpp b/src/gui/creds/webflowcredentialsdialog.cpp index 2d22ba06e..9971f8f34 100644 --- a/src/gui/creds/webflowcredentialsdialog.cpp +++ b/src/gui/creds/webflowcredentialsdialog.cpp @@ -3,13 +3,21 @@ #include <QVBoxLayout> #include <QLabel> +#include "theme.h" +#include "wizard/owncloudwizardcommon.h" #include "wizard/webview.h" +#include "wizard/flow2authwidget.h" namespace OCC { -WebFlowCredentialsDialog::WebFlowCredentialsDialog(QWidget *parent) - : QDialog(parent) +WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlow2, QWidget *parent) + : QDialog(parent), + _useFlow2(useFlow2), + _flow2AuthWidget(nullptr), + _webView(nullptr) { + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + _layout = new QVBoxLayout(this); //QString msg = tr("You have been logged out of %1 as user %2, please login again") @@ -17,28 +25,43 @@ WebFlowCredentialsDialog::WebFlowCredentialsDialog(QWidget *parent) _infoLabel = new QLabel(); _layout->addWidget(_infoLabel); - _webView = new WebView(); - _layout->addWidget(_webView); + if (_useFlow2) { + _flow2AuthWidget = new Flow2AuthWidget(account); + _layout->addWidget(_flow2AuthWidget); + + connect(_flow2AuthWidget, &Flow2AuthWidget::urlCatched, this, &WebFlowCredentialsDialog::urlCatched); + } else { + _webView = new WebView(); + _layout->addWidget(_webView); + + connect(_webView, &WebView::urlCatched, this, &WebFlowCredentialsDialog::urlCatched); + } _errorLabel = new QLabel(); _errorLabel->hide(); _layout->addWidget(_errorLabel); - setLayout(_layout); + WizardCommon::initErrorLabel(_errorLabel); - connect(_webView, &WebView::urlCatched, this, &WebFlowCredentialsDialog::urlCatched); + setLayout(_layout); } void WebFlowCredentialsDialog::closeEvent(QCloseEvent* e) { - Q_UNUSED(e); + Q_UNUSED(e) + + if (_webView) { + // Force calling WebView::~WebView() earlier so that _profile and _page are + // deleted in the correct order. + delete _webView; + } - // Force calling WebView::~WebView() earlier so that _profile and _page are - // deleted in the correct order. - delete _webView; + if (_flow2AuthWidget) + delete _flow2AuthWidget; } void WebFlowCredentialsDialog::setUrl(const QUrl &url) { - _webView->setUrl(url); + if (_webView) + _webView->setUrl(url); } void WebFlowCredentialsDialog::setInfo(const QString &msg) { @@ -46,6 +69,11 @@ void WebFlowCredentialsDialog::setInfo(const QString &msg) { } void WebFlowCredentialsDialog::setError(const QString &error) { + if (_useFlow2 && _flow2AuthWidget) { + _flow2AuthWidget->setError(error); + return; + } + if (error.isEmpty()) { _errorLabel->hide(); } else { diff --git a/src/gui/creds/webflowcredentialsdialog.h b/src/gui/creds/webflowcredentialsdialog.h index 9849ee3a4..a540f0edb 100644 --- a/src/gui/creds/webflowcredentialsdialog.h +++ b/src/gui/creds/webflowcredentialsdialog.h @@ -4,23 +4,30 @@ #include <QDialog> #include <QUrl> +#include "accountfwd.h" + class QLabel; class QVBoxLayout; namespace OCC { class WebView; +class Flow2AuthWidget; class WebFlowCredentialsDialog : public QDialog { Q_OBJECT public: - WebFlowCredentialsDialog(QWidget *parent = nullptr); + WebFlowCredentialsDialog(Account *account, bool useFlow2, QWidget *parent = nullptr); void setUrl(const QUrl &url); void setInfo(const QString &msg); void setError(const QString &error); + bool isUsingFlow2() const { + return _useFlow2; + } + protected: void closeEvent(QCloseEvent * e) override; @@ -28,7 +35,11 @@ signals: void urlCatched(const QString user, const QString pass, const QString host); private: + bool _useFlow2; + + Flow2AuthWidget *_flow2AuthWidget; WebView *_webView; + QLabel *_errorLabel; QLabel *_infoLabel; QVBoxLayout *_layout; diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 97625c5c6..f5aedacf0 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -351,6 +351,10 @@ void Folder::showSyncResultPopup() createGuiLog(_syncResult.firstItemError()->_file, LogStatusError, errorCount); } + if (int lockedCount = _syncResult.numLockedItems()) { + createGuiLog(_syncResult.firstItemLocked()->_file, LogStatusFileLocked, lockedCount); + } + qCInfo(lcFolder) << "Folder sync result: " << int(_syncResult.status()); } diff --git a/src/gui/folder.h b/src/gui/folder.h index 05bd62a4e..48a2e52f7 100644 --- a/src/gui/folder.h +++ b/src/gui/folder.h @@ -344,7 +344,8 @@ private: LogStatusNew, LogStatusError, LogStatusConflict, - LogStatusUpdated + LogStatusUpdated, + LogStatusFileLocked }; void createGuiLog(const QString &filename, LogStatus status, int count, diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp index d0660b4a2..337530da9 100644 --- a/src/gui/folderstatusdelegate.cpp +++ b/src/gui/folderstatusdelegate.cpp @@ -168,6 +168,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem & QString itemString = qvariant_cast<QString>(index.data(SyncProgressItemString)); int warningCount = qvariant_cast<int>(index.data(WarningCount)); bool syncOngoing = qvariant_cast<bool>(index.data(SyncRunning)); + QDateTime syncDate = qvariant_cast<QDateTime>(index.data(SyncDate)); bool syncEnabled = qvariant_cast<bool>(index.data(FolderAccountConnected)); QRect iconRect = option.rect; @@ -252,7 +253,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem & if (!showProgess) { painter->setFont(subFont); QString elidedRemotePathText = subFm.elidedText( - tr("Synchronized with local folder"), + tr("Synchronized with local folder (%1)").arg(syncDate.toTimeSpec(Qt::LocalTime).toString(Qt::SystemLocaleShortDate)), Qt::ElideRight, remotePathRect.width()); painter->drawText(QStyle::visualRect(option.direction, option.rect, remotePathRect), textAlign, elidedRemotePathText); diff --git a/src/gui/folderstatusdelegate.h b/src/gui/folderstatusdelegate.h index 2879bdb5e..b4902abf0 100644 --- a/src/gui/folderstatusdelegate.h +++ b/src/gui/folderstatusdelegate.h @@ -44,6 +44,7 @@ public: SyncProgressItemString, WarningCount, SyncRunning, + SyncDate, AddButton // 1 = enabled; 2 = disabled }; diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index 563166f34..fb16dfacb 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -218,6 +218,8 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const return f->syncResult().errorStrings(); case FolderStatusDelegate::SyncRunning: return f->syncResult().status() == SyncResult::SyncRunning; + case FolderStatusDelegate::SyncDate: + return f->syncResult().syncTime(); case FolderStatusDelegate::HeaderRole: return f->shortGuiRemotePathOrAppName(); case FolderStatusDelegate::FolderAliasRole: diff --git a/src/gui/folderwatcher.cpp b/src/gui/folderwatcher.cpp index d8136ff36..65e68cb36 100644 --- a/src/gui/folderwatcher.cpp +++ b/src/gui/folderwatcher.cpp @@ -75,9 +75,27 @@ bool FolderWatcher::isReliable() const return _isReliable; } +void FolderWatcher::appendSubPaths(QDir dir, QStringList& subPaths) { + QStringList newSubPaths = dir.entryList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files); + for (int i = 0; i < newSubPaths.size(); i++) { + QString path = dir.path() + "/" + newSubPaths[i]; + QFileInfo fileInfo(path); + subPaths.append(path); + if (fileInfo.isDir()) { + QDir dir(path); + appendSubPaths(dir, subPaths); + } + } +} + void FolderWatcher::changeDetected(const QString &path) { + QFileInfo fileInfo(path); QStringList paths(path); + if (fileInfo.isDir()) { + QDir dir(path); + appendSubPaths(dir, paths); + } changeDetected(paths); } diff --git a/src/gui/folderwatcher.h b/src/gui/folderwatcher.h index a6cf006e2..b07c33a10 100644 --- a/src/gui/folderwatcher.h +++ b/src/gui/folderwatcher.h @@ -26,6 +26,7 @@ #include <QHash> #include <QScopedPointer> #include <QSet> +#include <QDir> class QTimer; @@ -120,6 +121,8 @@ private: Folder *_folder; bool _isReliable = true; + void appendSubPaths(QDir dir, QStringList& subPaths); + friend class FolderWatcherPrivate; }; } diff --git a/src/gui/folderwizardsourcepage.ui b/src/gui/folderwizardsourcepage.ui index 7522792be..c338617b1 100644 --- a/src/gui/folderwizardsourcepage.ui +++ b/src/gui/folderwizardsourcepage.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QGridLayout" name="gridLayout_2"> <item row="2" column="0"> diff --git a/src/gui/folderwizardtargetpage.ui b/src/gui/folderwizardtargetpage.ui index 5dcefc73f..3a869c31f 100644 --- a/src/gui/folderwizardtargetpage.ui +++ b/src/gui/folderwizardtargetpage.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QGridLayout" name="gridLayout_6"> <item row="1" column="0"> diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index b8c10d592..dd4235834 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -184,6 +184,7 @@ void GeneralSettings::slotShowInExplorerNavigationPane(bool checked) void GeneralSettings::slotIgnoreFilesEditor() { if (_ignoreEditor.isNull()) { + ConfigFile cfgFile; _ignoreEditor = new IgnoreListEditor(this); _ignoreEditor->setAttribute(Qt::WA_DeleteOnClose, true); _ignoreEditor->open(); diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui index 34aa03510..fcdfc073c 100644 --- a/src/gui/generalsettings.ui +++ b/src/gui/generalsettings.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QGridLayout" name="gridLayout_3"> <item row="2" column="0"> diff --git a/src/gui/ignorelisteditor.cpp b/src/gui/ignorelisteditor.cpp index 9b44c25a0..6e5a3d784 100644 --- a/src/gui/ignorelisteditor.cpp +++ b/src/gui/ignorelisteditor.cpp @@ -14,8 +14,9 @@ #include "configfile.h" -#include "ignorelisteditor.h" #include "folderman.h" +#include "generalsettings.h" +#include "ignorelisteditor.h" #include "ui_ignorelisteditor.h" #include <QFile> @@ -27,10 +28,6 @@ namespace OCC { -static int patternCol = 0; -static int deletableCol = 1; -static int readOnlyRows = 3; - IgnoreListEditor::IgnoreListEditor(QWidget *parent) : QDialog(parent) , ui(new Ui::IgnoreListEditor) @@ -39,28 +36,28 @@ IgnoreListEditor::IgnoreListEditor(QWidget *parent) ui->setupUi(this); ConfigFile cfgFile; - ui->descriptionLabel->setText(tr("Files or folders matching a pattern will not be synchronized.\n\n" - "Items where deletion is allowed will be deleted if they prevent a " - "directory from being removed. " - "This is useful for meta data.")); + //FIXME This is not true. The entries are hardcoded below in setupTableReadOnlyItems readOnlyTooltip = tr("This entry is provided by the system at '%1' " "and cannot be modified in this view.") .arg(QDir::toNativeSeparators(cfgFile.excludeFile(ConfigFile::SystemScope))); setupTableReadOnlyItems(); - readIgnoreFile(cfgFile.excludeFile(ConfigFile::UserScope), false); - - connect(this, &QDialog::accepted, this, &IgnoreListEditor::slotUpdateLocalIgnoreList); - ui->removePushButton->setEnabled(false); - connect(ui->tableWidget, &QTableWidget::itemSelectionChanged, this, &IgnoreListEditor::slotItemSelectionChanged); - connect(ui->removePushButton, &QAbstractButton::clicked, this, &IgnoreListEditor::slotRemoveCurrentItem); - connect(ui->addPushButton, &QAbstractButton::clicked, this, &IgnoreListEditor::slotAddPattern); - connect(ui->removeAllPushButton, &QAbstractButton::clicked, this, &IgnoreListEditor::slotRemoveAllItems); - connect(ui->buttonBox, &QDialogButtonBox::clicked, this, &IgnoreListEditor::slotRestoreDefaults); - - ui->tableWidget->resizeColumnsToContents(); - ui->tableWidget->horizontalHeader()->setSectionResizeMode(patternCol, QHeaderView::Stretch); - ui->tableWidget->verticalHeader()->setVisible(false); + const auto userConfig = cfgFile.excludeFile(ConfigFile::Scope::UserScope); + ui->ignoreTableWidget->readIgnoreFile(userConfig); + + connect(this, &QDialog::accepted, [=]() { + ui->ignoreTableWidget->slotWriteIgnoreFile(userConfig); + /* handle the hidden file checkbox */ + + /* the ignoreHiddenFiles flag is a folder specific setting, but for now, it is + * handled globally. Save it to every folder that is defined. + * TODO this can now be fixed, simply attach this IgnoreListEditor to top-level account + * settings + */ + FolderMan::instance()->setIgnoreHiddenFiles(ignoreHiddenFiles()); + }); + connect(ui->buttonBox, &QDialogButtonBox::clicked, + this, &IgnoreListEditor::slotRestoreDefaults); ui->syncHiddenFilesCheckBox->setChecked(!FolderMan::instance()->ignoreHiddenFiles()); } @@ -70,12 +67,11 @@ IgnoreListEditor::~IgnoreListEditor() delete ui; } -void IgnoreListEditor::setupTableReadOnlyItems(){ - ui->tableWidget->setRowCount(0); - addPattern(".csync_journal.db*", /*deletable=*/false, /*readonly=*/true); - addPattern("._sync_*.db*", /*deletable=*/false, /*readonly=*/true); - addPattern(".sync_*.db*", /*deletable=*/false, /*readonly=*/true); - ui->removeAllPushButton->setEnabled(false); +void IgnoreListEditor::setupTableReadOnlyItems() +{ + ui->ignoreTableWidget->addPattern(".csync_journal.db*", /*deletable=*/false, /*readonly=*/true); + ui->ignoreTableWidget->addPattern("._sync_*.db*", /*deletable=*/false, /*readonly=*/true); + ui->ignoreTableWidget->addPattern(".sync_*.db*", /*deletable=*/false, /*readonly=*/true); } bool IgnoreListEditor::ignoreHiddenFiles() @@ -83,140 +79,16 @@ bool IgnoreListEditor::ignoreHiddenFiles() return !ui->syncHiddenFilesCheckBox->isChecked(); } -void IgnoreListEditor::slotItemSelectionChanged() +void IgnoreListEditor::slotRestoreDefaults(QAbstractButton *button) { - QTableWidgetItem *item = ui->tableWidget->currentItem(); - if (!item) { - ui->removePushButton->setEnabled(false); + if(ui->buttonBox->buttonRole(button) != QDialogButtonBox::ResetRole) return; - } - - bool enable = item->flags() & Qt::ItemIsEnabled; - ui->removePushButton->setEnabled(enable); -} - -void IgnoreListEditor::slotRemoveCurrentItem() -{ - ui->tableWidget->removeRow(ui->tableWidget->currentRow()); - if(ui->tableWidget->rowCount() == readOnlyRows) - ui->removeAllPushButton->setEnabled(false); -} -void IgnoreListEditor::slotRemoveAllItems() -{ - ui->tableWidget->clearContents(); - setupTableReadOnlyItems(); -} + ui->ignoreTableWidget->slotRemoveAllItems(); -void IgnoreListEditor::slotUpdateLocalIgnoreList() -{ ConfigFile cfgFile; - QString ignoreFile = cfgFile.excludeFile(ConfigFile::UserScope); - QFile ignores(ignoreFile); - if (ignores.open(QIODevice::WriteOnly)) { - // rewrites the whole file since now the user can also remove system patterns - QFile::resize(ignoreFile, 0); - for (int row = 0; row < ui->tableWidget->rowCount(); ++row) { - QTableWidgetItem *patternItem = ui->tableWidget->item(row, patternCol); - QTableWidgetItem *deletableItem = ui->tableWidget->item(row, deletableCol); - if (patternItem->flags() & Qt::ItemIsEnabled) { - QByteArray prepend; - if (deletableItem->checkState() == Qt::Checked) { - prepend = "]"; - } else if (patternItem->text().startsWith('#')) { - prepend = "\\"; - } - ignores.write(prepend + patternItem->text().toUtf8() + '\n'); - } - } - } else { - QMessageBox::warning(this, tr("Could not open file"), - tr("Cannot write changes to '%1'.").arg(ignoreFile)); - } - ignores.close(); //close the file before reloading stuff. - - FolderMan *folderMan = FolderMan::instance(); - - /* handle the hidden file checkbox */ - - /* the ignoreHiddenFiles flag is a folder specific setting, but for now, it is - * handled globally. Save it to every folder that is defined. - */ - folderMan->setIgnoreHiddenFiles(ignoreHiddenFiles()); - - // We need to force a remote discovery after a change of the ignore list. - // Otherwise we would not download the files/directories that are no longer - // ignored (because the remote etag did not change) (issue #3172) - foreach (Folder *folder, folderMan->map()) { - folder->journalDb()->forceRemoteDiscoveryNextSync(); - folderMan->scheduleFolder(folder); - } -} - -void IgnoreListEditor::slotAddPattern() -{ - bool okClicked; - QString pattern = QInputDialog::getText(this, tr("Add Ignore Pattern"), - tr("Add a new ignore pattern:"), - QLineEdit::Normal, QString(), &okClicked); - - if (!okClicked || pattern.isEmpty()) - return; - - addPattern(pattern, false, false); - ui->tableWidget->scrollToBottom(); -} - -void IgnoreListEditor::slotRestoreDefaults(QAbstractButton *button){ - if(ui->buttonBox->buttonRole(button) == QDialogButtonBox::ResetRole){ - ConfigFile cfgFile; - setupTableReadOnlyItems(); - readIgnoreFile(cfgFile.excludeFile(ConfigFile::SystemScope), false); - } -} - -void IgnoreListEditor::readIgnoreFile(const QString &file, bool readOnly) -{ - QFile ignores(file); - if (ignores.open(QIODevice::ReadOnly)) { - while (!ignores.atEnd()) { - QString line = QString::fromUtf8(ignores.readLine()); - line.chop(1); - if (!line.isEmpty() && !line.startsWith("#")) { - bool deletable = false; - if (line.startsWith(']')) { - deletable = true; - line = line.mid(1); - } - addPattern(line, deletable, readOnly); - } - } - } -} - -int IgnoreListEditor::addPattern(const QString &pattern, bool deletable, bool readOnly) -{ - int newRow = ui->tableWidget->rowCount(); - ui->tableWidget->setRowCount(newRow + 1); - - QTableWidgetItem *patternItem = new QTableWidgetItem; - patternItem->setText(pattern); - ui->tableWidget->setItem(newRow, patternCol, patternItem); - - QTableWidgetItem *deletableItem = new QTableWidgetItem; - deletableItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled); - deletableItem->setCheckState(deletable ? Qt::Checked : Qt::Unchecked); - ui->tableWidget->setItem(newRow, deletableCol, deletableItem); - - if (readOnly) { - patternItem->setFlags(patternItem->flags() ^ Qt::ItemIsEnabled); - patternItem->setToolTip(readOnlyTooltip); - deletableItem->setFlags(deletableItem->flags() ^ Qt::ItemIsEnabled); - } - - ui->removeAllPushButton->setEnabled(true); - - return newRow; + setupTableReadOnlyItems(); + ui->ignoreTableWidget->readIgnoreFile(cfgFile.excludeFile(ConfigFile::SystemScope), false); } } // namespace OCC diff --git a/src/gui/ignorelisteditor.h b/src/gui/ignorelisteditor.h index 74137a736..39c38d74d 100644 --- a/src/gui/ignorelisteditor.h +++ b/src/gui/ignorelisteditor.h @@ -35,23 +35,16 @@ class IgnoreListEditor : public QDialog Q_OBJECT public: - explicit IgnoreListEditor(QWidget *parent = nullptr); + IgnoreListEditor(QWidget *parent = nullptr); ~IgnoreListEditor(); bool ignoreHiddenFiles(); private slots: - void slotItemSelectionChanged(); - void slotRemoveCurrentItem(); - void slotUpdateLocalIgnoreList(); - void slotAddPattern(); void slotRestoreDefaults(QAbstractButton *button); - void slotRemoveAllItems(); private: - void readIgnoreFile(const QString &file, bool readOnly); void setupTableReadOnlyItems(); - int addPattern(const QString &pattern, bool deletable, bool readOnly); QString readOnlyTooltip; Ui::IgnoreListEditor *ui; }; diff --git a/src/gui/ignorelisteditor.ui b/src/gui/ignorelisteditor.ui index 8e544a911..891fbc6e9 100644 --- a/src/gui/ignorelisteditor.ui +++ b/src/gui/ignorelisteditor.ui @@ -36,96 +36,8 @@ <string>Files Ignored by Patterns</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="4" column="0" colspan="2"> - <widget class="QLabel" name="descriptionLabel"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - <property name="textFormat"> - <enum>Qt::PlainText</enum> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="1"> - <spacer name="verticalSpacer"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>213</height> - </size> - </property> - </spacer> - </item> - <item row="0" column="0" rowspan="4"> - <widget class="QTableWidget" name="tableWidget"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::SingleSelection</enum> - </property> - <property name="selectionBehavior"> - <enum>QAbstractItemView::SelectRows</enum> - </property> - <property name="columnCount"> - <number>2</number> - </property> - <column> - <property name="text"> - <string>Pattern</string> - </property> - </column> - <column> - <property name="text"> - <string>Allow Deletion</string> - </property> - </column> - </widget> - </item> - <item row="1" column="1"> - <widget class="QPushButton" name="removePushButton"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="text"> - <string>Remove</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QPushButton" name="addPushButton"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="text"> - <string>Add</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QPushButton" name="removeAllPushButton"> - <property name="text"> - <string>Remove all</string> - </property> - </widget> + <item row="0" column="0"> + <widget class="IgnoreListTableWidget" name="ignoreTableWidget" native="true"/> </item> </layout> </widget> @@ -139,6 +51,14 @@ </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>IgnoreListTableWidget</class> + <extends>QWidget</extends> + <header>ignorelisttablewidget.h</header> + <container>1</container> + </customwidget> + </customwidgets> <resources/> <connections> <connection> diff --git a/src/gui/ignorelisttablewidget.cpp b/src/gui/ignorelisttablewidget.cpp new file mode 100644 index 000000000..67c8ab4f2 --- /dev/null +++ b/src/gui/ignorelisttablewidget.cpp @@ -0,0 +1,167 @@ +#include "ignorelisttablewidget.h" +#include "ui_ignorelisttablewidget.h" + +#include "folderman.h" + +#include <QFile> +#include <QInputDialog> +#include <QLineEdit> +#include <QMessageBox> + +namespace OCC { + +static constexpr int patternCol = 0; +static constexpr int deletableCol = 1; +static constexpr int readOnlyRows = 3; + +IgnoreListTableWidget::IgnoreListTableWidget(QWidget *parent) + : QWidget(parent) + , ui(new Ui::IgnoreListTableWidget) +{ + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + ui->setupUi(this); + + ui->descriptionLabel->setText(tr("Files or folders matching a pattern will not be synchronized.\n\n" + "Items where deletion is allowed will be deleted if they prevent a " + "directory from being removed. " + "This is useful for meta data.")); + + ui->removePushButton->setEnabled(false); + connect(ui->tableWidget, &QTableWidget::itemSelectionChanged, + this, &IgnoreListTableWidget::slotItemSelectionChanged); + connect(ui->removePushButton, &QAbstractButton::clicked, + this, &IgnoreListTableWidget::slotRemoveCurrentItem); + connect(ui->addPushButton, &QAbstractButton::clicked, + this, &IgnoreListTableWidget::slotAddPattern); + connect(ui->removeAllPushButton, &QAbstractButton::clicked, + this, &IgnoreListTableWidget::slotRemoveAllItems); + + ui->tableWidget->resizeColumnsToContents(); + ui->tableWidget->horizontalHeader()->setSectionResizeMode(patternCol, QHeaderView::Stretch); + ui->tableWidget->verticalHeader()->setVisible(false); +} + +IgnoreListTableWidget::~IgnoreListTableWidget() +{ + delete ui; +} + +void IgnoreListTableWidget::slotItemSelectionChanged() +{ + QTableWidgetItem *item = ui->tableWidget->currentItem(); + if (!item) { + ui->removePushButton->setEnabled(false); + return; + } + + bool enable = item->flags() & Qt::ItemIsEnabled; + ui->removePushButton->setEnabled(enable); +} + +void IgnoreListTableWidget::slotRemoveCurrentItem() +{ + ui->tableWidget->removeRow(ui->tableWidget->currentRow()); + if(ui->tableWidget->rowCount() == readOnlyRows) + ui->removeAllPushButton->setEnabled(false); +} + +void IgnoreListTableWidget::slotRemoveAllItems() +{ + ui->tableWidget->setRowCount(0); +} + +void IgnoreListTableWidget::slotWriteIgnoreFile(const QString & file) +{ + QFile ignores(file); + if (ignores.open(QIODevice::WriteOnly)) { + // rewrites the whole file since now the user can also remove system patterns + QFile::resize(file, 0); + for (int row = 0; row < ui->tableWidget->rowCount(); ++row) { + QTableWidgetItem *patternItem = ui->tableWidget->item(row, patternCol); + QTableWidgetItem *deletableItem = ui->tableWidget->item(row, deletableCol); + if (patternItem->flags() & Qt::ItemIsEnabled) { + QByteArray prepend; + if (deletableItem->checkState() == Qt::Checked) { + prepend = "]"; + } else if (patternItem->text().startsWith('#')) { + prepend = "\\"; + } + ignores.write(prepend + patternItem->text().toUtf8() + '\n'); + } + } + } else { + QMessageBox::warning(this, tr("Could not open file"), + tr("Cannot write changes to '%1'.").arg(file)); + } + ignores.close(); //close the file before reloading stuff. + + FolderMan *folderMan = FolderMan::instance(); + + // We need to force a remote discovery after a change of the ignore list. + // Otherwise we would not download the files/directories that are no longer + // ignored (because the remote etag did not change) (issue #3172) + foreach (Folder *folder, folderMan->map()) { + folder->journalDb()->forceRemoteDiscoveryNextSync(); + folderMan->scheduleFolder(folder); + } +} + +void IgnoreListTableWidget::slotAddPattern() +{ + bool okClicked; + QString pattern = QInputDialog::getText(this, tr("Add Ignore Pattern"), + tr("Add a new ignore pattern:"), + QLineEdit::Normal, QString(), &okClicked); + + if (!okClicked || pattern.isEmpty()) + return; + + addPattern(pattern, false, false); + ui->tableWidget->scrollToBottom(); +} + +void IgnoreListTableWidget::readIgnoreFile(const QString &file, bool readOnly) +{ + QFile ignores(file); + if (ignores.open(QIODevice::ReadOnly)) { + while (!ignores.atEnd()) { + QString line = QString::fromUtf8(ignores.readLine()); + line.chop(1); + if (!line.isEmpty() && !line.startsWith("#")) { + bool deletable = false; + if (line.startsWith(']')) { + deletable = true; + line = line.mid(1); + } + addPattern(line, deletable, readOnly); + } + } + } +} + +int IgnoreListTableWidget::addPattern(const QString &pattern, bool deletable, bool readOnly) +{ + int newRow = ui->tableWidget->rowCount(); + ui->tableWidget->setRowCount(newRow + 1); + + QTableWidgetItem *patternItem = new QTableWidgetItem; + patternItem->setText(pattern); + ui->tableWidget->setItem(newRow, patternCol, patternItem); + + QTableWidgetItem *deletableItem = new QTableWidgetItem; + deletableItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled); + deletableItem->setCheckState(deletable ? Qt::Checked : Qt::Unchecked); + ui->tableWidget->setItem(newRow, deletableCol, deletableItem); + + if (readOnly) { + patternItem->setFlags(patternItem->flags() ^ Qt::ItemIsEnabled); + patternItem->setToolTip(readOnlyTooltip); + deletableItem->setFlags(deletableItem->flags() ^ Qt::ItemIsEnabled); + } + + ui->removeAllPushButton->setEnabled(true); + + return newRow; +} + +} // namespace OCC diff --git a/src/gui/ignorelisttablewidget.h b/src/gui/ignorelisttablewidget.h new file mode 100644 index 000000000..3bded0462 --- /dev/null +++ b/src/gui/ignorelisttablewidget.h @@ -0,0 +1,38 @@ +#pragma once + +#include <QWidget> + +class QAbstractButton; + +namespace OCC { + +namespace Ui { + class IgnoreListTableWidget; +} + +class IgnoreListTableWidget : public QWidget +{ + Q_OBJECT + +public: + IgnoreListTableWidget(QWidget *parent = nullptr); + ~IgnoreListTableWidget(); + + void readIgnoreFile(const QString &file, bool readOnly = false); + int addPattern(const QString &pattern, bool deletable, bool readOnly); + +public slots: + void slotRemoveAllItems(); + void slotWriteIgnoreFile(const QString & file); + +private slots: + void slotItemSelectionChanged(); + void slotRemoveCurrentItem(); + void slotAddPattern(); + +private: + void setupTableReadOnlyItems(); + QString readOnlyTooltip; + Ui::IgnoreListTableWidget *ui; +}; +} // namespace OCC diff --git a/src/gui/ignorelisttablewidget.ui b/src/gui/ignorelisttablewidget.ui new file mode 100644 index 000000000..2a618395a --- /dev/null +++ b/src/gui/ignorelisttablewidget.ui @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>OCC::IgnoreListTableWidget</class> + <widget class="QWidget" name="OCC::IgnoreListTableWidget"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>342</width> + <height>378</height> + </rect> + </property> + <property name="windowTitle"> + <string>IgnoreListTableWidget</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0" rowspan="4"> + <widget class="QTableWidget" name="tableWidget"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::SingleSelection</enum> + </property> + <property name="selectionBehavior"> + <enum>QAbstractItemView::SelectRows</enum> + </property> + <property name="columnCount"> + <number>2</number> + </property> + <column> + <property name="text"> + <string>Pattern</string> + </property> + </column> + <column> + <property name="text"> + <string>Allow Deletion</string> + </property> + </column> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPushButton" name="addPushButton"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>Add</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="removePushButton"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>Remove</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QPushButton" name="removeAllPushButton"> + <property name="text"> + <string>Remove all</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <spacer name="verticalSpacer"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>322</height> + </size> + </property> + </spacer> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QLabel" name="descriptionLabel"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/src/gui/legalnotice.ui b/src/gui/legalnotice.ui index be3c67ba6..1411ad892 100644 --- a/src/gui/legalnotice.ui +++ b/src/gui/legalnotice.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Dialog</string> + <string notr="true">Dialog</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> @@ -33,7 +33,7 @@ <item> <widget class="QLabel" name="notice"> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> </widget> </item> diff --git a/src/gui/mnemonicdialog.ui b/src/gui/mnemonicdialog.ui index e0b804f13..5f598c58b 100644 --- a/src/gui/mnemonicdialog.ui +++ b/src/gui/mnemonicdialog.ui @@ -20,7 +20,7 @@ </sizepolicy> </property> <property name="windowTitle"> - <string>Dialog</string> + <string notr="true">Dialog</string> </property> <property name="sizeGripEnabled"> <bool>false</bool> diff --git a/src/gui/networksettings.ui b/src/gui/networksettings.ui index 60c5ae9c2..a8245bdf6 100644 --- a/src/gui/networksettings.ui +++ b/src/gui/networksettings.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QGridLayout" name="gridLayout_3"> <item row="0" column="0"> diff --git a/src/gui/ocsshareejob.cpp b/src/gui/ocsshareejob.cpp index 0d1b6d44b..ced73800f 100644 --- a/src/gui/ocsshareejob.cpp +++ b/src/gui/ocsshareejob.cpp @@ -21,7 +21,7 @@ namespace OCC { OcsShareeJob::OcsShareeJob(AccountPtr account) : OcsJob(account) { - setPath("ocs/v1.php/apps/files_sharing/api/v1/sharees"); + setPath("ocs/v2.php/apps/files_sharing/api/v1/sharees"); connect(this, &OcsJob::jobFinished, this, &OcsShareeJob::jobDone); } diff --git a/src/gui/ocssharejob.cpp b/src/gui/ocssharejob.cpp index 520225461..15884e012 100644 --- a/src/gui/ocssharejob.cpp +++ b/src/gui/ocssharejob.cpp @@ -24,7 +24,7 @@ namespace OCC { OcsShareJob::OcsShareJob(AccountPtr account) : OcsJob(account) { - setPath("ocs/v1.php/apps/files_sharing/api/v1/shares"); + setPath("ocs/v2.php/apps/files_sharing/api/v1/shares"); connect(this, &OcsJob::jobFinished, this, &OcsShareJob::jobDone); } @@ -33,6 +33,7 @@ void OcsShareJob::getShares(const QString &path) setVerb("GET"); addParam(QString::fromLatin1("path"), path); + addParam(QString::fromLatin1("reshares"), QString("true")); addPassStatusCode(404); start(); diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 4d4dda1f6..53b568413 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -779,7 +779,7 @@ void ownCloudGui::setupActions() _actionStatus->setEnabled(false); _actionSettings = new QAction(tr("Settings..."), this); _actionNewAccountWizard = new QAction(tr("New account..."), this); - _actionRecent = new QAction(tr("Details..."), this); + _actionRecent = new QAction(tr("View more activity..."), this); _actionRecent->setEnabled(true); QObject::connect(_actionRecent, &QAction::triggered, this, &ownCloudGui::slotShowSyncProtocol); diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp index 2a037ff84..3d2034466 100644 --- a/src/gui/owncloudsetupwizard.cpp +++ b/src/gui/owncloudsetupwizard.cpp @@ -408,7 +408,7 @@ void OwncloudSetupWizard::slotAuthError() } _ocWizard->show(); - if (_ocWizard->currentId() == WizardCommon::Page_ShibbolethCreds || _ocWizard->currentId() == WizardCommon::Page_OAuthCreds) { + if (_ocWizard->currentId() == WizardCommon::Page_ShibbolethCreds || _ocWizard->currentId() == WizardCommon::Page_OAuthCreds || _ocWizard->currentId() == WizardCommon::Page_Flow2AuthCreds) { _ocWizard->back(); } _ocWizard->displayError(errorMsg, _ocWizard->currentId() == WizardCommon::Page_ServerSetup && checkDowngradeAdvised(reply)); @@ -466,7 +466,41 @@ void OwncloudSetupWizard::slotCreateLocalAndRemoteFolders(const QString &localFo _ocWizard->appendToConfigurationLog(res); } if (nextStep) { - EntityExistsJob *job = new EntityExistsJob(_ocWizard->account(), _ocWizard->account()->davPath() + remoteFolder, this); + /* + * BEGIN - Sanitize URL paths to eliminate double-slashes + * + * Purpose: Don't rely on unsafe paths, be extra careful. + * + * Example: https://cloud.example.com/remote.php/webdav// + * + */ + qCInfo(lcWizard) << "Sanitize got URL path:" << QString(_ocWizard->account()->url().toString() + '/' + _ocWizard->account()->davPath() + remoteFolder); + + QString newDavPath = _ocWizard->account()->davPath(), + newRemoteFolder = remoteFolder; + + while (newDavPath.startsWith('/')) { + newDavPath.remove(0, 1); + } + while (newDavPath.endsWith('/')) { + newDavPath.chop(1); + } + + while (newRemoteFolder.startsWith('/')) { + newRemoteFolder.remove(0, 1); + } + while (newRemoteFolder.endsWith('/')) { + newRemoteFolder.chop(1); + } + + QString newUrlPath = newDavPath + '/' + newRemoteFolder; + + qCInfo(lcWizard) << "Sanitized to URL path:" << _ocWizard->account()->url().toString() + '/' + newUrlPath; + /* + * END - Sanitize URL paths to eliminate double-slashes + */ + + EntityExistsJob *job = new EntityExistsJob(_ocWizard->account(), newUrlPath, this); connect(job, &EntityExistsJob::exists, this, &OwncloudSetupWizard::slotRemoteFolderExists); job->start(); } else { diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp index 4a62f5885..bc45eed20 100644 --- a/src/gui/sharedialog.cpp +++ b/src/gui/sharedialog.cpp @@ -194,7 +194,7 @@ void ShareDialog::slotSharesFetched(const QList<QSharedPointer<Share>> &shares) const QString versionString = _accountState->account()->serverVersion(); qCInfo(lcSharing) << versionString << "Fetched" << shares.count() << "shares"; foreach (auto share, shares) { - if (share->getShareType() != Share::TypeLink) { + if (share->getShareType() != Share::TypeLink || share->getUidOwner() != share->account()->davUser()) { continue; } @@ -271,6 +271,7 @@ void ShareDialog::showSharingUi() auto label = new QLabel(this); label->setText(tr("The file can not be shared because it was shared without sharing permission.")); label->setWordWrap(true); + _ui->verticalLayout->insertWidget(1, label); return; } diff --git a/src/gui/sharelinkwidget.ui b/src/gui/sharelinkwidget.ui index c0b85261f..c2fe47103 100644 --- a/src/gui/sharelinkwidget.ui +++ b/src/gui/sharelinkwidget.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>350</width> - <height>136</height> + <height>160</height> </rect> </property> <property name="sizePolicy"> @@ -29,6 +29,131 @@ <property name="bottomMargin"> <number>0</number> </property> + <item row="2" column="1"> + <widget class="QDateEdit" name="calendar"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="passwordLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Password:</string> + </property> + <property name="indent"> + <number>20</number> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="QToolButton" name="shareLinkToolButton"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="icon"> + <iconset resource="../../client.qrc"> + <normaloff>:/client/resources/more.svg</normaloff>:/client/resources/more.svg</iconset> + </property> + <property name="popupMode"> + <enum>QToolButton::InstantPopup</enum> + </property> + </widget> + </item> + <item row="3" column="0" colspan="4"> + <widget class="QLabel" name="errorLabel"> + <property name="palette"> + <palette> + <active> + <colorrole role="WindowText"> + <brush brushstyle="SolidPattern"> + <color alpha="255"> + <red>255</red> + <green>0</green> + <blue>0</blue> + </color> + </brush> + </colorrole> + </active> + <inactive> + <colorrole role="WindowText"> + <brush brushstyle="SolidPattern"> + <color alpha="255"> + <red>255</red> + <green>0</green> + <blue>0</blue> + </color> + </brush> + </colorrole> + </inactive> + <disabled> + <colorrole role="WindowText"> + <brush brushstyle="SolidPattern"> + <color alpha="255"> + <red>123</red> + <green>121</green> + <blue>134</blue> + </color> + </brush> + </colorrole> + </disabled> + </palette> + </property> + <property name="text"> + <string>TextLabel</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="lineEdit_password"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="echoMode"> + <enum>QLineEdit::Password</enum> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QToolButton" name="confirmPassword"> + <property name="icon"> + <iconset resource="../../client.qrc"> + <normaloff>:/client/resources/confirm.svg</normaloff>:/client/resources/confirm.svg</iconset> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QToolButton" name="confirmExpirationDate"> + <property name="icon"> + <iconset resource="../../client.qrc"> + <normaloff>:/client/resources/confirm.svg</normaloff>:/client/resources/confirm.svg</iconset> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + </widget> + </item> <item row="0" column="0" colspan="3"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> @@ -102,60 +227,6 @@ </item> </layout> </item> - <item row="0" column="3"> - <widget class="QToolButton" name="shareLinkToolButton"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="icon"> - <iconset resource="../../client.qrc"> - <normaloff>:/client/resources/more.svg</normaloff>:/client/resources/more.svg</iconset> - </property> - <property name="popupMode"> - <enum>QToolButton::InstantPopup</enum> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="passwordLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>1</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Password:</string> - </property> - <property name="indent"> - <number>20</number> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="lineEdit_password"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>1</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="echoMode"> - <enum>QLineEdit::Password</enum> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QToolButton" name="confirmPassword"> - <property name="icon"> - <iconset resource="../../client.qrc"> - <normaloff>:/client/resources/confirm.svg</normaloff>:/client/resources/confirm.svg</iconset> - </property> - <property name="autoRaise"> - <bool>true</bool> - </property> - </widget> - </item> <item row="2" column="0"> <widget class="QLabel" name="expirationLabel"> <property name="sizePolicy"> @@ -172,77 +243,6 @@ </property> </widget> </item> - <item row="2" column="1"> - <widget class="QDateEdit" name="calendar"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>1</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QToolButton" name="confirmExpirationDate"> - <property name="icon"> - <iconset resource="../../client.qrc"> - <normaloff>:/client/resources/confirm.svg</normaloff>:/client/resources/confirm.svg</iconset> - </property> - <property name="autoRaise"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="0" colspan="4"> - <widget class="QLabel" name="errorLabel"> - <property name="palette"> - <palette> - <active> - <colorrole role="WindowText"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>255</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - </active> - <inactive> - <colorrole role="WindowText"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>255</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - </inactive> - <disabled> - <colorrole role="WindowText"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>123</red> - <green>121</green> - <blue>134</blue> - </color> - </brush> - </colorrole> - </disabled> - </palette> - </property> - <property name="text"> - <string>TextLabel</string> - </property> - <property name="textFormat"> - <enum>Qt::PlainText</enum> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> </layout> </widget> <layoutdefault spacing="6" margin="11"/> diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp index 4bc32182a..1f96f2c6f 100644 --- a/src/gui/sharemanager.cpp +++ b/src/gui/sharemanager.cpp @@ -52,12 +52,16 @@ static void updateFolder(const AccountPtr &account, const QString &path) Share::Share(AccountPtr account, const QString &id, + const QString &uidowner, + const QString &ownerDisplayName, const QString &path, const ShareType shareType, const Permissions permissions, const QSharedPointer<Sharee> shareWith) : _account(account) , _id(id) + , _uidowner(uidowner) + , _ownerDisplayName(ownerDisplayName) , _path(path) , _shareType(shareType) , _permissions(permissions) @@ -80,6 +84,16 @@ QString Share::getId() const return _id; } +QString Share::getUidOwner() const +{ + return _uidowner; +} + +QString Share::getOwnerDisplayName() const +{ + return _ownerDisplayName; +} + Share::ShareType Share::getShareType() const { return _shareType; @@ -153,6 +167,8 @@ bool LinkShare::isPasswordSet() const LinkShare::LinkShare(AccountPtr account, const QString &id, + const QString &uidowner, + const QString &ownerDisplayName, const QString &path, const QString &name, const QString &token, @@ -160,7 +176,7 @@ LinkShare::LinkShare(AccountPtr account, bool passwordSet, const QUrl &url, const QDate &expireDate) - : Share(account, id, path, Share::TypeLink, permissions) + : Share(account, id, uidowner, ownerDisplayName, path, Share::TypeLink, permissions) , _name(name) , _token(token) , _passwordSet(passwordSet) @@ -393,6 +409,8 @@ QSharedPointer<LinkShare> ShareManager::parseLinkShare(const QJsonObject &data) return QSharedPointer<LinkShare>(new LinkShare(_account, data.value("id").toVariant().toString(), // "id" used to be an integer, support both + data.value("uid_owner").toString(), + data.value("displayname_owner").toString(), data.value("path").toString(), data.value("name").toString(), data.value("token").toString(), @@ -410,6 +428,8 @@ QSharedPointer<Share> ShareManager::parseShare(const QJsonObject &data) return QSharedPointer<Share>(new Share(_account, data.value("id").toVariant().toString(), // "id" used to be an integer, support both + data.value("uid_owner").toVariant().toString(), + data.value("displayname_owner").toVariant().toString(), data.value("path").toString(), (Share::ShareType)data.value("share_type").toInt(), (Share::Permissions)data.value("permissions").toInt(), diff --git a/src/gui/sharemanager.h b/src/gui/sharemanager.h index 18d060bae..db48771b1 100644 --- a/src/gui/sharemanager.h +++ b/src/gui/sharemanager.h @@ -54,6 +54,8 @@ public: */ explicit Share(AccountPtr account, const QString &id, + const QString &owner, + const QString &ownerDisplayName, const QString &path, const ShareType shareType, const Permissions permissions = SharePermissionDefault, @@ -72,6 +74,16 @@ public: QString getId() const; /* + * Get the uid_owner + */ + QString getUidOwner() const; + + /* + * Get the owner display name + */ + QString getOwnerDisplayName() const; + + /* * Get the shareType */ ShareType getShareType() const; @@ -110,6 +122,8 @@ signals: protected: AccountPtr _account; QString _id; + QString _uidowner; + QString _ownerDisplayName; QString _path; ShareType _shareType; Permissions _permissions; @@ -134,6 +148,8 @@ class LinkShare : public Share public: explicit LinkShare(AccountPtr account, const QString &id, + const QString &uidowner, + const QString &ownerDisplayName, const QString &path, const QString &name, const QString &token, diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp index 6f85809d9..a8eb848f1 100644 --- a/src/gui/shareusergroupwidget.cpp +++ b/src/gui/shareusergroupwidget.cpp @@ -190,13 +190,23 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>> layout->setContentsMargins(0, 0, 0, 0); int x = 0; int height = 0; + QList<QString> linkOwners({}); foreach (const auto &share, shares) { // We don't handle link shares, only TypeUser or TypeGroup if (share->getShareType() == Share::TypeLink) { + if(!share->getUidOwner().isEmpty() && + share->getUidOwner() != share->account()->davUser()){ + linkOwners.append(share->getOwnerDisplayName()); + } continue; } + // the owner of the file that shared it first + if(x == 0 && !share->getUidOwner().isEmpty()){ + _ui->mainOwnerLabel->setText(QString("Shared with you by ").append(share->getOwnerDisplayName())); + } + ShareUserLine *s = new ShareUserLine(share, _maxSharingPermissions, _isFile, _parentScrollArea); connect(s, &ShareUserLine::resizeRequested, this, &ShareUserGroupWidget::slotAdjustScrollWidgetSize); connect(s, &ShareUserLine::visualDeletionDone, this, &ShareUserGroupWidget::getShares); @@ -209,7 +219,18 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>> } } - scrollArea->setFrameShape(x > 3 ? QFrame::StyledPanel : QFrame::NoFrame); + foreach (const QString &owner, linkOwners) { + auto ownerLabel = new QLabel(QString(owner + " shared via link")); + layout->addWidget(ownerLabel); + ownerLabel->setVisible(true); + + x++; + if (x <= 6) { + height = newViewPort->sizeHint().height(); + } + } + + scrollArea->setFrameShape(x > 6 ? QFrame::StyledPanel : QFrame::NoFrame); scrollArea->setVisible(!shares.isEmpty()); scrollArea->setFixedHeight(height); scrollArea->setWidget(newViewPort); @@ -367,6 +388,15 @@ ShareUserLine::ShareUserLine(QSharedPointer<Share> share, menu->addAction(_permissionReshare); connect(_permissionReshare, &QAction::triggered, this, &ShareUserLine::slotPermissionsChanged); + menu->addSeparator(); + + // Adds action to delete share widget + QIcon deleteicon = QIcon::fromTheme(QLatin1String("user-trash"),QIcon(QLatin1String(":/client/resources/delete.png"))); + _deleteShareButton= new QAction(deleteicon,tr("Unshare"), this); + + menu->addAction(_deleteShareButton); + connect(_deleteShareButton, &QAction::triggered, this, &ShareUserLine::on_deleteShareButton_clicked); + /* * Files can't have create or delete permissions */ @@ -413,8 +443,8 @@ ShareUserLine::ShareUserLine(QSharedPointer<Share> share, connect(share.data(), &Share::permissionsSet, this, &ShareUserLine::slotPermissionsSet); connect(share.data(), &Share::shareDeleted, this, &ShareUserLine::slotShareDeleted); - _ui->deleteShareButton->setIcon(QIcon::fromTheme(QLatin1String("user-trash"), - QIcon(QLatin1String(":/client/resources/delete.png")))); + // _ui->deleteShareButton->setIcon(QIcon::fromTheme(QLatin1String("user-trash"), + // QIcon(QLatin1String(":/client/resources/delete.png")))); if (!share->account()->capabilities().shareResharing()) { _permissionReshare->setVisible(false); diff --git a/src/gui/shareusergroupwidget.h b/src/gui/shareusergroupwidget.h index be1e3c111..a1f537f05 100644 --- a/src/gui/shareusergroupwidget.h +++ b/src/gui/shareusergroupwidget.h @@ -148,6 +148,7 @@ private: // _permissionEdit is a checkbox QAction *_permissionReshare; + QAction *_deleteShareButton; QAction *_permissionCreate; QAction *_permissionChange; QAction *_permissionDelete; diff --git a/src/gui/shareusergroupwidget.ui b/src/gui/shareusergroupwidget.ui index 51682bb05..ed1e43e7f 100644 --- a/src/gui/shareusergroupwidget.ui +++ b/src/gui/shareusergroupwidget.ui @@ -33,6 +33,13 @@ <number>0</number> </property> <item> + <widget class="QLabel" name="mainOwnerLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> <layout class="QHBoxLayout" name="shareeHorizontalLayout"> <property name="leftMargin"> <number>0</number> diff --git a/src/gui/shareuserline.ui b/src/gui/shareuserline.ui index 0de300930..d586ef161 100644 --- a/src/gui/shareuserline.ui +++ b/src/gui/shareuserline.ui @@ -91,15 +91,7 @@ </property> </widget> </item> - <item> - <widget class="QToolButton" name="deleteShareButton"> - <property name="icon"> - <iconset theme="user-trash"> - <normaloff>.</normaloff>.</iconset> - </property> - </widget> - </item> - </layout> + </layout> </widget> <customwidgets> <customwidget> diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp index 8b6350efa..814a7b0af 100644 --- a/src/gui/sslerrordialog.cpp +++ b/src/gui/sslerrordialog.cpp @@ -184,10 +184,15 @@ QString SslErrorDialog::certDiv(QSslCertificate cert) const msg += QL("<p>"); - QString md5sum = Utility::formatFingerprint(cert.digest(QCryptographicHash::Md5).toHex()); - QString sha1sum = Utility::formatFingerprint(cert.digest(QCryptographicHash::Sha1).toHex()); - msg += tr("Fingerprint (MD5): <tt>%1</tt>").arg(md5sum) + QL("<br/>"); - msg += tr("Fingerprint (SHA1): <tt>%1</tt>").arg(sha1sum) + QL("<br/>"); + if (cert.effectiveDate() < QDateTime(QDate(2016, 1, 1), QTime(), Qt::UTC)) { + QString sha1sum = Utility::formatFingerprint(cert.digest(QCryptographicHash::Sha1).toHex()); + msg += tr("Fingerprint (SHA1): <tt>%1</tt>").arg(sha1sum) + QL("<br/>"); + } + + QString sha256sum = Utility::formatFingerprint(cert.digest(QCryptographicHash::Sha256).toHex()); + QString sha512sum = Utility::formatFingerprint(cert.digest(QCryptographicHash::Sha512).toHex()); + msg += tr("Fingerprint (SHA-256): <tt>%1</tt>").arg(sha256sum) + QL("<br/>"); + msg += tr("Fingerprint (SHA-512): <tt>%1</tt>").arg(sha512sum) + QL("<br/>"); msg += QL("<br/>"); msg += tr("Effective Date: %1").arg(cert.effectiveDate().toString()) + QL("<br/>"); msg += tr("Expiration Date: %1").arg(cert.expiryDate().toString()) + QL("</p>"); diff --git a/src/gui/sslerrordialog.ui b/src/gui/sslerrordialog.ui index 900e746fc..438888a4a 100644 --- a/src/gui/sslerrordialog.ui +++ b/src/gui/sslerrordialog.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QGridLayout" name="gridLayout"> <item row="1" column="0"> diff --git a/src/gui/wizard/flow2authcredspage.cpp b/src/gui/wizard/flow2authcredspage.cpp new file mode 100644 index 000000000..165752663 --- /dev/null +++ b/src/gui/wizard/flow2authcredspage.cpp @@ -0,0 +1,151 @@ +/* + * Copyright (C) by Olivier Goffart <ogoffart@woboq.com> + * Copyright (C) by Michael Schuster <michael@nextcloud.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#include <QVariant> +#include <QMenu> +#include <QClipboard> + +#include "wizard/flow2authcredspage.h" +#include "theme.h" +#include "account.h" +#include "cookiejar.h" +#include "wizard/owncloudwizardcommon.h" +#include "wizard/owncloudwizard.h" +#include "creds/credentialsfactory.h" +#include "creds/webflowcredentials.h" + +namespace OCC { + +Flow2AuthCredsPage::Flow2AuthCredsPage() + : AbstractCredentialsWizardPage() +{ + _ui.setupUi(this); + + Theme *theme = Theme::instance(); + _ui.topLabel->hide(); + _ui.bottomLabel->hide(); + QVariant variant = theme->customMedia(Theme::oCSetupTop); + WizardCommon::setupCustomMedia(variant, _ui.topLabel); + variant = theme->customMedia(Theme::oCSetupBottom); + WizardCommon::setupCustomMedia(variant, _ui.bottomLabel); + + WizardCommon::initErrorLabel(_ui.errorLabel); + + setTitle(WizardCommon::titleTemplate().arg(tr("Connect to %1").arg(Theme::instance()->appNameGUI()))); + setSubTitle(WizardCommon::subTitleTemplate().arg(tr("Login in your browser (Login Flow v2)"))); + + connect(_ui.openLinkButton, &QCommandLinkButton::clicked, this, &Flow2AuthCredsPage::slotOpenBrowser); + connect(_ui.copyLinkButton, &QCommandLinkButton::clicked, this, &Flow2AuthCredsPage::slotCopyLinkToClipboard); +} + +void Flow2AuthCredsPage::initializePage() +{ + OwncloudWizard *ocWizard = qobject_cast<OwncloudWizard *>(wizard()); + Q_ASSERT(ocWizard); + ocWizard->account()->setCredentials(CredentialsFactory::create("http")); + _asyncAuth.reset(new Flow2Auth(ocWizard->account().data(), this)); + connect(_asyncAuth.data(), &Flow2Auth::result, this, &Flow2AuthCredsPage::asyncAuthResult, Qt::QueuedConnection); + _asyncAuth->start(); + + // Don't hide the wizard (avoid user confusion)! + //wizard()->hide(); +} + +void OCC::Flow2AuthCredsPage::cleanupPage() +{ + // The next or back button was activated, show the wizard again + wizard()->show(); + _asyncAuth.reset(); + + // Forget sensitive data + _appPassword.clear(); + _user.clear(); +} + +void Flow2AuthCredsPage::asyncAuthResult(Flow2Auth::Result r, const QString &user, + const QString &appPassword) +{ + switch (r) { + case Flow2Auth::NotSupported: { + /* Flow2Auth not supported (can't open browser) */ + _ui.errorLabel->setText(tr("Unable to open the Browser, please copy the link to your Browser.")); + _ui.errorLabel->show(); + + /* Don't fallback to HTTP credentials */ + /*OwncloudWizard *ocWizard = qobject_cast<OwncloudWizard *>(wizard()); + ocWizard->back(); + ocWizard->setAuthType(DetermineAuthTypeJob::Basic);*/ + break; + } + case Flow2Auth::Error: + /* Error while getting the access token. (Timeout, or the server did not accept our client credentials */ + _ui.errorLabel->show(); + wizard()->show(); + break; + case Flow2Auth::LoggedIn: { + _user = user; + _appPassword = appPassword; + OwncloudWizard *ocWizard = qobject_cast<OwncloudWizard *>(wizard()); + Q_ASSERT(ocWizard); + emit connectToOCUrl(ocWizard->account()->url().toString()); + break; + } + } +} + +int Flow2AuthCredsPage::nextId() const +{ + return WizardCommon::Page_AdvancedSetup; +} + +void Flow2AuthCredsPage::setConnected() +{ + wizard()->show(); +} + +AbstractCredentials *Flow2AuthCredsPage::getCredentials() const +{ + OwncloudWizard *ocWizard = qobject_cast<OwncloudWizard *>(wizard()); + Q_ASSERT(ocWizard); + return new WebFlowCredentials( + _user, + _appPassword, + ocWizard->_clientSslCertificate, + ocWizard->_clientSslKey, + ocWizard->_clientSslCaCertificates + ); +} + +bool Flow2AuthCredsPage::isComplete() const +{ + return false; /* We can never go forward manually */ +} + +void Flow2AuthCredsPage::slotOpenBrowser() +{ + if (_ui.errorLabel) + _ui.errorLabel->hide(); + + if (_asyncAuth) + _asyncAuth->openBrowser(); +} + +void Flow2AuthCredsPage::slotCopyLinkToClipboard() +{ + if (_asyncAuth) + QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded)); +} + +} // namespace OCC diff --git a/src/gui/wizard/flow2authcredspage.h b/src/gui/wizard/flow2authcredspage.h new file mode 100644 index 000000000..f51d7d7f3 --- /dev/null +++ b/src/gui/wizard/flow2authcredspage.h @@ -0,0 +1,65 @@ +/* + * Copyright (C) by Olivier Goffart <ogoffart@woboq.com> + * Copyright (C) by Michael Schuster <michael@nextcloud.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#pragma once + +#include <QList> +#include <QMap> +#include <QNetworkCookie> +#include <QUrl> +#include <QPointer> + +#include "wizard/abstractcredswizardpage.h" +#include "accountfwd.h" +#include "creds/flow2auth.h" + +#include "ui_flow2authcredspage.h" + + +namespace OCC { + + +class Flow2AuthCredsPage : public AbstractCredentialsWizardPage +{ + Q_OBJECT +public: + Flow2AuthCredsPage(); + + AbstractCredentials *getCredentials() const override; + + void initializePage() override; + void cleanupPage() override; + int nextId() const override; + void setConnected(); + bool isComplete() const override; + +public Q_SLOTS: + void asyncAuthResult(Flow2Auth::Result, const QString &user, const QString &appPassword); + +signals: + void connectToOCUrl(const QString &); + +public: + QString _user; + QString _appPassword; + QScopedPointer<Flow2Auth> _asyncAuth; + Ui_Flow2AuthCredsPage _ui; + +protected slots: + void slotOpenBrowser(); + void slotCopyLinkToClipboard(); +}; + +} // namespace OCC diff --git a/src/gui/wizard/flow2authcredspage.ui b/src/gui/wizard/flow2authcredspage.ui new file mode 100644 index 000000000..37d2b8f53 --- /dev/null +++ b/src/gui/wizard/flow2authcredspage.ui @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Flow2AuthCredsPage</class> + <widget class="QWidget" name="Flow2AuthCredsPage"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>424</width> + <height>373</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="topLabel"> + <property name="text"> + <string notr="true">TextLabel</string> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Please switch to your browser to proceed.</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="errorLabel"> + <property name="text"> + <string>An error occurred while connecting. Please try again.</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + </widget> + </item> + <item> + <widget class="QCommandLinkButton" name="openLinkButton"> + <property name="text"> + <string>Re-open Browser</string> + </property> + </widget> + </item> + <item> + <widget class="QCommandLinkButton" name="copyLinkButton"> + <property name="font"> + <font> + <weight>50</weight> + <bold>false</bold> + </font> + </property> + <property name="text"> + <string>Copy link</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>127</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="bottomLabel"> + <property name="text"> + <string notr="true">TextLabel</string> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/src/gui/wizard/flow2authwidget.cpp b/src/gui/wizard/flow2authwidget.cpp new file mode 100644 index 000000000..c050a54d0 --- /dev/null +++ b/src/gui/wizard/flow2authwidget.cpp @@ -0,0 +1,115 @@ +/* + * Copyright (C) by Michael Schuster <michael@nextcloud.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#include "flow2authwidget.h" + +#include <QDesktopServices> +#include <QProgressBar> +#include <QLoggingCategory> +#include <QLocale> +#include <QMessageBox> + +#include <QMenu> +#include <QClipboard> + +#include "common/utility.h" +#include "account.h" +#include "theme.h" +#include "wizard/owncloudwizardcommon.h" + +namespace OCC { + +Q_LOGGING_CATEGORY(lcFlow2AuthWidget, "gui.wizard.flow2authwidget", QtInfoMsg) + + +Flow2AuthWidget::Flow2AuthWidget(Account *account, QWidget *parent) + : QWidget(parent), + _account(account), + _ui() +{ + _ui.setupUi(this); + + Theme *theme = Theme::instance(); + _ui.topLabel->hide(); + _ui.bottomLabel->hide(); + QVariant variant = theme->customMedia(Theme::oCSetupTop); + WizardCommon::setupCustomMedia(variant, _ui.topLabel); + variant = theme->customMedia(Theme::oCSetupBottom); + WizardCommon::setupCustomMedia(variant, _ui.bottomLabel); + + WizardCommon::initErrorLabel(_ui.errorLabel); + + connect(_ui.openLinkButton, &QCommandLinkButton::clicked, this, &Flow2AuthWidget::slotOpenBrowser); + connect(_ui.copyLinkButton, &QCommandLinkButton::clicked, this, &Flow2AuthWidget::slotCopyLinkToClipboard); + + _asyncAuth.reset(new Flow2Auth(_account, this)); + connect(_asyncAuth.data(), &Flow2Auth::result, this, &Flow2AuthWidget::asyncAuthResult, Qt::QueuedConnection); + _asyncAuth->start(); +} + +void Flow2AuthWidget::asyncAuthResult(Flow2Auth::Result r, const QString &user, + const QString &appPassword) +{ + switch (r) { + case Flow2Auth::NotSupported: + /* Flow2Auth can't open browser */ + _ui.errorLabel->setText(tr("Unable to open the Browser, please copy the link to your Browser.")); + _ui.errorLabel->show(); + break; + case Flow2Auth::Error: + /* Error while getting the access token. (Timeout, or the server did not accept our client credentials */ + _ui.errorLabel->show(); + break; + case Flow2Auth::LoggedIn: { + _user = user; + _appPassword = appPassword; + emit urlCatched(_user, _appPassword, QString()); + break; + } + } +} + +void Flow2AuthWidget::setError(const QString &error) { + if (error.isEmpty()) { + _ui.errorLabel->hide(); + } else { + _ui.errorLabel->setText(error); + _ui.errorLabel->show(); + } +} + +Flow2AuthWidget::~Flow2AuthWidget() { + _asyncAuth.reset(); + + // Forget sensitive data + _appPassword.clear(); + _user.clear(); +} + +void Flow2AuthWidget::slotOpenBrowser() +{ + if (_ui.errorLabel) + _ui.errorLabel->hide(); + + if (_asyncAuth) + _asyncAuth->openBrowser(); +} + +void Flow2AuthWidget::slotCopyLinkToClipboard() +{ + if (_asyncAuth) + QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded)); +} + +} // namespace OCC diff --git a/src/gui/wizard/flow2authwidget.h b/src/gui/wizard/flow2authwidget.h new file mode 100644 index 000000000..7fe1844c1 --- /dev/null +++ b/src/gui/wizard/flow2authwidget.h @@ -0,0 +1,56 @@ +/* + * Copyright (C) by Michael Schuster <michael@nextcloud.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#ifndef FLOW2AUTHWIDGET_H +#define FLOW2AUTHWIDGET_H + +#include <QUrl> +#include <QWidget> + +#include "creds/flow2auth.h" + +#include "ui_flow2authwidget.h" + +namespace OCC { + +class Flow2AuthWidget : public QWidget +{ + Q_OBJECT +public: + Flow2AuthWidget(Account *account, QWidget *parent = nullptr); + virtual ~Flow2AuthWidget(); + + void setError(const QString &error); + +public Q_SLOTS: + void asyncAuthResult(Flow2Auth::Result, const QString &user, const QString &appPassword); + +signals: + void urlCatched(const QString user, const QString pass, const QString host); + +private: + Account *_account; + QString _user; + QString _appPassword; + QScopedPointer<Flow2Auth> _asyncAuth; + Ui_Flow2AuthWidget _ui; + +protected slots: + void slotOpenBrowser(); + void slotCopyLinkToClipboard(); +}; + +} + +#endif // FLOW2AUTHWIDGET_H diff --git a/src/gui/wizard/flow2authwidget.ui b/src/gui/wizard/flow2authwidget.ui new file mode 100644 index 000000000..7de44675f --- /dev/null +++ b/src/gui/wizard/flow2authwidget.ui @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Flow2AuthWidget</class> + <widget class="QWidget" name="Flow2AuthWidget"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>280</height> + </rect> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>500</width> + <height>280</height> + </size> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="topLabel"> + <property name="text"> + <string notr="true">TextLabel</string> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Please switch to your browser to proceed.</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="errorLabel"> + <property name="text"> + <string>An error occurred while connecting. Please try again.</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + </widget> + </item> + <item> + <widget class="QCommandLinkButton" name="openLinkButton"> + <property name="text"> + <string>Re-open Browser</string> + </property> + </widget> + </item> + <item> + <widget class="QCommandLinkButton" name="copyLinkButton"> + <property name="font"> + <font> + <weight>50</weight> + <bold>false</bold> + </font> + </property> + <property name="text"> + <string>Copy link</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>127</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="bottomLabel"> + <property name="text"> + <string notr="true">TextLabel</string> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/src/gui/wizard/owncloudadvancedsetuppage.ui b/src/gui/wizard/owncloudadvancedsetuppage.ui index d949d50ba..7f10417c1 100644 --- a/src/gui/wizard/owncloudadvancedsetuppage.ui +++ b/src/gui/wizard/owncloudadvancedsetuppage.ui @@ -17,7 +17,7 @@ </sizepolicy> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QVBoxLayout" name="verticalLayout_4"> <item> @@ -29,7 +29,7 @@ </sizepolicy> </property> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> @@ -97,7 +97,7 @@ <item> <widget class="QLabel" name="lSyncEverythingSizeLabel"> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> <property name="textFormat"> <enum>Qt::PlainText</enum> @@ -202,7 +202,7 @@ <item> <widget class="QLabel" name="lSelectiveSyncSizeLabel"> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> <property name="textFormat"> <enum>Qt::PlainText</enum> @@ -232,7 +232,7 @@ <item> <widget class="QLabel" name="lLocalIcon"> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> <property name="alignment"> <set>Qt::AlignCenter</set> @@ -282,7 +282,7 @@ </sizepolicy> </property> <property name="text"> - <string>pbSelectLocalFolder</string> + <string notr="true">pbSelectLocalFolder</string> </property> </widget> </item> @@ -291,7 +291,7 @@ <item> <widget class="QLabel" name="lServerIcon"> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> <property name="alignment"> <set>Qt::AlignCenter</set> @@ -383,7 +383,7 @@ <item row="4" column="1"> <widget class="QLabel" name="lFreeSpace"> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> </widget> </item> @@ -392,7 +392,7 @@ <item> <widget class="QLabel" name="errorLabel"> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> </widget> </item> @@ -418,7 +418,7 @@ <item> <widget class="QLabel" name="bottomLabel"> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> diff --git a/src/gui/wizard/owncloudhttpcredspage.ui b/src/gui/wizard/owncloudhttpcredspage.ui index 9fd445f35..36c2a30e4 100644 --- a/src/gui/wizard/owncloudhttpcredspage.ui +++ b/src/gui/wizard/owncloudhttpcredspage.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QGridLayout" name="gridLayout"> <item row="5" column="1"> diff --git a/src/gui/wizard/owncloudoauthcredspage.cpp b/src/gui/wizard/owncloudoauthcredspage.cpp index a32ccdb87..0d4c40ea7 100644 --- a/src/gui/wizard/owncloudoauthcredspage.cpp +++ b/src/gui/wizard/owncloudoauthcredspage.cpp @@ -45,21 +45,8 @@ OwncloudOAuthCredsPage::OwncloudOAuthCredsPage() setTitle(WizardCommon::titleTemplate().arg(tr("Connect to %1").arg(Theme::instance()->appNameGUI()))); setSubTitle(WizardCommon::subTitleTemplate().arg(tr("Login in your browser"))); - connect(_ui.openLinkButton, &QCommandLinkButton::clicked, [this] { - _ui.errorLabel->hide(); - if (_asyncAuth) - _asyncAuth->openBrowser(); - }); - _ui.openLinkButton->setContextMenuPolicy(Qt::CustomContextMenu); - QObject::connect(_ui.openLinkButton, &QWidget::customContextMenuRequested, [this](const QPoint &pos) { - auto menu = new QMenu(_ui.openLinkButton); - menu->addAction(tr("Copy link to clipboard"), this, [this] { - if (_asyncAuth) - QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded)); - }); - menu->setAttribute(Qt::WA_DeleteOnClose); - menu->popup(_ui.openLinkButton->mapToGlobal(pos)); - }); + connect(_ui.openLinkButton, &QCommandLinkButton::clicked, this, &OwncloudOAuthCredsPage::slotOpenBrowser); + connect(_ui.copyLinkButton, &QCommandLinkButton::clicked, this, &OwncloudOAuthCredsPage::slotCopyLinkToClipboard); } void OwncloudOAuthCredsPage::initializePage() @@ -70,7 +57,9 @@ void OwncloudOAuthCredsPage::initializePage() _asyncAuth.reset(new OAuth(ocWizard->account().data(), this)); connect(_asyncAuth.data(), &OAuth::result, this, &OwncloudOAuthCredsPage::asyncAuthResult, Qt::QueuedConnection); _asyncAuth->start(); - wizard()->hide(); + + // Don't hide the wizard (avoid user confusion)! + //wizard()->hide(); } void OCC::OwncloudOAuthCredsPage::cleanupPage() @@ -131,4 +120,19 @@ bool OwncloudOAuthCredsPage::isComplete() const return false; /* We can never go forward manually */ } +void OwncloudOAuthCredsPage::slotOpenBrowser() +{ + if (_ui.errorLabel) + _ui.errorLabel->hide(); + + if (_asyncAuth) + _asyncAuth->openBrowser(); +} + +void OwncloudOAuthCredsPage::slotCopyLinkToClipboard() +{ + if (_asyncAuth) + QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded)); +} + } // namespace OCC diff --git a/src/gui/wizard/owncloudoauthcredspage.h b/src/gui/wizard/owncloudoauthcredspage.h index 32341eb1c..efbc9a69b 100644 --- a/src/gui/wizard/owncloudoauthcredspage.h +++ b/src/gui/wizard/owncloudoauthcredspage.h @@ -57,6 +57,10 @@ public: QString _refreshToken; QScopedPointer<OAuth> _asyncAuth; Ui_OwncloudOAuthCredsPage _ui; + +protected slots: + void slotOpenBrowser(); + void slotCopyLinkToClipboard(); }; } // namespace OCC diff --git a/src/gui/wizard/owncloudoauthcredspage.ui b/src/gui/wizard/owncloudoauthcredspage.ui index 285ef3a2b..03682cae1 100644 --- a/src/gui/wizard/owncloudoauthcredspage.ui +++ b/src/gui/wizard/owncloudoauthcredspage.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> @@ -58,6 +58,19 @@ </widget> </item> <item> + <widget class="QCommandLinkButton" name="copyLinkButton"> + <property name="font"> + <font> + <weight>50</weight> + <bold>false</bold> + </font> + </property> + <property name="text"> + <string>Copy link</string> + </property> + </widget> + </item> + <item> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> diff --git a/src/gui/wizard/owncloudsetupnocredspage.ui b/src/gui/wizard/owncloudsetupnocredspage.ui index bc0ec84b9..10a44e49b 100644 --- a/src/gui/wizard/owncloudsetupnocredspage.ui +++ b/src/gui/wizard/owncloudsetupnocredspage.ui @@ -17,7 +17,7 @@ </sizepolicy> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <property name="autoFillBackground"> <bool>false</bool> @@ -35,7 +35,7 @@ </size> </property> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> @@ -94,7 +94,7 @@ </sizepolicy> </property> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> <property name="textFormat"> <enum>Qt::RichText</enum> diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp index e56ca06ae..3a956b0d7 100644 --- a/src/gui/wizard/owncloudsetuppage.cpp +++ b/src/gui/wizard/owncloudsetuppage.cpp @@ -258,6 +258,8 @@ int OwncloudSetupPage::nextId() const return WizardCommon::Page_HttpCreds; case DetermineAuthTypeJob::OAuth: return WizardCommon::Page_OAuthCreds; + case DetermineAuthTypeJob::LoginFlowV2: + return WizardCommon::Page_Flow2AuthCreds; case DetermineAuthTypeJob::Shibboleth: return WizardCommon::Page_ShibbolethCreds; case DetermineAuthTypeJob::WebViewFlow: @@ -375,12 +377,13 @@ QString subjectInfoHelper(const QSslCertificate &cert, const QByteArray &qa) //called during the validation of the client certificate. void OwncloudSetupPage::slotCertificateAccepted() { - QList<QSslCertificate> clientCaCertificates; QFile certFile(addCertDial->getCertificatePath()); certFile.open(QFile::ReadOnly); - if (QSslCertificate::importPkcs12(&certFile, - &_ocWizard->_clientSslKey, &_ocWizard->_clientSslCertificate, - &clientCaCertificates, + if (QSslCertificate::importPkcs12( + &certFile, + &_ocWizard->_clientSslKey, + &_ocWizard->_clientSslCertificate, + &_ocWizard->_clientSslCaCertificates, addCertDial->getCertificatePasswd().toLocal8Bit())) { AccountPtr acc = _ocWizard->account(); @@ -392,6 +395,12 @@ void OwncloudSetupPage::slotCertificateAccepted() // cert will come via the HttpCredentials sslConfiguration.setLocalCertificate(_ocWizard->_clientSslCertificate); sslConfiguration.setPrivateKey(_ocWizard->_clientSslKey); + + // Be sure to merge the CAs + auto ca = sslConfiguration.systemCaCertificates(); + ca.append(_ocWizard->_clientSslCaCertificates); + sslConfiguration.setCaCertificates(ca); + acc->setSslConfiguration(sslConfiguration); // Make sure TCP connections get re-established diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp index 357b4e005..e4dda0fbd 100644 --- a/src/gui/wizard/owncloudwizard.cpp +++ b/src/gui/wizard/owncloudwizard.cpp @@ -27,6 +27,7 @@ #include "wizard/owncloudadvancedsetuppage.h" #include "wizard/owncloudwizardresultpage.h" #include "wizard/webviewpage.h" +#include "wizard/flow2authcredspage.h" #include "QProgressIndicator.h" @@ -45,6 +46,7 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) , _setupPage(new OwncloudSetupPage(this)) , _httpCredsPage(new OwncloudHttpCredsPage(this)) , _browserCredsPage(new OwncloudOAuthCredsPage) + , _flow2CredsPage(new Flow2AuthCredsPage) #ifndef NO_SHIBBOLETH , _shibbolethCredsPage(new OwncloudShibbolethCredsPage) #endif @@ -59,6 +61,7 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) setPage(WizardCommon::Page_ServerSetup, _setupPage); setPage(WizardCommon::Page_HttpCreds, _httpCredsPage); setPage(WizardCommon::Page_OAuthCreds, _browserCredsPage); + setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage); #ifndef NO_SHIBBOLETH setPage(WizardCommon::Page_ShibbolethCreds, _shibbolethCredsPage); #endif @@ -76,6 +79,7 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) connect(_setupPage, &OwncloudSetupPage::determineAuthType, this, &OwncloudWizard::determineAuthType); connect(_httpCredsPage, &OwncloudHttpCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); connect(_browserCredsPage, &OwncloudOAuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); + connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); #ifndef NO_SHIBBOLETH connect(_shibbolethCredsPage, &OwncloudShibbolethCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); #endif @@ -129,11 +133,13 @@ QString OwncloudWizard::ocUrl() const return url; } -bool OwncloudWizard::registration() { +bool OwncloudWizard::registration() +{ return _registration; } -void OwncloudWizard::setRegistration(bool registration) { +void OwncloudWizard::setRegistration(bool registration) +{ _registration = registration; } @@ -162,6 +168,10 @@ void OwncloudWizard::successfulStep() _browserCredsPage->setConnected(); break; + case WizardCommon::Page_Flow2AuthCreds: + _flow2CredsPage->setConnected(); + break; + #ifndef NO_SHIBBOLETH case WizardCommon::Page_ShibbolethCreds: _shibbolethCredsPage->setConnected(); @@ -195,6 +205,8 @@ void OwncloudWizard::setAuthType(DetermineAuthTypeJob::AuthType type) #endif if (type == DetermineAuthTypeJob::OAuth) { _credentialsPage = _browserCredsPage; + } else if (type == DetermineAuthTypeJob::LoginFlowV2) { + _credentialsPage = _flow2CredsPage; } else if (type == DetermineAuthTypeJob::WebViewFlow) { _credentialsPage = _webViewPage; } else { // try Basic auth even for "Unknown" @@ -221,7 +233,7 @@ void OwncloudWizard::slotCurrentPageChanged(int id) } setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup); - if (id == WizardCommon::Page_AdvancedSetup && _credentialsPage == _browserCredsPage) { + if (id == WizardCommon::Page_AdvancedSetup && (_credentialsPage == _browserCredsPage || _credentialsPage == _flow2CredsPage)) { // For OAuth, disable the back button in the Page_AdvancedSetup because we don't want // to re-open the browser. button(QWizard::BackButton)->setEnabled(false); diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h index 1429709f1..c1d290d4b 100644 --- a/src/gui/wizard/owncloudwizard.h +++ b/src/gui/wizard/owncloudwizard.h @@ -40,6 +40,7 @@ class OwncloudWizardResultPage; class AbstractCredentials; class AbstractCredentialsWizardPage; class WebViewPage; +class Flow2AuthCredsPage; /** * @brief The OwncloudWizard class @@ -77,6 +78,7 @@ public: // Set from the OwncloudSetupPage, later used from OwncloudHttpCredsPage QSslKey _clientSslKey; QSslCertificate _clientSslCertificate; + QList<QSslCertificate> _clientSslCaCertificates; public slots: void setAuthType(DetermineAuthTypeJob::AuthType type); @@ -103,6 +105,7 @@ private: #ifndef NO_SHIBBOLETH OwncloudShibbolethCredsPage *_shibbolethCredsPage; #endif + Flow2AuthCredsPage *_flow2CredsPage; OwncloudAdvancedSetupPage *_advancedSetupPage; OwncloudWizardResultPage *_resultPage; AbstractCredentialsWizardPage *_credentialsPage; diff --git a/src/gui/wizard/owncloudwizardcommon.h b/src/gui/wizard/owncloudwizardcommon.h index c3174d15a..d1f7c08be 100644 --- a/src/gui/wizard/owncloudwizardcommon.h +++ b/src/gui/wizard/owncloudwizardcommon.h @@ -38,6 +38,7 @@ namespace WizardCommon { Page_HttpCreds, Page_ShibbolethCreds, Page_OAuthCreds, + Page_Flow2AuthCreds, Page_WebView, Page_AdvancedSetup, Page_Result diff --git a/src/gui/wizard/owncloudwizardresultpage.ui b/src/gui/wizard/owncloudwizardresultpage.ui index 67eb5a617..44652f295 100644 --- a/src/gui/wizard/owncloudwizardresultpage.ui +++ b/src/gui/wizard/owncloudwizardresultpage.ui @@ -11,13 +11,13 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> <widget class="QLabel" name="topLabel"> <property name="text"> - <string>TextLabel</string> + <string notr="true">TextLabel</string> </property> <property name="wordWrap"> <bool>true</bool> @@ -95,7 +95,7 @@ </size> </property> <property name="text"> - <string>PushButton</string> + <string notr="true">PushButton</string> </property> <property name="toolButtonStyle"> <enum>Qt::ToolButtonTextUnderIcon</enum> @@ -117,7 +117,7 @@ </size> </property> <property name="text"> - <string>PushButton</string> + <string notr="true">PushButton</string> </property> <property name="toolButtonStyle"> <enum>Qt::ToolButtonTextUnderIcon</enum> diff --git a/src/gui/wizard/webview.cpp b/src/gui/wizard/webview.cpp index b9b76cc05..f0e5e2159 100644 --- a/src/gui/wizard/webview.cpp +++ b/src/gui/wizard/webview.cpp @@ -142,7 +142,7 @@ WebViewPageUrlSchemeHandler::WebViewPageUrlSchemeHandler(QObject *parent) void WebViewPageUrlSchemeHandler::requestStarted(QWebEngineUrlRequestJob *request) { QUrl url = request->requestUrl(); - QString path = url.path().mid(1); + QString path = url.path(0).mid(1); // get undecoded path QStringList parts = path.split("&"); QString server; @@ -159,12 +159,14 @@ void WebViewPageUrlSchemeHandler::requestStarted(QWebEngineUrlRequestJob *reques } } - user = QUrl::fromPercentEncoding(user.toUtf8()); - password = QUrl::fromPercentEncoding(password.toUtf8()); + qCDebug(lcWizardWebiew()) << "Got raw user from request path: " << user; user = user.replace(QChar('+'), QChar(' ')); password = password.replace(QChar('+'), QChar(' ')); + user = QUrl::fromPercentEncoding(user.toUtf8()); + password = QUrl::fromPercentEncoding(password.toUtf8()); + if (!server.startsWith("http://") && !server.startsWith("https://")) { server = "https://" + server; } @@ -203,7 +205,7 @@ bool WebEnginePage::certificateError(const QWebEngineCertificateError &certifica */ QMessageBox messageBox; messageBox.setText(tr("Invalid certificate detected")); - messageBox.setInformativeText(tr("The host \"%1\" provided an invalid certitiface. Continue?").arg(certificateError.url().host())); + messageBox.setInformativeText(tr("The host \"%1\" provided an invalid certificate. Continue?").arg(certificateError.url().host())); messageBox.setIcon(QMessageBox::Warning); messageBox.setStandardButtons(QMessageBox::Yes|QMessageBox::No); messageBox.setDefaultButton(QMessageBox::No); diff --git a/src/gui/wizard/webview.ui b/src/gui/wizard/webview.ui index 9cb513e49..ba3588ca8 100644 --- a/src/gui/wizard/webview.ui +++ b/src/gui/wizard/webview.ui @@ -23,7 +23,7 @@ </size> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QGridLayout" name="gridLayout"> <property name="leftMargin"> diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp index f0d3bc9dc..5c5f23c9e 100644 --- a/src/libsync/clientsideencryption.cpp +++ b/src/libsync/clientsideencryption.cpp @@ -958,6 +958,7 @@ void ClientSideEncryption::encryptPrivateKey() { QStringList list = WordList::getRandomWords(12); _mnemonic = list.join(' '); + _newMnemonicGenerated = true; qCInfo(lcCse()) << "mnemonic Generated:" << _mnemonic; emit mnemonicGenerated(_mnemonic); @@ -989,6 +990,11 @@ void ClientSideEncryption::encryptPrivateKey() job->start(); } +bool ClientSideEncryption::newMnemonicGenerated() const +{ + return _newMnemonicGenerated; +} + void ClientSideEncryption::decryptPrivateKey(const QByteArray &key) { QString msg = tr("Please enter your end to end encryption passphrase:<br>" "<br>" diff --git a/src/libsync/clientsideencryption.h b/src/libsync/clientsideencryption.h index 400260706..05425a26f 100644 --- a/src/libsync/clientsideencryption.h +++ b/src/libsync/clientsideencryption.h @@ -87,6 +87,8 @@ public: void forgetSensitiveData(); + bool newMnemonicGenerated() const; + public slots: void slotRequestMnemonic(); @@ -127,6 +129,7 @@ public: QSslKey _publicKey; QSslCertificate _certificate; QString _mnemonic; + bool _newMnemonicGenerated = false; }; /* Generates the Metadata for the folder */ diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index a2881d4a8..4a71dc9a9 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -37,7 +37,7 @@ #include <QNetworkProxy> #include <QStandardPaths> -#define DEFAULT_REMOTE_POLL_INTERVAL 30000 // default remote poll time in milliseconds +#define DEFAULT_REMOTE_POLL_INTERVAL 5000 // default remote poll time in milliseconds #define DEFAULT_MAX_LOG_LINES 20000 namespace OCC { diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp index 3090bdb30..fbe01331e 100644 --- a/src/libsync/creds/httpcredentials.cpp +++ b/src/libsync/creds/httpcredentials.cpp @@ -173,7 +173,7 @@ void HttpCredentials::fetchFromKeychain() fetchUser(); if (!_ready && !_refreshToken.isEmpty()) { - // This happens if the credentials are still loaded from the keychain, bur we are called + // This happens if the credentials are still loaded from the keychain, but we are called // here because the auth is invalid, so this means we simply need to refresh the credentials refreshAccessToken(); return; diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp index cf59b5ab6..c17889519 100644 --- a/src/libsync/networkjobs.cpp +++ b/src/libsync/networkjobs.cpp @@ -925,6 +925,11 @@ void DetermineAuthTypeJob::checkBothDone() result = WebViewFlow; } + // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic + if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) { + result = LoginFlowV2; + } + qCInfo(lcDetermineAuthTypeJob) << "Auth type for" << _account->davUrl() << "is" << result; emit authType(result); deleteLater(); diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h index c2fefd611..d0829b463 100644 --- a/src/libsync/networkjobs.h +++ b/src/libsync/networkjobs.h @@ -412,7 +412,8 @@ public: Basic, // also the catch-all fallback for backwards compatibility reasons OAuth, Shibboleth, - WebViewFlow + WebViewFlow, + LoginFlowV2 }; explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = nullptr); diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index bf358153e..ac03a1b97 100644 --- a/src/libsync/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -269,6 +269,7 @@ void PropagateItemJob::done(SyncFileItem::Status statusArg, const QString &error case SyncFileItem::FileIgnored: case SyncFileItem::NoStatus: case SyncFileItem::BlacklistedError: + case SyncFileItem::FileLocked: // nothing break; } diff --git a/src/libsync/owncloudpropagator_p.h b/src/libsync/owncloudpropagator_p.h index cb266a80d..90841e537 100644 --- a/src/libsync/owncloudpropagator_p.h +++ b/src/libsync/owncloudpropagator_p.h @@ -93,7 +93,7 @@ inline SyncFileItem::Status classifyError(QNetworkReply::NetworkError nerror, if (anotherSyncNeeded) { *anotherSyncNeeded = true; } - return SyncFileItem::SoftError; + return SyncFileItem::FileLocked; } return SyncFileItem::NormalError; diff --git a/src/libsync/progressdispatcher.cpp b/src/libsync/progressdispatcher.cpp index e17279a53..179d28319 100644 --- a/src/libsync/progressdispatcher.cpp +++ b/src/libsync/progressdispatcher.cpp @@ -91,7 +91,8 @@ bool Progress::isWarningKind(SyncFileItem::Status kind) return kind == SyncFileItem::SoftError || kind == SyncFileItem::NormalError || kind == SyncFileItem::FatalError || kind == SyncFileItem::FileIgnored || kind == SyncFileItem::Conflict || kind == SyncFileItem::Restoration - || kind == SyncFileItem::DetailError || kind == SyncFileItem::BlacklistedError; + || kind == SyncFileItem::DetailError || kind == SyncFileItem::BlacklistedError + || kind == SyncFileItem::FileLocked; } bool Progress::isIgnoredKind(SyncFileItem::Status kind) diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp index 07c7c5f18..da2d88b82 100644 --- a/src/libsync/propagatedownload.cpp +++ b/src/libsync/propagatedownload.cpp @@ -571,6 +571,12 @@ void PropagateDownloadFile::slotGetFinished() qCWarning(lcPropagateDownload) << "server replied 404, assuming file was deleted"; } + // Getting a 423 means that the file is locked + const bool fileLocked = _item->_httpErrorCode == 423; + if (fileLocked) { + qCWarning(lcPropagateDownload) << "server replied 423, file is Locked"; + } + // Don't keep the temporary file if it is empty or we // used a bad range header or the file's not on the server anymore. if (_tmpFile.size() == 0 || badRangeHeader || fileNotFound) { diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h index 8dfd98d6f..a1b4f8666 100644 --- a/src/libsync/propagateupload.h +++ b/src/libsync/propagateupload.h @@ -92,19 +92,19 @@ private: public: // Takes ownership of the device - explicit PUTFileJob(AccountPtr account, const QString &path, QIODevice *device, + explicit PUTFileJob(AccountPtr account, const QString &path, std::unique_ptr<QIODevice> device, const QMap<QByteArray, QByteArray> &headers, int chunk, QObject *parent = nullptr) : AbstractNetworkJob(account, path, parent) - , _device(device) + , _device(device.release()) , _headers(headers) , _chunk(chunk) { _device->setParent(this); } - explicit PUTFileJob(AccountPtr account, const QUrl &url, QIODevice *device, + explicit PUTFileJob(AccountPtr account, const QUrl &url, std::unique_ptr<QIODevice> device, const QMap<QByteArray, QByteArray> &headers, int chunk, QObject *parent = nullptr) : AbstractNetworkJob(account, QString(), parent) - , _device(device) + , _device(device.release()) , _headers(headers) , _url(url) , _chunk(chunk) diff --git a/src/libsync/propagateuploadng.cpp b/src/libsync/propagateuploadng.cpp index 49728a781..7dae923cb 100644 --- a/src/libsync/propagateuploadng.cpp +++ b/src/libsync/propagateuploadng.cpp @@ -305,7 +305,7 @@ void PropagateUploadFileNG::startNextChunk() return; } - auto device = new UploadDevice(&propagator()->_bandwidthManager); + auto device = std::make_unique<UploadDevice>(&propagator()->_bandwidthManager); const QString fileName = _fileToUpload._path; if (!device->prepareAndOpen(fileName, _sent, _currentChunkSize)) { @@ -328,13 +328,14 @@ void PropagateUploadFileNG::startNextChunk() QUrl url = chunkUrl(_currentChunk); // job takes ownership of device via a QScopedPointer. Job deletes itself when finishing - PUTFileJob *job = new PUTFileJob(propagator()->account(), url, device, headers, _currentChunk, this); + auto devicePtr = device.get(); // for connections later + PUTFileJob *job = new PUTFileJob(propagator()->account(), url, std::move(device), headers, _currentChunk, this); _jobs.append(job); connect(job, &PUTFileJob::finishedSignal, this, &PropagateUploadFileNG::slotPutFinished); connect(job, &PUTFileJob::uploadProgress, this, &PropagateUploadFileNG::slotUploadProgress); connect(job, &PUTFileJob::uploadProgress, - device, &UploadDevice::slotJobUploadProgress); + devicePtr, &UploadDevice::slotJobUploadProgress); connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed); job->start(); propagator()->_activeJobList.append(this); diff --git a/src/libsync/propagateuploadv1.cpp b/src/libsync/propagateuploadv1.cpp index bcd31761c..104fa9d75 100644 --- a/src/libsync/propagateuploadv1.cpp +++ b/src/libsync/propagateuploadv1.cpp @@ -89,7 +89,7 @@ void PropagateUploadFileV1::startNextChunk() QString path = _fileToUpload._file; - UploadDevice *device = new UploadDevice(&propagator()->_bandwidthManager); + auto device = std::make_unique<UploadDevice>(&propagator()->_bandwidthManager); qint64 chunkStart = 0; qint64 currentChunkSize = fileSize; bool isFinalChunk = false; @@ -134,16 +134,16 @@ void PropagateUploadFileV1::startNextChunk() } // Soft error because this is likely caused by the user modifying his files while syncing abortWithError(SyncFileItem::SoftError, device->errorString()); - delete device; return; } // job takes ownership of device via a QScopedPointer. Job deletes itself when finishing - PUTFileJob *job = new PUTFileJob(propagator()->account(), propagator()->_remoteFolder + path, device, headers, _currentChunk, this); + auto devicePtr = device.get(); // for connections later + PUTFileJob *job = new PUTFileJob(propagator()->account(), propagator()->_remoteFolder + path, std::move(device), headers, _currentChunk, this); _jobs.append(job); connect(job, &PUTFileJob::finishedSignal, this, &PropagateUploadFileV1::slotPutFinished); connect(job, &PUTFileJob::uploadProgress, this, &PropagateUploadFileV1::slotUploadProgress); - connect(job, &PUTFileJob::uploadProgress, device, &UploadDevice::slotJobUploadProgress); + connect(job, &PUTFileJob::uploadProgress, devicePtr, &UploadDevice::slotJobUploadProgress); connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed); if (isFinalChunk) adjustLastJobTimeout(job, fileSize); diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index d9c240a93..3e2624a21 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -91,7 +91,7 @@ SyncEngine::SyncEngine(AccountPtr account, const QString &localPath, _csync_ctx.reset(new CSYNC(localPath.toUtf8().data(), journal)); - _excludedFiles.reset(new ExcludedFiles); + _excludedFiles.reset(new ExcludedFiles(localPath)); _csync_ctx->exclude_traversal_fn = _excludedFiles->csyncTraversalMatchFun(); _syncFileStatusTracker.reset(new SyncFileStatusTracker(this)); diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h index 461627ba3..e054ab83a 100644 --- a/src/libsync/syncfileitem.h +++ b/src/libsync/syncfileitem.h @@ -59,6 +59,7 @@ public: Conflict, FileIgnored, ///< The file is in the ignored list (or blacklisted with no retries left) + FileLocked, ///< The file is locked Restoration, ///< The file was restored because what should have been done was not allowed /** For errors that should only appear in the error view. diff --git a/src/libsync/syncfilestatustracker.cpp b/src/libsync/syncfilestatustracker.cpp index 6dc2514ff..c492b34d5 100644 --- a/src/libsync/syncfilestatustracker.cpp +++ b/src/libsync/syncfilestatustracker.cpp @@ -105,7 +105,8 @@ static inline bool showWarningInSocketApi(const SyncFileItem &item) return item._instruction == CSYNC_INSTRUCTION_IGNORE || status == SyncFileItem::FileIgnored || status == SyncFileItem::Conflict - || status == SyncFileItem::Restoration; + || status == SyncFileItem::Restoration + || status == SyncFileItem::FileLocked; } SyncFileStatusTracker::SyncFileStatusTracker(SyncEngine *syncEngine) diff --git a/src/libsync/syncresult.cpp b/src/libsync/syncresult.cpp index 8550b4628..a3481c74f 100644 --- a/src/libsync/syncresult.cpp +++ b/src/libsync/syncresult.cpp @@ -28,6 +28,7 @@ SyncResult::SyncResult() , _numNewConflictItems(0) , _numOldConflictItems(0) , _numErrorItems(0) + , _numLockedItems(0) { } @@ -139,6 +140,13 @@ void SyncResult::processCompletedItem(const SyncFileItemPtr &item) _folderStructureWasChanged = true; } + if(item->_status == SyncFileItem::FileLocked){ + _numLockedItems++; + if (!_firstItemLocked) { + _firstItemLocked = item; + } + } + // Process the item to the gui if (item->_status == SyncFileItem::FatalError || item->_status == SyncFileItem::NormalError) { //: this displays an error string (%2) for a file %1 diff --git a/src/libsync/syncresult.h b/src/libsync/syncresult.h index 6c484ee4d..1a0c680ca 100644 --- a/src/libsync/syncresult.h +++ b/src/libsync/syncresult.h @@ -72,12 +72,16 @@ public: int numErrorItems() const { return _numErrorItems; } bool hasUnresolvedConflicts() const { return _numNewConflictItems + _numOldConflictItems > 0; } + int numLockedItems() const { return _numLockedItems; } + bool hasLockedFiles() const { return _numLockedItems > 0; } + const SyncFileItemPtr &firstItemNew() const { return _firstItemNew; } const SyncFileItemPtr &firstItemDeleted() const { return _firstItemDeleted; } const SyncFileItemPtr &firstItemUpdated() const { return _firstItemUpdated; } const SyncFileItemPtr &firstItemRenamed() const { return _firstItemRenamed; } const SyncFileItemPtr &firstNewConflictItem() const { return _firstNewConflictItem; } const SyncFileItemPtr &firstItemError() const { return _firstItemError; } + const SyncFileItemPtr &firstItemLocked() const { return _firstItemLocked; } void processCompletedItem(const SyncFileItemPtr &item); @@ -101,6 +105,7 @@ private: int _numNewConflictItems; int _numOldConflictItems; int _numErrorItems; + int _numLockedItems; SyncFileItemPtr _firstItemNew; SyncFileItemPtr _firstItemDeleted; @@ -108,6 +113,7 @@ private: SyncFileItemPtr _firstItemRenamed; SyncFileItemPtr _firstNewConflictItem; SyncFileItemPtr _firstItemError; + SyncFileItemPtr _firstItemLocked; }; } diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index f68b61e2e..ed2964729 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -341,10 +341,9 @@ QString Theme::gitSHA1() const QString Theme::about() const { QString devString; - devString = tr("<p>Version %1. For more information please visit <a href='%2'>%3</a>.</p>") + devString = tr("<p>Version %1. For more information please click <a href='%2'>here</a>.</p>") .arg(MIRALL_VERSION_STRING) - .arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN)) - .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)); + .arg(helpUrl()); devString += tr("<p>This release was supplied by %1</p>") .arg(APPLICATION_VENDOR); diff --git a/sync-exclude.lst b/sync-exclude.lst index fe5cbee10..129c8d8af 100644 --- a/sync-exclude.lst +++ b/sync-exclude.lst @@ -40,3 +40,5 @@ System Volume Information .nfs* My Saved Places. + +\#*# diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index bb184412b..fc7e8ef0a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories(${CMAKE_SOURCE_DIR}/src ${SQLITE3_INCLUDE_DIR} ) -include(owncloud_add_test.cmake) +include(nextcloud_add_test.cmake) -owncloud_add_test(OwncloudPropagator "") -owncloud_add_test(Updater "") +nextcloud_add_test(NextcloudPropagator "") +nextcloud_add_test(Updater "") SET(FolderWatcher_SRC ../src/gui/folderwatcher.cpp) @@ -29,33 +29,33 @@ IF( APPLE ) list(APPEND FolderWatcher_SRC ../src/gui/folderwatcher_mac.cpp) list(APPEND FolderWatcher_SRC ../src/gui/socketapisocket_mac.mm) ENDIF() -owncloud_add_test(NetrcParser ../src/cmd/netrcparser.cpp) -owncloud_add_test(OwnSql "") -owncloud_add_test(SyncJournalDB "") -owncloud_add_test(SyncFileItem "") -owncloud_add_test(ConcatUrl "") -owncloud_add_test(XmlParse "") -owncloud_add_test(ChecksumValidator "") +nextcloud_add_test(NetrcParser ../src/cmd/netrcparser.cpp) +nextcloud_add_test(OwnSql "") +nextcloud_add_test(SyncJournalDB "") +nextcloud_add_test(SyncFileItem "") +nextcloud_add_test(ConcatUrl "") +nextcloud_add_test(XmlParse "") +nextcloud_add_test(ChecksumValidator "") -owncloud_add_test(ExcludedFiles "") +nextcloud_add_test(ExcludedFiles "") -owncloud_add_test(FileSystem "") -owncloud_add_test(Utility "") -owncloud_add_test(SyncEngine "syncenginetestutils.h") -owncloud_add_test(SyncMove "syncenginetestutils.h") -owncloud_add_test(SyncConflict "syncenginetestutils.h") -owncloud_add_test(SyncFileStatusTracker "syncenginetestutils.h") -owncloud_add_test(ChunkingNg "syncenginetestutils.h") -owncloud_add_test(UploadReset "syncenginetestutils.h") -owncloud_add_test(AllFilesDeleted "syncenginetestutils.h") -owncloud_add_test(Blacklist "syncenginetestutils.h") -owncloud_add_test(FolderWatcher "${FolderWatcher_SRC}") +nextcloud_add_test(FileSystem "") +nextcloud_add_test(Utility "") +nextcloud_add_test(SyncEngine "syncenginetestutils.h") +nextcloud_add_test(SyncMove "syncenginetestutils.h") +nextcloud_add_test(SyncConflict "syncenginetestutils.h") +nextcloud_add_test(SyncFileStatusTracker "syncenginetestutils.h") +nextcloud_add_test(ChunkingNg "syncenginetestutils.h") +nextcloud_add_test(UploadReset "syncenginetestutils.h") +nextcloud_add_test(AllFilesDeleted "syncenginetestutils.h") +nextcloud_add_test(Blacklist "syncenginetestutils.h") +nextcloud_add_test(FolderWatcher "${FolderWatcher_SRC}") if( UNIX AND NOT APPLE ) - owncloud_add_test(InotifyWatcher "${FolderWatcher_SRC}") + nextcloud_add_test(InotifyWatcher "${FolderWatcher_SRC}") endif(UNIX AND NOT APPLE) -owncloud_add_benchmark(LargeSync "syncenginetestutils.h") +nextcloud_add_benchmark(LargeSync "syncenginetestutils.h") SET(FolderMan_SRC ../src/gui/folderman.cpp) list(APPEND FolderMan_SRC ../src/gui/folder.cpp ) @@ -69,9 +69,9 @@ list(APPEND FolderMan_SRC ../src/gui/connectionvalidator.cpp ) list(APPEND FolderMan_SRC ../src/gui/clientproxy.cpp ) list(APPEND FolderMan_SRC ${FolderWatcher_SRC}) list(APPEND FolderMan_SRC stub.cpp ) -owncloud_add_test(FolderMan "${FolderMan_SRC}") +nextcloud_add_test(FolderMan "${FolderMan_SRC}") -owncloud_add_test(OAuth "syncenginetestutils.h;../src/gui/creds/oauth.cpp") +nextcloud_add_test(OAuth "syncenginetestutils.h;../src/gui/creds/oauth.cpp") configure_file(test_journal.db "${PROJECT_BINARY_DIR}/bin/test_journal.db" COPYONLY) diff --git a/test/csync/csync_tests/check_csync_exclude.cpp b/test/csync/csync_tests/check_csync_exclude.cpp index 95b6e9a31..07ec665a8 100644 --- a/test/csync/csync_tests/check_csync_exclude.cpp +++ b/test/csync/csync_tests/check_csync_exclude.cpp @@ -21,6 +21,7 @@ #include <string.h> #include <time.h> #include <sys/time.h> +#include <stdio.h> #define CSYNC_TEST 1 #include "csync_exclude.cpp" @@ -115,16 +116,32 @@ static void check_csync_exclude_add(void **) excludedFiles->addManualExclude("/tmp/check_csync1/*"); assert_int_equal(check_file_full("/tmp/check_csync1/foo"), CSYNC_FILE_EXCLUDE_LIST); assert_int_equal(check_file_full("/tmp/check_csync2/foo"), CSYNC_NOT_EXCLUDED); - assert_true(excludedFiles->_allExcludes.contains("/tmp/check_csync1/*")); + assert_true(excludedFiles->_allExcludes["/"].contains("/tmp/check_csync1/*")); - assert_true(excludedFiles->_fullRegexFile.pattern().contains("csync1")); - assert_true(excludedFiles->_fullTraversalRegexFile.pattern().contains("csync1")); - assert_false(excludedFiles->_bnameTraversalRegexFile.pattern().contains("csync1")); + assert_true(excludedFiles->_fullRegexFile["/"].pattern().contains("csync1")); + assert_true(excludedFiles->_fullTraversalRegexFile["/"].pattern().contains("csync1")); + assert_false(excludedFiles->_bnameTraversalRegexFile["/"].pattern().contains("csync1")); excludedFiles->addManualExclude("foo"); - assert_true(excludedFiles->_bnameTraversalRegexFile.pattern().contains("foo")); - assert_true(excludedFiles->_fullRegexFile.pattern().contains("foo")); - assert_false(excludedFiles->_fullTraversalRegexFile.pattern().contains("foo")); + assert_true(excludedFiles->_bnameTraversalRegexFile["/"].pattern().contains("foo")); + assert_true(excludedFiles->_fullRegexFile["/"].pattern().contains("foo")); + assert_false(excludedFiles->_fullTraversalRegexFile["/"].pattern().contains("foo")); +} + +static void check_csync_exclude_add_per_dir(void **) +{ + excludedFiles->addManualExclude("*", "/tmp/check_csync1/"); + assert_int_equal(check_file_full("/tmp/check_csync1/foo"), CSYNC_FILE_EXCLUDE_LIST); + assert_int_equal(check_file_full("/tmp/check_csync2/foo"), CSYNC_NOT_EXCLUDED); + assert_true(excludedFiles->_allExcludes["/tmp/check_csync1/"].contains("*")); + + excludedFiles->addManualExclude("foo"); + assert_true(excludedFiles->_fullRegexFile["/"].pattern().contains("foo")); + + excludedFiles->addManualExclude("foo/bar", "/tmp/check_csync1/"); + assert_true(excludedFiles->_fullRegexFile["/tmp/check_csync1/"].pattern().contains("bar")); + assert_true(excludedFiles->_fullTraversalRegexFile["/tmp/check_csync1/"].pattern().contains("bar")); + assert_false(excludedFiles->_bnameTraversalRegexFile["/tmp/check_csync1/"].pattern().contains("foo")); } static void check_csync_excluded(void **) @@ -232,6 +249,58 @@ static void check_csync_excluded(void **) assert_int_equal(check_file_full("c [d]"), CSYNC_FILE_EXCLUDE_LIST); } +static void check_csync_excluded_per_dir(void **) +{ + excludedFiles->addManualExclude("A"); + excludedFiles->reloadExcludeFiles(); + + assert_int_equal(check_file_full("A"), CSYNC_FILE_EXCLUDE_LIST); + + excludedFiles->clearManualExcludes(); + excludedFiles->addManualExclude("A", "/B/"); + excludedFiles->reloadExcludeFiles(); + + assert_int_equal(check_file_full("A"), CSYNC_NOT_EXCLUDED); + assert_int_equal(check_file_full("B/A"), CSYNC_FILE_EXCLUDE_LIST); + + excludedFiles->clearManualExcludes(); + excludedFiles->addManualExclude("A/a1", "/B/"); + excludedFiles->reloadExcludeFiles(); + + assert_int_equal(check_file_full("A"), CSYNC_NOT_EXCLUDED); + assert_int_equal(check_file_full("B/A/a1"), CSYNC_FILE_EXCLUDE_LIST); + +#define FOO_DIR "/tmp/check_csync1/foo" +#define FOO_EXCLUDE_LIST FOO_DIR "/.sync-exclude.lst" + int rc; + rc = system("mkdir -p " FOO_DIR); + assert_int_equal(rc, 0); + FILE *fh = fopen(FOO_EXCLUDE_LIST, "w"); + assert_non_null(fh); + rc = fprintf(fh, "bar"); + assert_int_not_equal(rc, 0); + rc = fclose(fh); + assert_int_equal(rc, 0); + + excludedFiles->addInTreeExcludeFilePath(FOO_EXCLUDE_LIST); + excludedFiles->reloadExcludeFiles(); + assert_int_equal(check_file_full(FOO_DIR), CSYNC_NOT_EXCLUDED); + assert_int_equal(check_file_full(FOO_DIR "/bar"), CSYNC_FILE_EXCLUDE_LIST); + assert_int_equal(check_file_full(FOO_DIR "/baz"), CSYNC_NOT_EXCLUDED); +#undef FOO_DIR +#undef FOO_EXCLUDE_LIST +} + +static void check_csync_excluded_traversal_per_dir(void **) +{ + assert_int_equal(check_file_traversal("/"), CSYNC_NOT_EXCLUDED); + + /* path wildcards */ + excludedFiles->addManualExclude("*/*.tex.tmp", "/latex/"); + assert_int_equal(check_file_traversal("latex/my_manuscript.tex.tmp"), CSYNC_NOT_EXCLUDED); + assert_int_equal(check_file_traversal("latex/songbook/my_manuscript.tex.tmp"), CSYNC_FILE_EXCLUDE_LIST); +} + static void check_csync_excluded_traversal(void **) { assert_int_equal(check_file_traversal(""), CSYNC_NOT_EXCLUDED); @@ -633,8 +702,11 @@ int torture_run_tests(void) const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(T::check_csync_exclude_add, T::setup, T::teardown), + cmocka_unit_test_setup_teardown(T::check_csync_exclude_add_per_dir, T::setup, T::teardown), cmocka_unit_test_setup_teardown(T::check_csync_excluded, T::setup_init, T::teardown), + cmocka_unit_test_setup_teardown(T::check_csync_excluded_per_dir, T::setup, T::teardown), cmocka_unit_test_setup_teardown(T::check_csync_excluded_traversal, T::setup_init, T::teardown), + cmocka_unit_test_setup_teardown(T::check_csync_excluded_traversal_per_dir, T::setup, T::teardown), cmocka_unit_test_setup_teardown(T::check_csync_dir_only, T::setup, T::teardown), cmocka_unit_test_setup_teardown(T::check_csync_pathes, T::setup_init, T::teardown), cmocka_unit_test_setup_teardown(T::check_csync_wildcards, T::setup, T::teardown), diff --git a/test/owncloud_add_test.cmake b/test/nextcloud_add_test.cmake index ee2cfd200..f65687b84 100644 --- a/test/owncloud_add_test.cmake +++ b/test/nextcloud_add_test.cmake @@ -1,6 +1,6 @@ find_package(Qt5 COMPONENTS Core Test Xml Network REQUIRED) -macro(owncloud_add_test test_class additional_cpp) +macro(nextcloud_add_test test_class additional_cpp) set(CMAKE_AUTOMOC TRUE) set(OWNCLOUD_TEST_CLASS ${test_class}) string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE) @@ -19,7 +19,7 @@ macro(owncloud_add_test test_class additional_cpp) add_test(NAME ${OWNCLOUD_TEST_CLASS}Test COMMAND ${OWNCLOUD_TEST_CLASS}Test) endmacro() -macro(owncloud_add_benchmark test_class additional_cpp) +macro(nextcloud_add_benchmark test_class additional_cpp) set(CMAKE_AUTOMOC TRUE) set(OWNCLOUD_TEST_CLASS ${test_class}) string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE) diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp index 11d0a3282..ea68440ad 100644 --- a/test/testexcludedfiles.cpp +++ b/test/testexcludedfiles.cpp @@ -39,6 +39,8 @@ private slots: QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "/a", keepHidden)); QVERIFY(excluded.isExcluded("/a/foo (conflicted copy bar)", "/a", keepHidden)); QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden)); + + QVERIFY(excluded.isExcluded("/a/#b#", "/a", keepHidden)); } }; diff --git a/test/testfolderwatcher.cpp b/test/testfolderwatcher.cpp index d90856828..fdd97701d 100644 --- a/test/testfolderwatcher.cpp +++ b/test/testfolderwatcher.cpp @@ -140,6 +140,17 @@ private slots: QVERIFY(waitForPathChanged(file)); } + void testMove3LevelDirWithFile() { + QString file(_rootPath + "/a0/b/c/empty.txt"); + mkdir(_rootPath + "/a0"); + mkdir(_rootPath + "/a0/b"); + mkdir(_rootPath + "/a0/b/c"); + touch(file); + mv(_rootPath + "/a0 ", _rootPath + "/a"); + QVERIFY(waitForPathChanged(_rootPath + "/a/b/c/empty.txt")); + } + + void testCreateADir() { QString file(_rootPath+"/a1/b1/new_dir"); mkdir(file); diff --git a/test/testowncloudpropagator.cpp b/test/testnextcloudpropagator.cpp index cd8f431a9..dc2e476ad 100644 --- a/test/testowncloudpropagator.cpp +++ b/test/testnextcloudpropagator.cpp @@ -15,14 +15,14 @@ namespace OCC { QString OWNCLOUDSYNC_EXPORT createDownloadTmpFileName(const QString &previous); } -class TestOwncloudPropagator : public QObject +class TestNextcloudPropagator : public QObject { Q_OBJECT private slots: void testUpdateErrorFromSession() { -// OwncloudPropagator propagator( NULL, QLatin1String("test1"), QLatin1String("test2"), new ProgressDatabase); +// NextcloudPropagator propagator( NULL, QLatin1String("test1"), QLatin1String("test2"), new ProgressDatabase); QVERIFY( true ); } @@ -78,5 +78,5 @@ private slots: } }; -QTEST_APPLESS_MAIN(TestOwncloudPropagator) -#include "testowncloudpropagator.moc" +QTEST_APPLESS_MAIN(TestNextcloudPropagator) +#include "testnextcloudpropagator.moc" @@ -1,12 +1,14 @@ <RCC> <qresource prefix="/client"> - <file alias="theme/colored/Nextcloud-icon-512.png">theme/colored/512-Nextcloud-icon.png</file> - <file alias="theme/colored/Nextcloud-icon-256.png">theme/colored/256-Nextcloud-icon.png</file> - <file alias="theme/colored/Nextcloud-icon-128.png">theme/colored/128-Nextcloud-icon.png</file> - <file alias="theme/colored/Nextcloud-icon-22.png">theme/colored/22-Nextcloud-icon.png</file> + <file alias="theme/colored/Nextcloud-icon-16.png">theme/colored/16-Nextcloud-icon.png</file> + <file alias="theme/colored/Nextcloud-icon-24.png">theme/colored/24-Nextcloud-icon.png</file> <file alias="theme/colored/Nextcloud-icon-32.png">theme/colored/32-Nextcloud-icon.png</file> <file alias="theme/colored/Nextcloud-icon-48.png">theme/colored/48-Nextcloud-icon.png</file> <file alias="theme/colored/Nextcloud-icon-64.png">theme/colored/64-Nextcloud-icon.png</file> + <file alias="theme/colored/Nextcloud-icon-128.png">theme/colored/128-Nextcloud-icon.png</file> + <file alias="theme/colored/Nextcloud-icon-256.png">theme/colored/256-Nextcloud-icon.png</file> + <file alias="theme/colored/Nextcloud-icon-512.png">theme/colored/512-Nextcloud-icon.png</file> + <file alias="theme/colored/Nextcloud-icon-1024.png">theme/colored/1024-Nextcloud-icon.png</file> <file>theme/colored/state-error-32.png</file> <file>theme/colored/state-error-64.png</file> <file>theme/colored/state-error-128.png</file> diff --git a/theme/colored/1024-Nextcloud-icon.png b/theme/colored/1024-Nextcloud-icon.png Binary files differindex b8c89ee03..e6bea6dbb 100644 --- a/theme/colored/1024-Nextcloud-icon.png +++ b/theme/colored/1024-Nextcloud-icon.png diff --git a/theme/colored/128-Nextcloud-icon.png b/theme/colored/128-Nextcloud-icon.png Binary files differindex c97f36807..78c88f5f6 100644 --- a/theme/colored/128-Nextcloud-icon.png +++ b/theme/colored/128-Nextcloud-icon.png diff --git a/theme/colored/128-Nextcloud-sidebar.png b/theme/colored/128-Nextcloud-sidebar.png Binary files differnew file mode 100644 index 000000000..4ca9fae9b --- /dev/null +++ b/theme/colored/128-Nextcloud-sidebar.png diff --git a/theme/colored/150-Nextcloud-w10startmenu.png b/theme/colored/150-Nextcloud-w10startmenu.png Binary files differnew file mode 100644 index 000000000..30dcfbef6 --- /dev/null +++ b/theme/colored/150-Nextcloud-w10startmenu.png diff --git a/theme/colored/16-Nextcloud-icon.png b/theme/colored/16-Nextcloud-icon.png Binary files differindex 36bcce79c..8a52d672b 100644 --- a/theme/colored/16-Nextcloud-icon.png +++ b/theme/colored/16-Nextcloud-icon.png diff --git a/theme/colored/16-Nextcloud-sidebar.png b/theme/colored/16-Nextcloud-sidebar.png Binary files differindex 36bcce79c..4bcc1a54f 100644 --- a/theme/colored/16-Nextcloud-sidebar.png +++ b/theme/colored/16-Nextcloud-sidebar.png diff --git a/theme/colored/18-Nextcloud-sidebar.png b/theme/colored/18-Nextcloud-sidebar.png Binary files differdeleted file mode 100644 index 017f0204a..000000000 --- a/theme/colored/18-Nextcloud-sidebar.png +++ /dev/null diff --git a/theme/colored/22-Nextcloud-icon.png b/theme/colored/22-Nextcloud-icon.png Binary files differdeleted file mode 100644 index d12e6826e..000000000 --- a/theme/colored/22-Nextcloud-icon.png +++ /dev/null diff --git a/theme/colored/24-Nextcloud-icon.png b/theme/colored/24-Nextcloud-icon.png Binary files differnew file mode 100644 index 000000000..826e15b25 --- /dev/null +++ b/theme/colored/24-Nextcloud-icon.png diff --git a/theme/colored/256-Nextcloud-icon.png b/theme/colored/256-Nextcloud-icon.png Binary files differindex 11b0833ca..a83201edd 100644 --- a/theme/colored/256-Nextcloud-icon.png +++ b/theme/colored/256-Nextcloud-icon.png diff --git a/theme/colored/256-Nextcloud-sidebar.png b/theme/colored/256-Nextcloud-sidebar.png Binary files differnew file mode 100644 index 000000000..19da6fe9d --- /dev/null +++ b/theme/colored/256-Nextcloud-sidebar.png diff --git a/theme/colored/32-Nextcloud-icon.png b/theme/colored/32-Nextcloud-icon.png Binary files differindex 052da904e..bdf479dbf 100644 --- a/theme/colored/32-Nextcloud-icon.png +++ b/theme/colored/32-Nextcloud-icon.png diff --git a/theme/colored/32-Nextcloud-sidebar.png b/theme/colored/32-Nextcloud-sidebar.png Binary files differindex 052da904e..e49a15c83 100644 --- a/theme/colored/32-Nextcloud-sidebar.png +++ b/theme/colored/32-Nextcloud-sidebar.png diff --git a/theme/colored/36-Nextcloud-sidebar.png b/theme/colored/36-Nextcloud-sidebar.png Binary files differdeleted file mode 100644 index 2fccf344b..000000000 --- a/theme/colored/36-Nextcloud-sidebar.png +++ /dev/null diff --git a/theme/colored/48-Nextcloud-icon.png b/theme/colored/48-Nextcloud-icon.png Binary files differindex a1a9625f9..0ae67b48e 100644 --- a/theme/colored/48-Nextcloud-icon.png +++ b/theme/colored/48-Nextcloud-icon.png diff --git a/theme/colored/512-Nextcloud-icon.png b/theme/colored/512-Nextcloud-icon.png Binary files differindex 9f40c76cf..d5936039c 100644 --- a/theme/colored/512-Nextcloud-icon.png +++ b/theme/colored/512-Nextcloud-icon.png diff --git a/theme/colored/64-Nextcloud-icon.png b/theme/colored/64-Nextcloud-icon.png Binary files differindex f11f36320..32be410ef 100644 --- a/theme/colored/64-Nextcloud-icon.png +++ b/theme/colored/64-Nextcloud-icon.png diff --git a/theme/colored/64-Nextcloud-sidebar.png b/theme/colored/64-Nextcloud-sidebar.png Binary files differindex f11f36320..bd1adb490 100644 --- a/theme/colored/64-Nextcloud-sidebar.png +++ b/theme/colored/64-Nextcloud-sidebar.png diff --git a/theme/colored/70-Nextcloud-w10startmenu.png b/theme/colored/70-Nextcloud-w10startmenu.png Binary files differnew file mode 100644 index 000000000..56e30cdca --- /dev/null +++ b/theme/colored/70-Nextcloud-w10startmenu.png diff --git a/theme/colored/Nextcloud-icon.svg b/theme/colored/Nextcloud-icon.svg index bf7753aa3..24ecc907a 100644 --- a/theme/colored/Nextcloud-icon.svg +++ b/theme/colored/Nextcloud-icon.svg @@ -1,70 +1 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - enable-background="new 0 0 595.275 311.111" - xml:space="preserve" - height="1024" - width="1024" - version="1.1" - y="0px" - x="0px" - viewBox="0 0 1024 1023.9999" - id="svg2" - inkscape:version="0.91 r13725" - sodipodi:docname="nextcloud-icon.svg" - inkscape:export-filename="nextcloud-icon-512.png" - inkscape:export-xdpi="45" - inkscape:export-ydpi="45"><metadata - id="metadata12"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs10"><clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath4145"><rect - ry="128" - rx="128" - style="fill:#0082c9" - id="rect4147" - x="0" - y="-1.9073486e-06" - width="1024" - height="1024" /></clipPath></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="640" - inkscape:window-height="480" - id="namedview8" - showgrid="false" - inkscape:zoom="0.32" - inkscape:cx="-225.44227" - inkscape:cy="284.0991" - inkscape:current-layer="svg2" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" /><image - width="2400" - height="1600" - preserveAspectRatio="none" - xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIf IiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9Pjv/2wBDAQoLCw4NDhwQEBw7KCIoOzs7Ozs7 Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozv/wgARCAUAB4ADAREA AhEBAxEB/8QAGQABAQEBAQEAAAAAAAAAAAAAAAECAwQF/8QAGQEBAQEBAQEAAAAAAAAAAAAAAAEC AwQF/9oADAMBAAIQAxAAAAHw/V+IAALQAEKAQoAAAAAAAAQAAFIAAAAALQEi0AJFoBCgAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABItCQAAAAAAAAAAAAUhQAAAAAAAAAJAFq RaEgAWpAAAAAAAVQAAAAAAAAAAAEBSAAAAAAAAC0AAJFoAIUAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAEKAAAAAkAAAAAAAAAAAAFICghQAAAAAAAAAJAVSRakAAKQAAAAAAAALUKAA AAAAAAAhSAAAAAAAAC0AAEKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ qQAAAAAAAAAAAAAUAAAAAAAAAAAASAFUAkAAAAAQpCgCkAAC0AAAAACFAAAABAAAAAAAABaAAAAQ oAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACRakAAAAAAAAAAAAAAFAAAAAAAh QAASAFIAAAAAAAAAEAKAAAC1ItAAAAAAAAAAEAKQAAAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAhQAACIAAAAAAAAAAAFIAACgAAAhQAAAAABIAFqQpFoSAALUgAAAACFBCk KABSABaAAAAAAAAAAAIAAAAAAAAAKQtSLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAkC0ABIAAAAAAAABQAAAAAAAAIUAAEhSLUi1ItSBakWoItCQAAAAAAAAABAUAAAAtQoAAAAAAA QoAABAAAAAAAAAABaAAAAAAAAAACFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABChIAAFoSLUgAAAAA FAAIAUEKACRaQoAABItASAApAFoCQAALQkAAAAAAAAAAQpACgAAAFqQLQAAAAAAAAIUgAAAAAAAA FIC1ItACRaAAAAAAAAAAAAAAAAAAAAAAAAAAACFAAAAAAAABChItCQAAAAAAAAAAUAAAhSFAEBQA QpCgkWhIFoACQABaEi0JFoSLUgWhIAAAAKQQoBCkKCAoAAAFIVQAAAAAAAAAEKQAAAAAAAAAAAAA WpFqQBakWhItAAASLQkWgAAAAAAAAAAAAAAAAAAAhQAEgC1IAAAAAAAAAAAAKAQFAAAAhQAAAAAA ASBahQCQpAAAVQCRakC1IAAAAAAAAEAKACFAAFIUgBSLQAAAAAAAhQEKAQAAAAAAAAAAAAAAAAAA AAAAAAAWgAAAAAAAAAAAAhQEi0AAJAAAAAAAAAAAAAABSFIUhQAAAAAAAAAAAAAABIFoACQAALQE gAAAAAAAAAAAAAAAAAAAAAAKQLQAAAAAAAAAABCghQAQAAAAAAAAAAAAAAAAAAAC0AAAAAAAAAAA AEKkAAAAAAAAAAAAAAAAFIUgKAAAAAAAAAAAAAJFoASABaAAEhSLUgC1IAtSAAAAAAAAAAAAAAAI UEKAAAAAAKAQAFIFoAAAAAhQAAAAQAAAAAAAAAAAAAWpAAAAAtAABCgAAAAAAiAAAAAAAAAAAAAA KQFIUAAAEKAACFAhQAAAAAAAAAAAAAAAAASAFUEKAAACQAAAAAAAAAAAAICrEApCgAAAAAAAAAtS LQAAAAAAICgAAgAAAAAAAAAAAAAAAAAAAAtBCgAhQAkAAAAAAAAAAAAoIUhSAoAAAAAAAEKQoAAA AAAAAAAAAAAAAAAAAAAAAAAABCgAAAAkC1CghSAoAMwAAAKAQpCgAAAAUEABSBaEi0AIUAAABAAA AAAAAAAAAAAACkAAAAAAAAAFqQAAAAAAAACgAhQAAAAAAAAAAAAAAIUAAAAAAhQAAAAAAAAAAAQo AAAAAAAAAABACghQAAAAACFMwUhSAAAAAAUAAAAUEC0BItAAAAAAAAEKQoAAIUEAKCAoAAAIUAhQ CAAAAAAAAAAAAAAAFAIUAAAEKAAAQoAAAAAAAAAAAAAhQAACFAAAAAAAAAAAAACFABACkKQAoAIC gAhQAAAAAMygAgBSAAAUAAAAtAAAAAAAAAAAAAAQFAAAAAAAAAAAAAAQpCggAAAAAAAAAAAAABQA AAAAAIUAAAAAAAAAAAAAAAAAAIUAAAAhQCFAAAAABCgEBSFIUAAAAAAEKQoAAAAAEBTMoBCkFWIA AKAAABSBahQAAQQAAFIAFqCFIUAEAKRakWgAAAAAAAAIUAAABAAAAAAAAAAUAEAKAAACFAgKAAhQ AAAACFABAUEKQFBCgAAAAAAAEBSApAAUhSFICkAKQFIAUAAhQAAAAIUAAAEKACRazKCFIUAEAAoA AApAAAAUhSAAAAAAAAAAAApCkWhBAtCRaEhVJFoAACFAQoAIUhSAAAAAAApAUhSFAAAAAABCgAAA AhSAAAAAAAAAAAAoAIAAAAAAAAKQFIAAAAAAFAAAAAAAAAAAAAAAAkCKAAAACACgACkAAAAAAAAQ AAFAAAAApAAAAAAFqQAAAALUgC0IUAAAICkAAAAAAAAKQAoAAAICkBSAAAAAAAAAAAAAApAAAAKA AQFAIAAAAAAFAIAUgAAKCFAAAAAAAAAAAEAAgACKAAAAAACACkAAAABSFAABAAAACgAAACkAAC1I AAAAFqQAALUi0IVCgAgAAAAAAApAAAAAAAAAAAAAAAAAC1IAAAApCgAAAAUAAAAJFoSAAAAAAAUE KQAAApCgAAAAAAAAQAACAFIAAAytAIUAAAAAABAAABViAUAAgAAAUgAFAAAAAAAAALQkWpAAAFoA AAEAAAFIACkAAAAAKCAAAtSAALSIWgJFoSLUgWgiFABCgAUEKCIC0BIFqQAALUgAAAAoIAAAAAAA UgBQAQoAAAAAAAAAAkAKQIoAkKAAoAAAAACFIAUgAAAApAAAAAAAACkBQAAAC0IUEgC0BItAAEAA AAFIAWkQAAFoSLQkWpAFAqRaQpELQAAkUUEAAABQAAAAEgAC1IAFoSBakAWpAAFqQACkBSCkAAAA UEBQQpCgAACFAAIUEAAAgCBQAAAJKsAAFAAAAAAAAAAQoBAACkAABQCAVSQFAAAALQkWgBCgAAAA EKgAooAIUAAAAAEKQoAAAAAABAACghQAAAQoAAABAUBItIgBQQtSALUgAAAAAAoICkAAAAKCAoIU AAACFIAIUgACKAQFAICgAAgk0sCVYKAAAAAAAAAAAAAAgKCAAApAABQAAWpAtQoAAAAACFIWFCAW pFpCgAAAAhQAAAAAAAQoBCgAAAAAAAAABItIhakAC1IAAAtCQBakUUgQpAAAUgAUgAAKAAAAAABA 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 AAAAAAAAAAACFBCgAglEAAAAAAAJLbAItQRaklFskoFsElUhSAAAAApACkAAAAAAAAQAqwpEFIoA AAAAAAAAAAAAAEgWpFr6Hp8erLYKgtAVAAABFqCLUEUSApFoVLQghVCAACgEAUlAoSPF5/VzzuAQ WFFgAAAAASiFIAVBFpAUgAAAABSAAAFIAARagEKQBZAAAAAAAAAAktsAAAEVFsElFsAi1BJQpAAA AAAhQAAAAARagEUhaRAUAAAEKAAABItAAAACRakWpFqQPpevx6uRS2AAAAAAACCLQkAWhUtAAAEA BSAAAoIBQeTj34c+sUAAAAAAABCksKEAi2yS0ICwpAACgEKQApAACLIFpEKLKAQElAAAAEVFskts AAAi1AAAJLbBJVItgioAtklVUktskoAAAEKAAQFAAAAACiFCRQCVYhaQAAAAAAAAAkWpFqQLUi1I +n6/FbKgtACQAUhSBSBFoQApFUFS1ChAUgAioACgBQEFPPz7eXj2BYAAAAAAABBVklqFAgKBZJag igCkAAKQAAAEWQAKQoFIEAAAAABJbZJVVAIqLZFqCSgWyS2wCSqCFBACggAKCAAAACkAEKCFAICg ECgVIoBAAC0hSEKAAAAQoAJFoCRaggD6fr8VsFsFAJEUCSi2UICgECkWgKiqgAAKSKERQABUAtDM vn5deOOuZRSAFIAAAAABCggAsBUVJagi0hUKCFgAAAKCAiiQAABakAAAACS2wAACS2wASUWwCShS ABbJKAFIAAAACggAAAAApIoIKAQKSqQCBQAAACFBCgSBaAhQAAASLQkAAApPpevxasqWgBBBQQFt lQRQKigiLUUKEAAioCgiKAABUAVzxvyce8moAUAhQQAAAACCggi1AFSWooILCopKIAVItIAASWAA AAAAAAAAAAAAElCqkltgkoAtklUEKCAAAFABAAAUgAAAAACLSIUgpFFSAAKAQoAAAFSKAICgkWgA BCgghSAACk+j6vHTWs0JaqRQBUAVSCALQAICggAEVEUAACRaAkWqg5Y6eTj3igCgEBSApAAAABBV iUBYhSCkKQsBUEUCoItSLQkUZlAAAAAAAAAAAAAAElACqgioVUi1JKoVJKFBAUEKQApAAAAAAAAA i0iCqIhQBSAABCgAUgAAAIItASLQAkWgJFqQAAAPoenyC1bKmrm0BUAAUEAC0AACAAsECKIItSFI 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 JJJJJJJJJIAAAAAIAABEB/8A/gcf/wD/AP2yAAG2AQADBAAABgBttG2ANtmwG22222222233/wBt vbbDYAAAAAAAABhtttt9v/8A/wC/xxJPBABBAAABIABAAJJJJJJJJJJJJJJIhBBBAAIAAEB5P/8A /wD/AH22222AAACCABIABBAMBsAAG22BgGAxmA2222032332/wBvPbaaAAAAAAAAAAMct9tttt// AP8A/wD/AP8AOP8AzgcASAcDgQSACSSSSSSSSSSSQASQIAAf8f8A/wD+32222222wA2AAAAIAAAA AAABsIANG224AMMw222222223/22+23pptpgAAAAAAAIAQA+22222+23/wD/AP8A/wD/AP8A/wD/ AP8A/wD/AP8A+AABJJJJJJJJJIhB4AAP/wD/AP7b7bbbbbbbYYIIAAAAAAAAAAAAAAAGwAAb7bAD bbbbbbbbbbbbbbbbbbbb2202AAAAAAAAAAABAaADbb7/AG23/wD/AP8A/wD/AP8A/wB//wD/AAAJ JJJJJJIBAAEP/wD9ttttttttttttsggkAAAAAAAAAAAAADAAbbAAAaMNsNsNttttttttttttttvt 9tttvPbSTbabAAAAAAgAAAANvtvtttt//vv9/j//AP8A/wAAABACCSAAAL//AP8A+222222222wW CAAAAQAACAIAAAAAAAAAAAAAAAAAA34BAAAAG22222222283m/1/3222223tttthgAAAAAACQAAG 322+22/22+3/APttt/8A/wD/AMBAAIAD/wD/AP8AtttttttsAggkAAAAAAAAQQAAAAAAAAAAAAAA AAAAAAAAAAAAAAQAAAAB4QCCQAD/AP8A/wBt99ttvN6TbabAYACAAAAE/t9t9tttttttttsdltv/ AP8A/wD/AP4//wD/APttttsAAgAAAAAAAAAAAAAACAAAAAACAAAAAAAAAAAAQAAAAAAAAAAASQCA AAAAACDzz/8A/wD/AP8A7be22k2AGAAAAQCAABBAAAIBJAJAAAAIAIAbbbbf/wD/AP8A/fbbbbYA YAAABAAABAAAAAAAAAAAAAAgQQCiQAAAAAAAAAAAAIABJBBJAAbCQIAAAAAA0k/8/wD/APtt7bYA AAAAAAAAAAAAASAAAAAAAAAAAAAAEEBttttv/wD/AG222222AAAAAAAIAAAAAAAAAAAAEkEEkkmk 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 h7TVYbKX0aUTLgxepjRCuXpH8uEJ7f7i4/Oue1MLpXatGQeBIXU9G8ogkNaIox6rR5vrIb7HvApP 77GP6E+BNVhd6y/afoNqCYnRqiU74QgkQ4Q0HkIUbKXEJilKX1YTuSb4QlOHJJpc3Nzf+PW0J6j0 eX0PE9aYQ2JiExPVsT6JiEPAlDZl6kyjZd4T3Uz4R+h8autE1mZ8tdX51TqWn5m+y9lmbPV9D6ms IVRSlQ0QxQshIJjYhbhsqGWsvqTSE9leIjz3AtIv+dmPz2HutlpfXezJhiFwGaG290ywTLkUb9eE Jh916Um3EL8lJLhdF1ei/wCEndfYuk7IT22Mo3eqDWEyjY3rPSRNX6nhkM+RfuxFr1/u0Jh/Omj9 xaX15qi4favXrQ2PEJmE2mKN3phCYmYTSEJpcXNL2pN+DyHAn5Erwu7nSaIXzZ1zrfTztPgz2J1s aIQhNLpSlG7l9C3mIQhCCFm4vem+EPBDx23D+S8Lqmy3nY8TquGLCwvSROqaLSaLsnW+iaQhMUvV dITpvzcV/MS91DxMTb8w8zZdk6V8Z6PZ5fbCdN2pe5jRCEEvC7Hu9n99e3ffXcuidr7phYeJhYhC Ym19ZrRCl42vRdl9CEJ6az+daxOv90mV3rdfGbL2wmk66XV+mlXr11fTOq+3CfSmbi+3PnPuhNZ8 NaVa3umrF7yW8J3r111fnp3rntX0n2z0n0zEJiEJvTl+s/lz0Xou/wDdFo9/wn/DPN9G6PuQul5b 4ClyxKemtaLsv2f3qXYvRfWu1e60PMIIuaUTKMUpSlKUpSlKXohCEJ2O5CU9ilwyj2XVeidl9R9b PzC9P99BdM+c0NE6mPCxff8AIxqxJLCH6d9NaMuqwvSvo/uVosoeiP3LzP8Aj4QaGhoa2hN37qZj 7WJQgh+xS7LoQ9GXWfAR+E0fTNZ1P2r9RjY+q9UxCEJ3pyonH84lRCZvuTfjtS+Myj6bv+4/dofn /FtjDouWLW9sIQmJ1UYEiR+EJqvbXTRYeiWSiCS+BMc+pNmL/kGxvquZ1T0WIlSISITD0fuXN60L 1+PpwnozS9t+Kx4eXml1hCesmfg/kEnjZ/BeV1JHj3l0zHOL00uXtO1ekifUY8vMzCZnoLeMeEpQ gl856pehPRWeC5vRPRvp3d4X13h4esIQmkxCE0mIQhNoNbgSwShOh/MS/C/MTtWt/wCgaHh6om0I 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 bS3iaH+87Psmj/Rzi+y40WvPXh//2Q== " - id="image4891" - x="-535.60559" - y="-188.14987" - clip-path="url(#clipPath4145)" /><path - style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;block-progression:tb;white-space:normal;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#ffffff;color-rendering:auto;image-rendering:auto;shape-rendering:auto;enable-background:accumulate" - d="m 512.68096,296.07009 c -93.35126,0.009 -171.73632,63.92879 -195.6864,149.91791 -20.90398,-45.99328 -66.91627,-78.5879 -120.3776,-78.59385 -72.77312,0.008 -132.607997,59.84889 -132.616957,132.62749 -0.0144,72.79356 59.828907,132.64544 132.616957,132.6544 53.46731,-0.007 99.45003,-32.62151 120.35072,-78.62074 23.94141,86.00403 102.35306,149.93584 195.71626,149.9448 92.84054,0.007 170.84032,-63.22992 195.27724,-148.4992 21.24266,45.14803 66.5489,77.16618 119.39498,77.17216 C 900.15914,632.68596 960.01194,572.82717 960,500.01866 959.993,427.22512 900.14422,367.3792 827.35616,367.39114 774.5071,367.39714 729.17546,399.40935 707.9343,444.5633 683.49738,359.297 605.52448,296.05812 512.68394,296.0641 Z m 0,77.85612 c 70.10602,-0.005 126.10902,55.98698 126.11498,126.09843 0.004,70.12039 -56,126.13127 -126.11498,126.12532 -70.10602,-0.007 -126.09408,-56.01389 -126.0881,-126.12532 0.007,-70.10249 55.99104,-126.08947 126.0881,-126.09843 z m -316.07893,71.32407 c 30.71189,0.004 54.76352,24.05843 54.7665,54.77136 0.005,30.71894 -24.04983,54.79529 -54.7665,54.79827 -30.71787,-0.004 -54.77248,-24.07933 -54.76651,-54.79827 0.004,-30.71293 24.05641,-54.76839 54.76651,-54.77136 z m 630.75413,0 c 30.71786,-0.005 54.7904,24.05155 54.79338,54.77136 0.007,30.7279 -24.06954,54.80425 -54.79338,54.79827 -30.71786,-0.004 -54.77248,-24.07933 -54.7695,-54.79827 0.004,-30.71293 24.05731,-54.76839 54.7695,-54.77136 z" - id="path6" - inkscape:connector-curvature="0" /></svg>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 1344 1344" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><circle id="Circ" cx="672" cy="672" r="660.25" style="fill:#0082c9;"/><use xlink:href="#_Image1" x="11" y="11" width="1324px" height="1323px"/><path id="NC" d="M672.845,418.869c-115.855,0.012 -213.137,79.34 -242.861,186.058c-25.943,-57.081 -83.048,-97.533 -149.397,-97.54c-90.317,0.012 -164.576,74.277 -164.587,164.6c-0.017,90.342 74.252,164.622 164.587,164.634c66.357,-0.013 123.425,-40.486 149.364,-97.574c29.713,106.737 127.027,186.081 242.898,186.092c115.221,0.012 212.025,-78.473 242.353,-184.298c26.363,56.032 82.592,95.768 148.178,95.776c90.353,0.016 164.635,-74.273 164.62,-164.634c-0.012,-90.342 -74.285,-164.615 -164.62,-164.6c-65.59,0.012 -121.85,39.737 -148.212,95.776c-30.328,-105.821 -127.098,-184.305 -242.319,-184.298l-0.004,0.008Zm0,96.625c87.007,0 156.51,69.483 156.518,156.497c0,87.024 -69.5,156.538 -156.518,156.53c-87.006,-0.012 -156.492,-69.517 -156.484,-156.53c0.012,-87.003 69.489,-156.486 156.484,-156.497Zm-392.276,88.518c38.115,0 67.965,29.858 67.969,67.975c0,38.124 -29.848,68.005 -67.969,68.009c-38.124,0 -67.977,-29.885 -67.97,-68.009c0,-38.117 29.856,-67.972 67.97,-67.975Zm782.811,0c38.123,-0.013 67.998,29.85 68.002,67.975c0.012,38.135 -29.872,68.016 -68.002,68.009c-38.124,0 -67.977,-29.885 -67.973,-68.009c0,-38.117 29.857,-67.972 67.973,-67.975Z" style="fill:#fff;fill-rule:nonzero;"/><defs><image id="_Image1" width="1324px" height="1323px" xlink:href="data:image/png;base64,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"/></defs></svg>
\ No newline at end of file diff --git a/theme/colored/Nextcloud-sidebar.svg b/theme/colored/Nextcloud-sidebar.svg new file mode 100644 index 000000000..2068bc8d2 --- /dev/null +++ b/theme/colored/Nextcloud-sidebar.svg @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" + id="svg2" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1024 1024" + style="enable-background:new 0 0 1024 1024;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#FFFFFF;} +</style> +<sodipodi:namedview bordercolor="#666666" borderopacity="1" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" gridtolerance="10" guidetolerance="10" id="namedview8" inkscape:current-layer="svg2" inkscape:cx="-225.44227" inkscape:cy="284.0991" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="480" inkscape:window-width="640" inkscape:zoom="0.32" objecttolerance="10" pagecolor="#ffffff" showgrid="false"> + </sodipodi:namedview> +<g> +</g> +<path id="path6" inkscape:connector-curvature="0" class="st0" d="M513.6,266.9c-106.7,0-196.3,73.1-223.6,171.3 + c-23.9-52.6-76.5-89.8-137.6-89.8C69.2,348.5,0.8,416.9,0.8,500c0,83.2,68.4,151.6,151.6,151.6c61.1,0,113.7-37.3,137.5-89.9 + c27.4,98.3,117,171.4,223.7,171.4c106.1,0,195.2-72.3,223.2-169.7c24.3,51.6,76.1,88.2,136.5,88.2c83.2,0,151.6-68.4,151.6-151.6 + c0-83.2-68.4-151.6-151.6-151.6c-60.4,0-112.2,36.6-136.5,88.2C708.8,339.2,619.7,266.9,513.6,266.9L513.6,266.9z M513.6,355.9 + c80.1,0,144.1,64,144.1,144.1c0,80.1-64,144.2-144.1,144.1c-80.1,0-144.1-64-144.1-144.1C369.5,419.9,433.5,355.9,513.6,355.9 + L513.6,355.9z M152.3,437.4c35.1,0,62.6,27.5,62.6,62.6c0,35.1-27.5,62.6-62.6,62.6c-35.1,0-62.6-27.5-62.6-62.6 + C89.8,464.9,117.2,437.4,152.3,437.4L152.3,437.4z M873.2,437.4c35.1,0,62.6,27.5,62.6,62.6c0,35.1-27.5,62.6-62.6,62.6 + c-35.1,0-62.6-27.5-62.6-62.6C810.6,464.9,838.1,437.4,873.2,437.4L873.2,437.4z"/> +</svg> diff --git a/theme/nextcloud.VisualElementsManifest.xml b/theme/nextcloud.VisualElementsManifest.xml new file mode 100644 index 000000000..acdc31272 --- /dev/null +++ b/theme/nextcloud.VisualElementsManifest.xml @@ -0,0 +1,8 @@ +<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <VisualElements + BackgroundColor="#151e3d" + ForegroundText="light" + ShowNameOnSquare150x150Logo="on" + Square150x150Logo="visualelements\150-Nextcloud-w10startmenu.png" + Square70x70Logo="visualelements\70-Nextcloud-w10startmenu.png"/> +</Application>
\ No newline at end of file diff --git a/translations/client_bg.ts b/translations/client_bg.ts index 06587b346..0401055b5 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -65,12 +65,12 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>Помощ</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>Настройки</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Изберете локална папка (от компютъра), която да бъде синхронизирана </translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Изберете отдалечена папка (папка на сървъра)</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Дисково пространство: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Синхронизирай всички</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Без синхронизиране</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Потвърди ръчните промени</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Приложи</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Отказ</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Свързан с <server>, като <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Няма настроен профил.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Добави нов</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Премахни</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Профил</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Избор на елементи за синхронизиране</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Синхронизирай сега</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Рестартирай синхронизирането</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Премахни синхронизирането</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Създаването на папката се провали</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Локалната папка <i>%1</i>не може да бъде създадена.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Потвърждаване за премахване на синхронизация</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Премахни</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Синхронизират се файлове</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <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="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>Ползвате %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 като <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <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="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Осъществена връзка с %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Сървърът %1 е временно недостъпен.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Сървърът %1 е в режим на поддръжка.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Отписан от %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <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="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Свързване към %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Не може да се осъществи връзка като %1 с %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Вписване</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <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="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <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="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <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="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Потвърждение за премахване на профил</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Премахни връзката</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Отвори папката</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Отписване</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Продължи синхронизирането</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Пауза</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <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="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>Ползвате %1 от %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>В момента няма достъпна информация за използването на хранилището.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Няма %1 конфигурирана връзка.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Приемане</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation type="unfinished"/> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Възника грешка при запис на метаданните в базата данни</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 не може да бъде прочетен.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 е премахнат.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 е свален.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 е качен.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 е преименуван на %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 е преместен в %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 е премахнат.</numerusform><numerusform>%1 и %n други файла са премахнати.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 и %n друг файл са свалени.</numerusform><numerusform>%1 и %n други файлове са свалени.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 и %n друг файл са актуализирани.</numerusform><numerusform>%1 и %n други файлове са актуализирани.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 е преименуван на %2.</numerusform><numerusform>%1 е преименуван на %2 и %n други файла са преименувани.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 е преместен в %2.</numerusform><numerusform>%1 е преместен в %2 и %n други файла са преместени.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>Възникна конфликт при синхронизирането на %1.</numerusform><numerusform>Възникна конфликт при синхронизирането на %1 и %n други файла.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>Възникна конфликт при синхронизирането %1. Проверете файла!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 не може да бъде синхронизиран. За подробности проверете журнала.</numerusform><numerusform>%1 и %n други файла не могат да бъдат синхронизирани. За подробности проверете журнала.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 не може да бъде синхронизиран поради грешка. За подробности проверете журнала.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Активност от синхронизиране</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <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="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Добавена е папка от външно хранилище. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <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="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,46 +965,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Засечено е резервно копие</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Нормално синхронизиране</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1025,12 +1120,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Добави папка за синхронизиране</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Синхронизиран с локалните папки</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Файл</translation> </message> @@ -1060,7 +1155,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Възникна грешка при зареждането на списъка с папки от сървъра.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Отписан</translation> </message> @@ -1075,107 +1170,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Неразрешени конфликти. За подробности кликнете тук.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Синхронизиране на %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Проверка за отдалечени промени в '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Проверка за локални промени в '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 от %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>остават %5, %1 от %2, файл %3 от %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 от %2, файл %3 от %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>файл %1 от %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Изчакване...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Изчакване на %n друга папка...</numerusform><numerusform>Изчакване на %n други папки...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Подготвяне за синхронизиране...</translation> </message> @@ -1306,11 +1401,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1459,83 +1549,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Файлове игнорирани чрез модел</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Добави</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation type="unfinished"/> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Модел</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Разреши изтриване</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Премахни</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>Файлове и папки, чиито имена съвпадат с модел няма да бъдат синхронизирани. - -Елементите, които препятстват премахване на директория и за които е разрешено изриването, ще бъдат изтрити. Опцията е полезна за метаданни.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Добавяне на модел за игнориране</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Нов модел за игнориране:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1665,11 +1751,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Прокси настройки</translation> @@ -1979,11 +2060,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2035,12 +2111,12 @@ It is not advisable to use it.</source> <translation>Напред ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Невалиден URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2118,79 +2194,79 @@ It is not advisable to use it.</source> <translation>Локалната папка %1 не може да бъде създадена</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Не сте посочили отдалечена папка!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Грешка: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Одалечената папка %1 е създадена.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Създаването на папката предизвика HTTP грешка %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <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="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Успешно свързване с %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Преименуването на папка се провали</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локалната папка %1 е създадена успешно!</b></font></translation> </message> @@ -2198,12 +2274,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 - Помощник за свързване</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Пропусни настройването на папки</translation> </message> @@ -2237,7 +2313,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -2265,32 +2341,32 @@ It is not advisable to use it.</source> <translation>Свободното място на диска е по-малко от %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Целият файл не може да бъде свален.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -2303,7 +2379,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -2435,27 +2511,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Локален файл е променен по време на синхронизирането.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -2664,22 +2740,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Парола:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation type="unfinished"/> </message> @@ -2752,22 +2828,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Копирай връзката</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Няма резултат за '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Споделих нещо с вас</translation> </message> @@ -2785,22 +2861,27 @@ It is not advisable to use it.</source> <translation>може да редактира</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Може да споделя повторно</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Може да създава</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Може да променя</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Може да изтрива</translation> </message> @@ -2827,7 +2908,7 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> @@ -3012,11 +3093,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Приемане на сертификата</translation> @@ -3045,44 +3121,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Организация: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Отдел: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Държава: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Отпечатък (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Отпечатък (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Валиден от: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Валиден до: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Издател: %1</translation> </message> @@ -3373,11 +3454,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Версия %1. За допълнителна информация посетете <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3385,25 +3466,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Открит е невалиден сертификат</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> - <translation>"%1" предостави невалиден сертификат. Желаете ли да продължите?</translation> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3471,11 +3552,6 @@ It is not advisable to use it.</source> <translation>Настройки...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Подробности...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Помощ</translation> @@ -3587,6 +3663,11 @@ It is not advisable to use it.</source> <translation>Нов профил...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3646,23 +3727,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Сървър</translation> @@ -3704,11 +3768,6 @@ It is not advisable to use it.</source> <translation>Локална папка</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation type="unfinished"/> @@ -3727,11 +3786,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>Потребител</translation> @@ -3745,11 +3799,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation type="unfinished"/> @@ -3764,20 +3813,14 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation type="unfinished"/> </message> -</context> -<context> - <name>OwncloudSetupPage</name> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation type="unfinished"/> - </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> <translation type="unfinished"/> </message> +</context> +<context> + <name>OwncloudSetupPage</name> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> @@ -3812,26 +3855,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Целият профил се синхронизира с локалната папка</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QObject</name> @@ -3886,7 +3913,7 @@ It is not advisable to use it.</source> <translation>Преди известно време</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3969,14 +3996,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 159230e9e..5353b92a0 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Diàleg</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etiqueta</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation>Formulari</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Si us plau, canvieu al navegador per continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Hi ha hagut un error mentre es connectava. Si us plau, torneu-ho a provar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> <translation>Formulari</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Si us plau, canvieu al vostre navegador per continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Hi ha hagut un error mentre es connectava. Si us plau, torneu-ho a provar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Escolliu una carpeta local en el vostre equip per sincronitzar-la</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formulari</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Seleccioneu una carpeta de destinació remota</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Xifratge amb mnemotècnica de punt a punt</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Per protegir la vostra identitat Criptogràfica, ho encriptarem amb una mnemotècnica de 12 paraules de diccionari. Si us plau, anoteu-les i deseu-les a un lloc segur. Aquestes paraules us seran necessàries per afegir altres dispositius al vostre compte (com ara telèfons mòbils o portàtils).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulari</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espai d'emmagatzematge: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Les carpetes desmarcades <b>se suprimirian</b> del vostre sistema de fitxers local i ja no es sincronitzaran en aquest ordinador</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronitza-ho tot</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>No sincronitzis res</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplica els canvis manuals</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplica</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Connectat amb <server> com a <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No hi ha cap compte configurat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Afegeix-ne un de nou</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Suprimeix</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Aquest compte suporta xifratge d'extrem a extrem</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Activa el xifratge</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Mostra la mnemotècnica Punt-a-Punt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Xifra</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Trieu què voleu sincronitzar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Força la sincronització ara</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reinicia la sincronització</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Suprimeix la connexió de la carpeta sincronitzada</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Ha fallat la creació de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No s'ha pogut crear la carpeta local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmeu la supressió de la connexió de la carpeta sincronitzada</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Suprimeix la connexió de la carpeta sincronitzada</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>S'està sincronitzant</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>S'està sincronitzant.<br/>Voleu aturar-ho?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en ús</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 com a <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>La versió del servidor %1 és antiga i fora de suport! Continueu sota la vostra responsabilitat.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Connectat a %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 no està temporalment disponible</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>El servidor %1 es troba en mode de manteniment.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>S'ha desconnectat de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>S'està obtenint autorització des del navegador. <a href='%1'>feu clic aquí</a> per tornar a obrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>S'està connectant amb %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>No hi ha connexió amb %1 a %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Inici de sessió</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hi ha carpetes que no s'han sincronitzat perquè són massa grans:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hi ha carpetes que no s'han sincronitzat perquè són fonts d'emmagatzematge externes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hi ha carpetes que no s'han sincronitzat perquè són massa grans o són fonts d'emmagatzematge externes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirmeu la supressió del compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Segur que voleu suprimir la connexió al compte <i>%1</i>?</p><p><b>Nota:</b> això <b>no</b> suprimirà cap fitxer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Suprimeix la connexió</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Obre la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Surt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Continua la sincronització</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausa la sincronització</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Segur que voleu aturar la sincronització de la carpeta <i>%1</i>?</p><p><b>Nota:</b> això <b>no</b> suprimirà cap fitxer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en ús. Algunes carpetes, incloent les carpetes muntades a través de xarxa o les compartides, poden tenir límits diferents.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en ús</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualment no hi ha informació disponible de l'ús d'emmagatzematge.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>La connexió %1 no està configurada.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formulari</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Accepta</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Sincronitzat</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Torna a provar totes les pujades</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>El compte %1 no té les activitats habilitades.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>S'ha produït un error a l'escriure les metadades a la base de dades</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Si us plau, introduïu la contrasenya d'encriptació punt a punt: <br><br>Usuari: %2<br>Compte: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Introduïu la contrasenya Punt-a-Punt</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>S'ha produït un error des del servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>S'ha produït un error en accedir al punt final del "testimoni": <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No s'ha pogut analitzar el JSON retornat des del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La resposta del servidor no contenia tots els camps esperats</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Connecta a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Inicieu la sessió al vostre navegador (Flux d'entrada 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>No es pot obrir el navegador; si us plau, copieu l'enllaç al navegador.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>No es pot obrir el navegador; si us plau, copieu l'enllaç al navegador.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,122 +835,122 @@ <translation>No es pot llegir %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>S'ha suprimit '%1'</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>S'ha descarregat %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>S'ha actualitzat %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 s'ha renomenat a %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 s'ha mogut a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 i %n altre fitxer s'ha esborrat.</numerusform><numerusform>%1 i %n altres fitxers s'han suprimit.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 i %n altre fitxer s'han descarregat.</numerusform><numerusform>%1 i %n altres fitxers s'han descarregat.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 i %n altre fitxer s'han actualitzat.</numerusform><numerusform>%1 i %n altres fitxers s'han actualitzat.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 s'ha reanomenat a %2 i %n altre fitxer s'ha reanomenat.</numerusform><numerusform>%1 s'ha renomenat a %2 i %n altres fitxers s'han reanomenat.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 s'ha mogut a %2 i %n altre fitxer s'ha mogut.</numerusform><numerusform>%1 s'ha mogut a %2 i %n altres fitxers s'han mogut.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 i %n altre fitxer tenen conflictes de sincronització</numerusform><numerusform>%1 i %n altres fitxers tenen conflictes de sincronització</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 té conflictes de sincronització. Comproveu el fitxer conflictiu!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 i %n altre fitxer no s'han sincronitzat per errors. Consulteu el registre per obtenir més informació.</numerusform><numerusform>%1 i %n altres fitxers no s'han sincronitzat per errors. Consulteu el registre per obtenir més informació.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no s'ha pogut sincronitzar degut a un error. Mireu el registre per més detalls.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Activitat de sincronització</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>No s'ha pogut llegir el fitxer d'exclusió del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>S'ha afegit una carpeta de més de %1 MB: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>S'ha afegit una carpeta d'una font d'emmagatzematge extern. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Si us plau aneu al paràmetres per seleccionar si voleu descarregar-ho</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>La carpeta %1 es va crear, però es va excloure de la sincronització anteriorment. Les dades que hi ha dins no es sincronitzaran.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>El fitxer %1 es va crear, però es va excloure de la sincronització anteriorment. No es sincronitzarà.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -868,7 +963,7 @@ Això significa que és possible que el client de sincronització no pugui carre %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -879,22 +974,22 @@ Si decidiu conservar els fitxers, es tornarà a sincronitzar amb el servidor si Si decidiu suprimir els fitxers, no estaran disponibles per a vosaltres, tret que en sigueu el propietari.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Descarregar nous fitxers?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Descarrega nous fitxers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Manté els fitxers locals</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -903,7 +998,7 @@ Esteu segurs que voleu sincronitzar aquestes accions amb el servidor? Si s’ha produït un accident i decidiu conservar els vostres fitxers, es tornaran a sincronitzar des del servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -912,17 +1007,17 @@ Això pot ser per què es va restablir una còpia de seguretat al servidor. Continuar la sincronització com a normal farà que tots els vostres fitxers siguin sobreescrits per un fitxer anterior en un estat anterior. Voleu mantenir els fitxers locals més recents com a fitxers de conflicte?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Còpia de seguretat detectada</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronització normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Manté els fitxers locals com a conflicte</translation> </message> @@ -1038,12 +1133,12 @@ Continuar la sincronització com a normal farà que tots els vostres fitxers sig <translation>Afegeix connexions de carpetes sincronitzades</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Sincronitzat amb la carpeta local</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Fitxer</translation> </message> @@ -1073,7 +1168,7 @@ Continuar la sincronització com a normal farà que tots els vostres fitxers sig <translation>S'ha produït un error en carregar la llista de carpetes des del servidor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>S'ha desconnectat</translation> </message> @@ -1088,107 +1183,107 @@ Continuar la sincronització com a normal farà que tots els vostres fitxers sig <translation>Hi ha conflictes no resolts. Feu clic per veure els detalls.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>S'estan conciliant els canvis</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>S'està sincronitzant %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descarrega %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>carrega %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>S'estan comprovant els canvis en remot '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>S'estan comprovant els canvis en local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 pendent, %1 de %2, fitxer %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, fitxer %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>fitxer %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>S'està esperant...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>S'està esperant %n altra carpeta...</numerusform><numerusform>S'està esperant %n altres carpetes</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>S'està preparant per sincronitzar...</translation> </message> @@ -1319,11 +1414,6 @@ Continuar la sincronització com a normal farà que tots els vostres fitxers sig <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulari</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Avís legal</translation> @@ -1474,83 +1564,79 @@ Continuar la sincronització com a normal farà que tots els vostres fitxers sig <translation>Fitxers ignorats per patrons</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Afegeix</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Això es proporciona pel sistema a '%1' i no es pot modificar en aquesta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Suprimeix tot</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Patró</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permet l'eliminació</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Suprimeix</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>Els fitxers o directoris que concordin amb algun patró no es sincronitzaran. - -Els elements que poden ser suprimits s'eliminaran si impedeixen que una carpeta sigui suprimida. Això és útil per les metadades.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No s'ha pogut obrir el fitxer</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No es poden desar els canvis a '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Afegeix un patró per ignorar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Afegeix un nou patró d'ignorats:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Això es proporciona pel sistema a '%1' i no es pot modificar en aquesta vista.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Diàleg</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Avís legal</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Tanca</translation> @@ -1682,11 +1768,6 @@ Els registres s’escriuran a %1</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formulari</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Paràmetres del proxy</translation> @@ -1949,7 +2030,7 @@ privilegis addicionals durant el procés.</translation> <message> <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> <source>Select a different URL</source> - <translation>Seleccioneu una URL diferent</translation> + <translation>Seleccioneu un URL diferent</translation> </message> <message> <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="62"/> @@ -1997,11 +2078,6 @@ privilegis addicionals durant el procés.</translation> <source>Login in your browser</source> <translation>Inicieu la sessió al vostre navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Copia l'enllaç al porta-retalls</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2045,7 +2121,7 @@ No és aconsellable fer-la servir.</translation> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="184"/> <source>This url is secure. You can use it.</source> - <translation>Aquesta url és segura. Podeu fer-la servir.</translation> + <translation>Aquest URL és segur. Podeu fer-lo servir.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="223"/> @@ -2053,12 +2129,12 @@ No és aconsellable fer-la servir.</translation> <translation>&Següent ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> - <translation>URL no vàlida</translation> + <translation>L'URL no és vàlid</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>No s'ha pogut carregar el certificat. Potser la contrasenya és incorrecta?</translation> </message> @@ -2088,7 +2164,7 @@ No és aconsellable fer-la servir.</translation> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="385"/> <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>La sol·licitud autenticada al servidor s'ha redirigit a '%1'. L’URL no és bona, el servidor està mal configurat.</translation> + <translation>La sol·licitud autenticada al servidor s'ha redirigit a '%1'. L’URL no és bo, el servidor està mal configurat.</translation> </message> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/> @@ -2103,7 +2179,7 @@ No és aconsellable fer-la servir.</translation> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="278"/> <source>Invalid URL</source> - <translation>URL no vàlida</translation> + <translation>L'URL no és vàlid</translation> </message> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> @@ -2136,79 +2212,79 @@ No és aconsellable fer-la servir.</translation> <translation>No s'ha pogut crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>No heu especificat cap carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>s'està creant una carpeta a Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 s'ha creat correctament.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ja existeix. S'hi està connectant per sincronitzar-les.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creació de la carpeta ha donat el codi d'error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Ha fallat la creació de la carpeta perquè les credencials proporcionades són incorrectes!<br/>Si us plau, aneu enrere i comproveu les credencials.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creació de la carpeta remota ha fallat, probablement perquè les credencials facilitades són incorrectes.</font><br/>Si us plau, comproveu les vostres credencials.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creació de la carpeta remota %1 ha fallat amb l'error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>S'ha establert una connexió de sincronització des de %1 a la carpeta remota %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>S'ha connectat amb èxit a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No s'ha pogut establir la connexió amb %1. Si us plau, torneu-ho a provar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Ha fallat el canvi de nom de la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>No es pot suprimit i restaurar la carpeta perquè una carpeta o un fitxer de dins està obert en un altre programa. Si us plau, tanqueu la carpeta o el fitxer i intenteu-ho de nou o cancel·leu la configuració.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>la carpeta de sincronització %1 s'ha creat correctament!</b></font></translation> </message> @@ -2216,12 +2292,12 @@ No és aconsellable fer-la servir.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>Assistent de connexió %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Salta la configuració de carpetes</translation> </message> @@ -2255,7 +2331,7 @@ No és aconsellable fer-la servir.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>S'ha produït un error en escriure metadades a la base de dades</translation> </message> @@ -2283,32 +2359,32 @@ No és aconsellable fer-la servir.</translation> <translation>L'espai lliure del disc dur és inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>El fitxer s'ha suprimit del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>No s'ha pogut descarregar el fitxer completament.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>El fitxer descarregat és buit malgrat que el servidor ha dit que hauria d'haver estat %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>El fitxer %1 no es pot desar a causa d’un conflicte de nom amb un fitxer local.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>El fitxer ha canviat des que es va descobrir</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>S'ha produït un error en escriure metadades a la base de dades</translation> </message> @@ -2321,7 +2397,7 @@ No és aconsellable fer-la servir.</translation> <translation>; Ha fallat la restauració: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>S'ha suprimit un fitxer o carpeta d’una compartició de només lectura, però la restauració ha fallat: %1</translation> </message> @@ -2453,27 +2529,27 @@ No és aconsellable fer-la servir.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>El fitxer local s'ha suprimit durant la sincronització.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>El fitxer local ha canviat durant la sincronització.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Codi de retorn inesperat del servidor (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Falta l'ID de fitxer del servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Falta l'ETag del servidor</translation> </message> @@ -2682,22 +2758,22 @@ No és aconsellable fer-la servir.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Comparteix l'enllaç</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Contrasenya:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Data de caducitat:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -2739,7 +2815,7 @@ No és aconsellable fer-la servir.</translation> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="219"/> <source>Unshare</source> - <translation>Descomparteix</translation> + <translation>Deixa de compartir</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="224"/> @@ -2770,22 +2846,22 @@ No és aconsellable fer-la servir.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Comparteix amb usuaris o grups ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Copia l'enllaç</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No hi ha resultats per '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>He compartit una cosa amb tu</translation> </message> @@ -2803,22 +2879,27 @@ No és aconsellable fer-la servir.</translation> <translation>pot editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Pot re-compartir</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Deixa de compartir</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Pot crear</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Pot canviar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Pot suprimir</translation> </message> @@ -2845,8 +2926,8 @@ No és aconsellable fer-la servir.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista de depuració de xifratge SSL</translation> + <source>SSL Cipher Debug View</source> + <translation>Visor del Depurador de xifratge SSL</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3031,11 +3112,6 @@ No és aconsellable fer-la servir.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formulari</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confia en aquest certificat de totes maneres</translation> @@ -3064,44 +3140,49 @@ No és aconsellable fer-la servir.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organització %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unitat: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Empremta digital (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Empremta digital (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Data d'efectivitat: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Data de venciment: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emissor: %1</translation> </message> @@ -3392,11 +3473,11 @@ No és aconsellable fer-la servir.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versió %1. Per més informació visiteu <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Versió %1. Per a més informació, feu clic <a href='%2'>aquí</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Aquest llançament va ser subministrat per %1</p></translation> </message> @@ -3404,25 +3485,25 @@ No és aconsellable fer-la servir.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>S'ha detectat un certificat no vàlid</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>El servidor "%1" ha proporcionat un certificat no vàlid. Voleu continuar?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Heu tancat la sessió de %1 com a usuari %2. Si us plau, torneu a iniciar la sessió</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Si us plau, inicieu la sessió amb l’usuari: %1</translation> </message> @@ -3490,11 +3571,6 @@ No és aconsellable fer-la servir.</translation> <translation>Paràmetres...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalls...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ajuda</translation> @@ -3606,10 +3682,15 @@ No és aconsellable fer-la servir.</translation> <translation>Compte nou...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Mostra més activitat...</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 type="unfinished"/> + <translation>Fallada ara</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="841"/> @@ -3665,23 +3746,6 @@ No és aconsellable fer-la servir.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formulari</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3723,11 +3787,6 @@ No és aconsellable fer-la servir.</translation> <translation>Carpeta &local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Manté les dades locals</translation> @@ -3746,11 +3805,6 @@ No és aconsellable fer-la servir.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulari</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>Nom d'&usuari</translation> @@ -3764,11 +3818,6 @@ No és aconsellable fer-la servir.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulari</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Si us plau, canvieu al vostre navegador per continuar.</translation> @@ -3783,21 +3832,15 @@ No és aconsellable fer-la servir.</translation> <source>Re-open Browser</source> <translation>Torna a obrir el Navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formulari</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Allotjeu el vostre propi servidor</span></a></translation> @@ -3831,26 +3874,10 @@ No és aconsellable fer-la servir.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formulari</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>El vostre compte està totalment sincronitzat amb la carpeta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3905,7 +3932,7 @@ No és aconsellable fer-la servir.</translation> <translation>Fa una estona</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3988,14 +4015,6 @@ No és aconsellable fer-la servir.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Formulari</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> @@ -4169,7 +4188,7 @@ No és aconsellable fer-la servir.</translation> <message> <location filename="../src/gui/guiutility.cpp" line="35"/> <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source> - <translation>S'ha produït un error en iniciar el navegador per anar a la URL %1. Potser no s’ha configurat cap navegador predeterminat?</translation> + <translation>S'ha produït un error en iniciar el navegador per anar a l'URL %1. Potser no s’ha configurat cap navegador predeterminat?</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="58"/> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 34ee5c365..e46480be4 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Štítek</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Formulář</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Došlo k chybě při připojování. Zkuste to znovu.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Pro pokračování přepněte do vámi používaného webového prohlížeče.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Došlo k chybě při připojování. Zkuste to znovu.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Zvolte místní složku na svém počítači k synchronizaci</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Zvolte cílovou složku na protějšku</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Mnemonická šifrování mezi koncovými body</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Pro ochranu vaší kryptografické identity ji šifrujeme pomocí mnemonické 12 slovy ze slovníku. Poznamenejte si je někam bezpečně. Budou potřebné pro přidání dalších zařízení k vašemu účtu (jako je mobilní telefon či notebook).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>…</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Prostor úložiště: …</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Neoznačené složky budou <b>odstraněny</b> z místního souborového systému a nebudou už synchronizovány na tento počítač</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Synchronizovat vše</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Nic nesynchronizovat</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Použít manuální úpravy</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Použít</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Zrušit</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Připojen k <server> jako <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Žádný účet nenastaven.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Přidat nový</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Účet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Tento účet podporuje šifrování end-to-end</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Zapnout šifrování</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Zobrazit E2E mnemotechnickou</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Šífrovat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Vybrat co sesynchronizovat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Vynutit synchronizaci nyní</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Restartovat synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Odstranit připojení synchronizace složky</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Vytvoření složky se nezdařilo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Nedaří se vytvořit místní složku <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Potvrdit odstranění připojení synchronizace složky</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Odstranit připojení synchronizace adresáře</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Synchronizace probíhá</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 používaný</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 jako <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Server verze %1 je zastaralý a nepodporovaný! Pokračujte na vlastní riziko.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Připojeno k %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 je dočasně nedostupný.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>server %1 je v režimu údržby.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Odhlášeno z %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Získávání autorizace z prohlížeče. <a href='%1'>Klikněte zde</a> pro opětovné otevření prohlížeče.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Připojeno k %1…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Bez připojení k %1 na %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Přihlásit</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Tyto složky nebyly synchronizovány, protože jsou příšliš velké:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Tyto složky nebyly synchronizovány, protože se nachází na externím úložišti:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Tyto složky nebyly synchronizovány, protože jsou příliš velké, nebo se nachází na externím úložišti:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Potvrdit odstranění účtu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Opravdu chcete odstranit připojení k účtu <i>%1</i>?</p><p><b>Poznámka:</b> Toto <b>neodstraní</b> žádné soubory.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Odstranit připojení</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Otevřít složku</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Odhlásit se</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Pokračovat v synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pozastavit synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Opravdu chcete zastavit synchronizaci adresáře <i>%1</i>?</p><p><b>Poznámka:</b> Toto <b>neodstraní</b> žádné soubory.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>Používaných %1 (%3%) z %2. Některé adresáře včetně připojených síťových nebo sdílených adresářů mohou mít odlišné limity.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>Používaných %1 z %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Momentálně nejsou k dispozici žádné informace o využití úložiště.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Nenastaveno žádné spojení s %1.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Textový popisek</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Přijmout</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Synchronizováno</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Zkusit znovu všechna nahrání</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Účet %1 nemá zapnuté aktivity.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Chyba zápisu metadat do databáze</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Zadejte heslovou frázi pro šifrování mezi koncovými body: <br><br>Uživatel: %2<br>Účet: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Zadejte E2E heslovou frázi</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Chyba vrácená ze serveru: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Odpověď ze serveru neobsahuje všechny očekávané kolonky</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Připojit k %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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>Nedaří se otevřít prohlížeč, zkopírujte do něj odkaz sami.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,119 +835,119 @@ <translation>%1 není čitelný.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 byl odebrán.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 byl stažen.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 byl aktualizován.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 byl přejmenován na %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 byl přemístěn do %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 soubor bude smazán.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 soubor byl stažen.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 soubor byl aktualizován.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 byl přejmenován na %2.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 byl přesunut do %2.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 má problém se synchronizací. Zkontrolujte soubor s konflikty.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 soubor nemůže být synchronizován kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 nebyl kvůli chybě synchronizován. Podrobnosti jsou k nalezení v záznamu událostí.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Průběh synchronizace</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Nezdařilo se přečtení systémového exclude souboru</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Nová složka větší než %1 MB byla přidána: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Byla přidána složka z externího úložiště.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Pokud to chcete stáhnout, jděte do nastavení a vyberte to.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Složka %1 byla vytvořena ale byla dříve vynechána ze synchronizace. Nebude synchronizována.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Soubor %1 byl vytvořen ale byl dříve byl vynechán ze synchronizace. Nebude synchronizován.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -865,7 +960,7 @@ To znamená, že synchronizační klient nemusí místní změny okamžitě nahr %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -876,22 +971,22 @@ Pokud se rozhodnete soubory ponechat, budou znovu synchronizovány se serverem p Pokud se soubory rozhodnete smazat, nebudou vám dostupné, pokud nejste vlastník.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Stáhnout nové soubory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Stáhnout nové soubory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Ponechat místní soubory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -900,7 +995,7 @@ Jste si jisti, že chcete tyto akce synchronizovat se serverem? Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze serveru.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -909,17 +1004,17 @@ Toto může být způsobeno obnovením zálohy na straně serveru. Pokračováním v synchronizaci způsobí přepsání všech vašich souborů staršími soubory z dřívějšího stavu. Přejete si ponechat své místní nejaktuálnější soubory jako konfliktní soubory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Záloha nalezena</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Normální synchronizace</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Ponechat místní soubory jako konflikt</translation> </message> @@ -1035,12 +1130,12 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st <translation>Přidat spojení synchronizace složky</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Synchronizováno s místní složkou</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Soubor</translation> </message> @@ -1070,7 +1165,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st <translation>Chyba při načítání seznamu složek ze serveru.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Odhlášeno</translation> </message> @@ -1085,107 +1180,107 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st <translation>Existují nevyřešené konflikty. Klikněte pro podrobnosti.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Slučování změn</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>„%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronizuje se %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>stahování %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>nahrávání %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Zjišťují se změny ve vzdáleném „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Zjišťují se změny v místním „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 ze %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 zbývá, %1 ze %2, soubor %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 z %2, soubor %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>soubor %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Chvíli strpení…</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Čeká se na %n další složku…</numerusform><numerusform>Čeká se na %n další složky…</numerusform><numerusform>Čeká se na %n dalších složek…</numerusform><numerusform>Čeká se na %n další složky…</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Příprava na synchronizaci…</translation> </message> @@ -1316,11 +1411,6 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Právní upozornění</translation> @@ -1471,83 +1561,79 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st <translation>Ignorovat soubory podle masky</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Přidat</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Tato položka je poskytnuta systémem na '%1' a nemůže být v tomto pohledu změněna.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Odebrat vše</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Maska</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Povolit mazání</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Odebrat</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>Soubory či adresáře vyhovující masce nebudou synchronizovány. - -Položky u kterých je povoleno smazání budou vymazány, pokud by bránily odstranění adresáře. Toto je užitečné pro metadata.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Nepodařilo se otevřít soubor</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Nelze zapsat změny do '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Přidat masku ignorovaných</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Přidat novou masku ignorovaných souborů:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Tato položka je poskytnuta systémem na '%1' a nemůže být v tomto pohledu změněna.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Právní upozornění</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextovýŠtítek</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Zavřít</translation> @@ -1679,11 +1765,6 @@ Záznamy událostí budou zapisovány do %1</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Nastavení proxy</translation> @@ -1994,11 +2075,6 @@ můžete být požádáni o dodatečná oprávnění.</translation> <source>Login in your browser</source> <translation>Přihlášení v prohlížeči</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Zkopírovat odkaz do schránky</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2050,12 +2126,12 @@ Nedoporučuje se jí používat.</translation> <translation>&Následující ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Neplatná URL adresa</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Certifikát není možné načíst. Nejspíš je chybné heslo?</translation> </message> @@ -2133,79 +2209,79 @@ Nedoporučuje se jí používat.</translation> <translation>Nelze vytvořit místní adresář %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Není nastaven žádný vzdálený adresář!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>vytváří se složka na Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Vzdálený adresář %1 byl úspěšně vytvořen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Vzdálený adresář %1 již existuje. Spojuje se pro synchronizaci.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Vytvoření adresáře selhalo s HTTP chybou %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.<br/>Vraťte se prosím zpět a zkontrolujte je.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.</font><br/>Vraťte se prosím zpět a zkontrolujte je.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Vytváření vzdáleného adresáře %1 selhalo s chybou <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Bylo nastaveno synchronizované spojení z %1 do vzdáleného adresáře %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Úspěšně spojeno s %1.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Spojení s %1 nelze navázat. Prosím zkuste to znovu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Přejmenování adresáře selhalo</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Nelze odstranit a zazálohovat adresář, protože adresář nebo soubor v něm je otevřen v jiném programu. Prosím zavřete adresář nebo soubor a zkuste znovu nebo zrušte akci.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Místní synchronizovaný adresář %1 byl úspěšně vytvořen!</b></font></translation> </message> @@ -2213,12 +2289,12 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Průvodce spojením</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Přeskočit konfiguraci adresářů</translation> </message> @@ -2252,7 +2328,7 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Chyba zápisu metadat do databáze</translation> </message> @@ -2280,32 +2356,32 @@ Nedoporučuje se jí používat.</translation> <translation>Volné místo na disku je méně než %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Soubor byl smazán ze serveru</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Soubor nemohl být kompletně stažen.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> - <translation type="unfinished"/> + <translation>Stažený soubor je prázdný, přestože soubor oznámil, že měl mít %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Soubor se mezitím změnil</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Chyba zápisu metadat do databáze</translation> </message> @@ -2318,7 +2394,7 @@ Nedoporučuje se jí používat.</translation> <translation>; Obnovení selhalo: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Soubor nebo adresář by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1</translation> </message> @@ -2450,27 +2526,27 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Místní soubor byl odstraněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Neočekávaný návratový kód ze serveru (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Chybějící souborové ID ze serveru</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Chybějící ETag ze serveru</translation> </message> @@ -2679,22 +2755,22 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>Odkaz pro &sdílení</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Heslo:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Datum skončení platnosti:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>Textový popisek</translation> </message> @@ -2767,22 +2843,22 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Sdílet s uživateli nebo skupinami…</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Zkopírovat odkaz</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Žádné výsledky pro „%1“</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Něco jsem vám nasdílel</translation> </message> @@ -2800,22 +2876,27 @@ Nedoporučuje se jí používat.</translation> <translation>lze upravovat</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Může sdílet dál</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Přestat sdílet</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Může vytvářet</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Může měnit</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Může mazat</translation> </message> @@ -2842,8 +2923,8 @@ Nedoporučuje se jí používat.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Ladící zobrazení šifry SSL</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3028,11 +3109,6 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Přesto tomuto certifikátu důvěřovat</translation> @@ -3061,44 +3137,49 @@ Nedoporučuje se jí používat.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organizace: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Jednotka: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Země: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Otisk (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Otisk (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Datum účinnosti: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Datum skončení platnosti: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Vydavatel: %1</translation> </message> @@ -3389,11 +3470,11 @@ Nedoporučuje se jí používat.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Verze %1. Více informací na <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Verze %1. Více informací získáte kliknutím <a href='%2'>sem</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Toto vydání bylo poskytnuto %1</p></translation> </message> @@ -3401,25 +3482,25 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Zjištěn neplatný certifikát</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> - <translation>Stroj „%1“ předložil neplatný certifikát. Pokračovat i tak?</translation> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation>Stroj „%1“ předložil neplatný certifikát. Pokračovat?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Byli jste odhlášeni z %1 jako uživatel %2. Znovu se přihlaste</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Přihlaste se pomocí uživatele: %1</translation> </message> @@ -3487,11 +3568,6 @@ Nedoporučuje se jí používat.</translation> <translation>Nastavení…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Podrobnosti…</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Nápověda</translation> @@ -3603,6 +3679,11 @@ Nedoporučuje se jí používat.</translation> <translation>Nový účet…</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Zobrazit další aktivitu…</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> @@ -3662,23 +3743,6 @@ Nedoporučuje se jí používat.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>Textový popisek</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Server</translation> @@ -3720,11 +3784,6 @@ Nedoporučuje se jí používat.</translation> <translation>Místní s&ložka</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Ponechat místní data</translation> @@ -3743,11 +3802,6 @@ Nedoporučuje se jí používat.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Uživatelské jméno</translation> @@ -3761,11 +3815,6 @@ Nedoporučuje se jí používat.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Přepněte se do webového prohlížeče a pokračujte v něm.</translation> @@ -3780,21 +3829,15 @@ Nedoporučuje se jí používat.</translation> <source>Re-open Browser</source> <translation>Znovu otevřít prohlížeč</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Textový popisek</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Hostujte svůj vlastní server</span></a></translation> @@ -3828,26 +3871,10 @@ Nedoporučuje se jí používat.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Textový popisek</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Celý váš účet je synchronizován do místní složky</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Tlačítko</translation> - </message> </context> <context> <name>QObject</name> @@ -3902,7 +3929,7 @@ Nedoporučuje se jí používat.</translation> <translation>Před nějakým časem</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3985,14 +4012,6 @@ Nedoporučuje se jí používat.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Formulář</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_da.ts b/translations/client_da.ts index 73af35b20..7353e9a7e 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -50,47 +50,42 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>Åbn websted</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>Ændret for nylig</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>Pause synkronisering</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>Hjælp</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>Indstillinger</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>Log ud</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> <source>Quit sync client</source> - <translation type="unfinished"/> + <translation>Luk synkroniserings-klient</translation> </message> </context> <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Mærkat</translation> @@ -112,20 +107,71 @@ <message> <location filename="../src/common/filesystembase.cpp" line="502"/> <source>Moving to the trash is not implemented on this platform</source> + <translation>Flytning af filer til skraldespand er ikke implementeret på denne platform</translation> + </message> +</context> +<context> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation>Formular</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Venligst skift til din browser for at fortsætte</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Der opstod en fejl under forsøget på at oprette forbindelse. Prøv venligst igen.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> <translation type="unfinished"/> </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> <translation>Formular</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Venligst skift til din browser for at fortsætte</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Der opstod en fejl under forsøget på at oprette forbindelse. Prøv venligst igen.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> - <translation type="unfinished"/> + <translation>Vælg en lokal mappe på din computer der ønskes synkroniseret</translation> </message> <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Vælg en perifer destinationsfolder </translation> @@ -171,297 +212,308 @@ <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="249"/> <source>Connection timed out</source> - <translation type="unfinished"/> + <translation>Forbindelsen udløb</translation> </message> <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="251"/> <source>Unknown error: network reply was deleted</source> - <translation type="unfinished"/> + <translation>Ukendt fejl: netværkets svar blev slettet</translation> </message> <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="403"/> <source>Server replied "%1 %2" to "%3 %4"</source> - <translation type="unfinished"/> + <translation>Serveren svarede "%1 %2" to "%3 %4"</translation> </message> </context> <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> - <translation type="unfinished"/> + <translation>End to end krypterings huskeregel</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> - <translation type="unfinished"/> + <translation>For at beskytte din kryptografiske identitet krypterer vi den vha. en huskeregel med 12 ordbogs opslag. Venligst noter dem ned og opbevar sikkert. De skal bruges for at tilføje andre enheder til din konto (fx mobil eller bærbar).</translation> </message> </context> <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> - <translation type="unfinished"/> + <translation>Lagerplads: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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 type="unfinished"/> + <translation>Fravalgte mapper vil blive <b>fjernet</b> fra dit lokale filsystem og bliver ikke længere synkroniseret til denne computer</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Synkroniser alt</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Synkroniser ingen</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Anvend manuelle ændringer</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Anvend</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Annuller</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Forbundet med <server> som <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Ingen konto konfigureret.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Tilføj ny</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Fjern</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Denne konto supporterer end-to-end kryptering</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Slå kryptering til</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>vis E2E huskeregel</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Krypter</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Vælg hvad der skal synkroniseres</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Gennemtving synkronisering nu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Genstart synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Fjern mappesynkroniseringsforbindelse</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Fejl ved oprettelse af mappe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> - <translation type="unfinished"/> + <translation><p>Kunne ikke oprette lokal mappe <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Synkronisering i gang</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> - <translation type="unfinished"/> + <translation>Synkronisering pågår.<br/>Ønsker du at afslutte den?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> - <translation type="unfinished"/> + <translation>%1 i brug</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 som <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> - <translation type="unfinished"/> + <translation>Server version %1 er gammel og usupporteret! Fortsæt på egen risiko.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Forbundet til %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> - <translation type="unfinished"/> + <translation>Serveren %1 er midlertidig utilgængelig.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> - <translation type="unfinished"/> + <translation>Serveren %1 er i vedligeholdelsestilstand.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Logget ud fra %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Forbinder til %1…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> - <translation type="unfinished"/> + <translation>Ingen forbindelse til %1 hos %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Log ind</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> - <translation type="unfinished"/> + <translation>Der er mapper som ikke blev synkroniseret fordi de er for store:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> - <translation type="unfinished"/> + <translation>Der er mapper som ikke blev synkroniseret fordi de er eksterne lagre:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> - <translation type="unfinished"/> + <translation>Der er mapper som ikke blev synkroniseret fordi de er for store eller eksterne lagre:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> - <translation type="unfinished"/> + <translation>Bekræft sletning af konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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"/> + <translation><p>Ønsker du virkelig at fjerne forbindelse til kontoen <i>%1</i>?</p><p><b>Note:</b>Dette sletter <b>ikke</b>nogen filer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Fjern forbindelse</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Åbn mappe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Log ud</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Genoptag synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Paus synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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 type="unfinished"/> + <translation><p>Ønsker du virkelig at stoppe synkronisering af mappen <i>%1</i>?</p><p><b>Note:</b>Dette sletter <b>ikke</b>nogen filer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> - <translation type="unfinished"/> + <translation>%1 (%3%) af %2 i brug. Nogle mapper, inklusiv netværksdiske eller delte mapper, har muligvis andre begrænsninger.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 af %2 er i brug</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> - <translation type="unfinished"/> + <translation>Der er i øjeblikket ingen informationer om brug af lager tilgængelig.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> - <translation type="unfinished"/> + <translation>Ingen %1 forbindelse konfigureret.</translation> </message> </context> <context> @@ -474,7 +526,7 @@ <message> <location filename="../src/gui/accountstate.cpp" line="122"/> <source>Disconnected</source> - <translation type="unfinished"/> + <translation>Frakoblet</translation> </message> <message> <location filename="../src/gui/accountstate.cpp" line="124"/> @@ -504,7 +556,7 @@ <message> <location filename="../src/gui/accountstate.cpp" line="134"/> <source>Asking Credentials</source> - <translation type="unfinished"/> + <translation>Forespørger om brugeroplysninger</translation> </message> <message> <location filename="../src/gui/accountstate.cpp" line="136"/> @@ -543,34 +595,24 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Textmærke</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Accepter</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>S</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> - <translation type="unfinished"/> + <translation>Prøv fejlede alle fejlede uploads igen</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> - <translation type="unfinished"/> + <translation><br/>Konto %1 har ikke nogen aktiviteter slået til.</translation> </message> </context> <context> @@ -578,17 +620,17 @@ <message> <location filename="../src/gui/addcertificatedialog.ui" line="17"/> <source>SSL client certificate authentication</source> - <translation type="unfinished"/> + <translation>SSL klient certifikat autentifikation</translation> </message> <message> <location filename="../src/gui/addcertificatedialog.ui" line="23"/> <source>This server probably requires a SSL client certificate.</source> - <translation type="unfinished"/> + <translation>Denne server kræver sandsynligvis et SSL klient certifikat.</translation> </message> <message> <location filename="../src/gui/addcertificatedialog.ui" line="35"/> <source>Certificate & Key (pkcs12) :</source> - <translation type="unfinished"/> + <translation>Certifikat & nøgle (pkcs12) :</translation> </message> <message> <location filename="../src/gui/addcertificatedialog.ui" line="51"/> @@ -616,7 +658,7 @@ <message> <location filename="../src/gui/application.cpp" line="192"/> <source>Error accessing the configuration file</source> - <translation type="unfinished"/> + <translation>Adgang til konfigurationsfilen fejlede</translation> </message> <message> <location filename="../src/gui/application.cpp" line="193"/> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Fejl ved skrivning af metadata til databasen</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Indtast E2E kodeord</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,118 +835,118 @@ <translation>%1 kan ikke læses.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 er fjernet.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 er hentet.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 er blevet opdateret.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 er blevet omdøbt til %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 er blevet flyttet til %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Synkroniseringsaktivitet</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -860,7 +955,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -868,46 +963,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Hent nye filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Hent nye filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Behold lokale filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Normal synkronisering</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1023,12 +1118,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Fil</translation> </message> @@ -1058,7 +1153,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Logget ud</translation> </message> @@ -1073,107 +1168,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>hent %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 af %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 tilbage, %1 af %2, fil %3 af %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 af %2, fil %3 af %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>fil %1 af %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Venter…</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation type="unfinished"/> </message> @@ -1304,11 +1399,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1457,81 +1547,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Tilføj</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation type="unfinished"/> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Fjern alle</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Mønster</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Tillad sletning</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Fjern</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Luk</translation> @@ -1661,11 +1749,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Proxyindstillinger</translation> @@ -1975,11 +2058,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2030,12 +2108,12 @@ It is not advisable to use it.</source> <translation>&Næste ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Ugyldig URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2113,79 +2191,79 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Fejl: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation type="unfinished"/> </message> @@ -2193,12 +2271,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation type="unfinished"/> </message> @@ -2232,7 +2310,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -2260,32 +2338,32 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -2298,7 +2376,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -2430,27 +2508,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -2659,22 +2737,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation type="unfinished"/> </message> @@ -2747,22 +2825,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation type="unfinished"/> </message> @@ -2780,22 +2858,27 @@ It is not advisable to use it.</source> <translation>kan redigere</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2822,7 +2905,7 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> @@ -3006,11 +3089,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation type="unfinished"/> @@ -3039,44 +3117,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Land: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> + <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> - <source>Fingerprint (SHA1): <tt>%1</tt></source> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Udløbsdato: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation type="unfinished"/> </message> @@ -3367,11 +3450,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3379,25 +3462,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3465,11 +3548,6 @@ It is not advisable to use it.</source> <translation>Indstillinger…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detaljer…</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Hjælp</translation> @@ -3581,6 +3659,11 @@ It is not advisable to use it.</source> <translation>Ny konto…</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3640,23 +3723,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Server</translation> @@ -3698,11 +3764,6 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation type="unfinished"/> @@ -3721,11 +3782,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Brugernavn</translation> @@ -3739,11 +3795,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation type="unfinished"/> @@ -3758,20 +3809,14 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation>Åbn browser igen</translation> </message> -</context> -<context> - <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> <translation type="unfinished"/> </message> +</context> +<context> + <name>OwncloudSetupPage</name> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> @@ -3806,26 +3851,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QObject</name> @@ -3880,7 +3909,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3963,14 +3992,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_de.ts b/translations/client_de.ts index b304c08f4..ffc22eeef 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -55,7 +55,7 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation>Zuletzt geteilt</translation> + <translation>Zuletzt geändert</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Beschriftung</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Um Fortzufahren wechseln Sie bitte zu Ihrem Browser.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Fehler bei der Verbindungsherstellung. Bitte erneut versuchen.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Browser erneut öffnen</translation> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Link kopieren</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Formular</translation> + <translation>Form</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Bitte wechseln Sie zu Ihrem Browser um fortzufahren.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Beim Herstellen der Verbindung ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Browser erneut öffnen</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Link kopieren</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Wählen Sie einen lokalen Ordner zum Synchronisieren aus</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Einen entfernten Zielordner auswählen</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Gedächtnisstütze für Ende-zu-Ende Verschlüsselung</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Um Ihre kryptografische Identität zu schützen, verschlüsseln wir sie mit einer Gedächtnisstütze von 12 Wörterbuchwörtern. Bitte notieren Sie sich diese und bewahren Sie sie auf. Sie werden benötigt, um Ihrem Konto weitere Geräte hinzuzufügen (z. B. Ihr Mobiltelefon oder Laptop).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Speicherplatz: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Nicht markierte Ordner werden von Ihrem lokalen Dateisystem <b>entfernt</b> und werden auch nicht mehr auf diesem Rechner synchronisiert</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Alles synchronisieren</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Nichts synchronisieren</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Manuelle Änderungen übernehmen</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Anwenden</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Verbunden mit <server> als <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Kein Konto konfiguriert.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Neues Konto hinzufügen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Benutzerkonto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Dieses Konto unterstützt Ende-zu-Ende-Verschlüsselung</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Verschlüsselung aktivieren</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Gedächtnisstütze für E2E anzeigen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Verschlüsseln</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Ignorierte Dateien bearbeiten</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Zu synchronisierende Elemente auswählen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Synchronisierung jetzt erzwingen </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Synchronisierung neustarten</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Ordner-Synchronisierung entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Anlegen des Ordners fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Konnte lokalen Ordner <i>%1</i> nicht anlegen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bestätigen Sie die Löschung der Ordner-Synchronisierung</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Ordner-Synchronisierung entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Synchronisierung läuft</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Die Synchronisierung läuft gerade.<br/>Wollen Sie sie beenden?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 wird verwendet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 als <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Die Serverversion %1 ist veraltet und wird nicht mehr unterstützt! Fortfahren auf eigenes Risiko.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Verbunden mit %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 ist derzeit nicht verfügbar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 befindet sich im Wartungsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Abgemeldet von %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Berechtigung vom Browser einholen. <a href='%1'> KlickenSie hier </a>, um den Browser erneut zu öffnen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Verbinde mit %1 ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Keine Verbindung zu %1 auf %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Einloggen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Einige Verzeichnisse konnten nicht synchronisiert werden, da sie zu groß sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie externe Speicher sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie zu groß oder externe Speicher sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Konto wirklich entfernen?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Wollen Sie wirklich die Verbindung zum Konto <i>%1</i> lösen?</p><p><b>Anmerkung:</b> Dieser Vorgang wird <b>keine</b> Dateien löschen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Verbindung entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Ordner öffnen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Abmelden</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Synchronisierung fortsetzen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Synchronisierung pausieren</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Möchten Sie den Ordner <i>%1</i> wirklich nicht mehr synchronisieren?</p><p><b>Anmerkung:</b> Dies wird <b>keine</b> Dateien löschen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) von %2 Serverkapazität verwendet. Einige Ordner, einschließlich über das Netzwerk verbundene oder geteilte Ordner, können unterschiedliche Beschränkungen aufweisen. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 von %2 Serverkapazität verwendet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Keine %1-Verbindung konfiguriert.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Akzeptieren</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Synchronisiert</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Alle Uploads neu starten</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Für Konto %1 sind serverseitig keine Aktivitäten aktiviert.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Geben Sie Ihre Passphrase für Ende-zu-Ende-Verschlüsselung ein:<br><br>Benutzer: %2<br>Konto: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>E2E-Passphrase eingeben</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Vom Server zurückgegebener Fehler: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Fehler beim Zugriff auf den 'Token'-Endpunkt: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Der vom Server zurückgegebene JSON-Code konnte nicht verarbeitet werden: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Die Antwort des Servers enthielt nicht alle erwarteten Felder</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Mit %1 verbinden</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Melden Sie sich in Ihren Browser an (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>Der Browser kann nicht geöffnet werden. Bitte kopieren Sie den Link in Ihren Browser.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>Der Browser kann nicht geöffnet werden. Bitte kopieren Sie den Link in Ihren Browser.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 ist nicht lesbar.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 wurde gelöscht.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 wurde heruntergeladen.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 wurde aktualisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 wurde in %2 umbenannt.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 wurde in %2 verschoben.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 und %n andere Datei wurde gelöscht.</numerusform><numerusform>%1 und %n andere Dateien wurden gelöscht.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 und %n andere Datei wurde heruntergeladen.</numerusform><numerusform>%1 und %n andere Dateien wurden heruntergeladen.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 und %n andere Datei wurde aktualisiert.</numerusform><numerusform>%1 und %n andere Dateien wurden aktualisiert.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 wurde in %2 umbenannt und %n andere Datei wurde umbenannt.</numerusform><numerusform>%1 wurde in %2 umbenannt und %n andere Dateien wurden umbenannt.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 wurde in %2 verschoben und %n andere Datei wurde verschoben.</numerusform><numerusform>%1 wurde in %2 verschoben und %n andere Dateien wurden verschoben.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 und %n andere Datei haben Konflikte beim Abgleichen.</numerusform><numerusform>%1 und %n andere Dateien haben Konflikte beim Abgleichen.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>Es gab einen Konflikt bei der Synchronisierung von %1. Bitte prüfen Sie die Konfliktdatei!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 und %n weitere Datei konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform><numerusform>%1 und %n weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Details finden Sie im Protokoll.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 konnte aufgrund eines Fehlers nicht synchronisiert werden. Details finden Sie im Protokoll.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Synchronisierungsaktivität</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Ein neues Verzeichnis größer als %1 MB wurde hinzugefügt: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Ein Verzeichnis von einem externen Speicher wurde hinzugefügt. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Bitte wechseln Sie zu den Einstellungen, falls Sie das Verzeichnis herunterladen möchten.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Der Ordner %1 wurde erstellt, wurde jedoch zuvor von der Synchronisierung ausgeschlossen. Die darin enthaltenen Daten werden nicht synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Die Datei % 1 wurde erstellt, jedoch bereits zuvor von der Synchronisierung ausgeschlossen. Sie wird nicht synchronisiert werden.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,7 +961,7 @@ Dies bedeutet, dass der Synchronisierungs-Client lokale Änderungen möglicherwe %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -877,22 +972,22 @@ Wenn Sie sich dazu entscheiden, diese Dateien zu behalten, werden diese wieder z Wenn Sie sich zum Löschen der Dateien entscheiden, sind diese nicht mehr verfügbar, außer Sie sind der Eigentümer.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Neue Dateien herunterladen?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Neue Dateien herunterladen</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Lokale Dateien behalten</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -901,7 +996,7 @@ Sind Sie sich sicher, dass Sie diese Aktion mit Ihrem Server synchronisieren mö Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheiden, werden diese wieder vom Server synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -910,17 +1005,17 @@ Der Grund dafür ist möglicherweise, dass auf dem Server ein Backup eingespielt Wenn diese Synchronisierung fortgesetzt wird, werden Dateien eventuell von älteren Versionen überschrieben. Möchten Sie die neueren lokalen Dateien als Konflikt-Dateien behalten?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Backup erkannt</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Normale Synchronisierung</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Lokale Konfliktdateien behalten</translation> </message> @@ -1036,12 +1131,12 @@ Wenn diese Synchronisierung fortgesetzt wird, werden Dateien eventuell von älte <translation>Ordner-Synchronisierung hinzufügen</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Mit lokalem Verzeichnis synchronisiert</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>Synchronisiert mit lokalem Ordner (%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Datei</translation> </message> @@ -1071,7 +1166,7 @@ Wenn diese Synchronisierung fortgesetzt wird, werden Dateien eventuell von älte <translation>Fehler beim Empfang der Ordnerliste vom Server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Abgemeldet</translation> </message> @@ -1086,107 +1181,107 @@ Wenn diese Synchronisierung fortgesetzt wird, werden Dateien eventuell von älte <translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Suche nach Änderungen in '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Nach Änderungen suchen in '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 von %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 übrig, %1 von %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 of %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>Datei %1 von %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Warte...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Warte auf einen anderen Ordner</numerusform><numerusform>Warte auf %n andere Ordner</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Bereite Synchronisierung vor...</translation> </message> @@ -1317,11 +1412,6 @@ Wenn diese Synchronisierung fortgesetzt wird, werden Dateien eventuell von älte <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Impressum</translation> @@ -1472,32 +1562,45 @@ Wenn diese Synchronisierung fortgesetzt wird, werden Dateien eventuell von älte <translation>Nach Muster ignorierte Dateien</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Hinzufügen</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Dieser Eintrag wird vom System auf '%1' bereitgestellt und kann in dieser Ansicht nicht geändert werden.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Alle löschen</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation>IgnoreListTableWidget</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation>Muster</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation>Löschen erlauben</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>Hinzufügen</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation>Alle entfernen</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> @@ -1506,49 +1609,34 @@ Items where deletion is allowed will be deleted if they prevent a directory from Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn diese das Löschen eines Ordners verhindern würden. Dies ist für Metadaten nützlich.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation>Datei konnte nicht geöffnet werden</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> <translation>Konnte Änderungen nicht in '%1' schreiben.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation>Ignoriermuster hinzufügen</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Neues Ignoriermuster hinzufügen:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Dieser Eintrag wird vom System auf '%1' bereitgestellt und kann in dieser Ansicht nicht geändert werden.</translation> + <translation>Neues Ignoriermuster hinzufügen</translation> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Impressum</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Schliessen</translation> @@ -1680,11 +1768,6 @@ Protokolle werden in % 1 geschrieben</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Proxy-Einstellungen</translation> @@ -1994,11 +2077,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>Melden Sie sich in Ihrem Browser an</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Link in Zwischenablage kopieren</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2050,12 +2128,12 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <translation>&Weiter ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Ungültige URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Das Zertifikat konnte nicht geladen werden. Vielleicht ein falsches Passwort?</translation> </message> @@ -2133,79 +2211,79 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <translation>Der lokale Ordner %1 konnte nicht angelegt werden</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Keinen entfernten Ordner angegeben!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>erstelle Ordner auf Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Remoteordner %1 erfolgreich erstellt.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Der Ordner %1 ist auf dem Server bereits vorhanden. Verbinde zur Synchronisierung.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Das Erstellen des Verzeichnisses erzeugte den HTTP-Fehler-Code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehen Sie zurück und überprüfen Sie die Zugangsdaten.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Die Remote-Ordner-Erstellung ist fehlgeschlagen, vermutlich sind die angegebenen Zugangsdaten falsch.</font><br/>Bitte gehen Sie zurück und überprüfen Sie Ihre Zugangsdaten.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Remote-Ordner %1 konnte mit folgendem Fehler nicht erstellt werden: <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Eine Synchronisierungsverbindung für Ordner %1 zum entfernten Ordner %2 wurde eingerichtet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Erfolgreich verbunden mit %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Die Verbindung zu %1 konnte nicht hergestellt werden. Bitte prüfen Sie die Einstellungen erneut.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Ordner umbenennen fehlgeschlagen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Der Ordner kann nicht entfernt und gesichert werden, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schließen Sie den Ordner oder die Datei oder beenden Sie die Installation.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokaler Sync-Ordner %1 erfolgreich erstellt!</b></font></translation> </message> @@ -2213,12 +2291,12 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1-Verbindungsassistent</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Ordner-Konfiguration überspringen</translation> </message> @@ -2252,7 +2330,7 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> @@ -2280,32 +2358,32 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <translation>Der freie Speicher auf der Festplatte ist weniger als %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Die Datei wurde vom Server gelöscht</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Die Datei konnte nicht vollständig herunter geladen werden.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>Die heruntergeladene Datei ist leer, obwohl der Server %1 als Größe übermittelt hat.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Die Datei %1 kann aufgrund eines Konflikts mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Datei ist seit der Entdeckung geändert worden</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> @@ -2318,7 +2396,7 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <translation>; Wiederherstellung fehlgeschlagen: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Eine Datei oder ein Ordner wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1</translation> </message> @@ -2450,27 +2528,27 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Unerwarteter Rückgabe-Code Antwort vom Server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Fehlende Datei-ID vom Server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Fehlender ETag vom Server</translation> </message> @@ -2679,22 +2757,22 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Link teilen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Passwort:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Ablaufdatum:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -2767,22 +2845,22 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Mit Benutzern oder Gruppen teilen …</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Link kopieren</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Keine Ergebnisse für '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Ich habe etwas mit Ihnen geteilt</translation> </message> @@ -2800,22 +2878,27 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <translation>kann bearbeiten</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>kann weiterteilen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Freigabe aufheben</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>kann erstellen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>kann ändern</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>kann löschen</translation> </message> @@ -2842,7 +2925,7 @@ Es ist nicht ratsam, sie zu benutzen.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation>Debug-Ansicht der SSL-Chiffren</translation> </message> <message> @@ -3028,11 +3111,6 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Diesem Zertifikat trotzdem vertrauen</translation> @@ -3061,44 +3139,49 @@ Es ist nicht ratsam, sie zu benutzen.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organisation: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Einheit: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Land: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Fingerabdruck (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingerabdruck (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Fingerabdruck (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>Fingerabdruck (SHA-512): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Aktuelles Datum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Ablaufdatum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Aussteller: %1</translation> </message> @@ -3389,11 +3472,11 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Version %1. Für weitere Informationen besuchen Sie bitte <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Version %1. Für weitere Informationen klicken Sie bitte <a href='%2'>hier</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Diese Version wird von %1 bereitgestellt</p></translation> </message> @@ -3401,25 +3484,25 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Ungültiges Zertifikat gefunden</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> - <translation>Host "%1" hat ein ungültiges Zertifikat bereitgestellt. Fortfahren?</translation> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation>Der Server "%1" hat ein ungültiges Zertifikat. Fortsetzen?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Sie wurden von %1 als Benutzer %2 abgemeldet. Bitte melden Sie sich erneut an</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Mit folgendem Benutzer anmelden: %1</translation> </message> @@ -3487,11 +3570,6 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <translation>Einstellungen …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Details …</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Hilfe</translation> @@ -3603,6 +3681,11 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <translation>Neues Konto ...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Weitere Aktivitäten anzeigen…</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> @@ -3662,23 +3745,6 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Server</translation> @@ -3720,11 +3786,6 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <translation>&Lokaler Ordner</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Lokale Daten behalten</translation> @@ -3743,11 +3804,6 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Benutzername</translation> @@ -3761,11 +3817,6 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Bitte wechseln Sie zum Fortfahren in Ihren Browser.</translation> @@ -3780,21 +3831,15 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <source>Re-open Browser</source> <translation>Browser erneut öffnen</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Link kopieren</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Betreiben Sie Ihren eigenen Server</span></a></translation> @@ -3828,26 +3873,10 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Ihr gesamtes Konto wird mit dem lokalen Ordner synchronisiert.</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Schaltfläche</translation> - </message> </context> <context> <name>QObject</name> @@ -3902,7 +3931,7 @@ Es ist nicht ratsam, sie zu benutzen.</translation> <translation>vor einiger Zeit</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3985,14 +4014,6 @@ Es ist nicht ratsam, sie zu benutzen.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Formular</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_el.ts b/translations/client_el.ts index 733f962eb..9e49a24ba 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -9,22 +9,22 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/> <source>Checking for changes in '%1'</source> - <translation type="unfinished"/> + <translation>Γίνεται έλεγχος για αλλαγές στο '%1'</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/> <source>Syncing %1 of %2 (%3 left)</source> - <translation type="unfinished"/> + <translation>Συγχρονισμός %1 από %2 (%3 απομένουν)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/> <source>Syncing %1 of %2</source> - <translation type="unfinished"/> + <translation>Συγχρονισμός %1 από %2</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/> <source>Syncing %1 (%2 left)</source> - <translation type="unfinished"/> + <translation>Συγχρονισμός %1 (%2 απομένουν)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/> @@ -35,7 +35,7 @@ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation type="unfinished"/> + <translation>Δεν προστέθηκαν πρόσφατα αρχεία.</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> @@ -50,32 +50,32 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>Άνοιγμα ιστοσελίδας</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>Τροποποιήθηκαν πρόσφατα</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>Παύση συγχρονισμού</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>Βοήθεια</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>Ρυθμίσεις</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>Αποσύνδεση</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Παράθυρο διαλόγου</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Ετικέτα</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Φόρμα</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Επιλέξτε έναν τοπικό φάκελο στον υπολογιστή σας προς συγχρονισμό</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Επιλέξτε έναν απομακρυσμένο φάκελο προορισμού</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Χώρος αποθήκευσης: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Συγχρονισμός όλων</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Κανένας συγχρονισμός</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Χειροκίνητη αλλαγή εφαρμογών</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Εφαρμογή</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Άκυρο</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Συνδεδεμένοι με το <server> ως <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Δεν ρυθμίστηκε λογαριασμός.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Προσθήκη νέου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Αφαίρεση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Λογαριασμός</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Ενεργοποίηση κρυπτογράφησης</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Κρυπτογράφηση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Επιλέξτε τι θα συγχρονιστεί</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Εξαναγκασμός συγχρονισμού τώρα</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Επανεκκίνηση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Αποτυχία αφαίρεσης φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Αδυναμία δημιουργίας τοπικού φακέλου <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Επιβεβαίωση αφαίρεσης σύνδεσης συγχρονισμού φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Εκτελείται Συγχρονισμός </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <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="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 σε χρήση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 ως <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <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="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Συνδεδεμένο με %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Ο διακομιστής %1 δεν είναι διαθέσιμος προσωρινά.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> - <translation type="unfinished"/> + <translation>Ο διακομιστής %1 βρίσκεται τώρα σε κατάσταση συντήρησης.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Αποσυνδέθηκε από %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> - <translation type="unfinished"/> + <translation>Γίνεται λήψη της εξουσιοδότησης από το πρόγραμμα περιήγησης. Κάντε κλικ <a href='%1'>εδώ</a> για να ανοίξετε πάλι το πρόγραμμα περιήγησης.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Σύνδεση σε %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Δεν υπάρχει σύνδεση με το %1 στο %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Είσοδος</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <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="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <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="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <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="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Αφαίρεση σύνδεσης</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Άνοιγμα φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Αποσύνδεση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Συνέχιση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Παύση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <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="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 από %2 σε χρήση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation> </message> @@ -489,7 +541,7 @@ <message> <location filename="../src/gui/accountstate.cpp" line="128"/> <source>Maintenance mode</source> - <translation type="unfinished"/> + <translation>Κατάσταση συντήρησης</translation> </message> <message> <location filename="../src/gui/accountstate.cpp" line="130"/> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Αποδοχή</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> - <translation type="unfinished"/> + <translation>Συγχρονίστηκε</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> - <translation type="unfinished"/> + <translation>Επανάληψη όλων των μεταφορτώσεων</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Ο λογαριασμός %1 δεν έχει ενεργοποιήσει τις δραστηριότητες.</translation> </message> @@ -621,12 +663,12 @@ <message> <location filename="../src/gui/application.cpp" line="193"/> <source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source> - <translation type="unfinished"/> + <translation>Υπήρξε σφάλμα κατά την πρόσβαση του αρχείου ρυθμίσεων στο %1. Παρακαλώ επαληθεύστε αν μπορείτε να προσπελάσετε το αρχείο.</translation> </message> <message> <location filename="../src/gui/application.cpp" line="196"/> <source>Quit %1</source> - <translation type="unfinished"/> + <translation>Κλείσιμο %1</translation> </message> </context> <context> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Εισάγετε κωδικό E2E</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation> Το %1 δεν είναι αναγνώσιμο. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>Το %1 αφαιρέθηκε.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>Το %1 έχει ληφθεί.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>Το %1 έχει ενημερωθεί.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>Το %1 έχει μετονομαστεί σε %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>Το %1 έχει μετακινηθεί στο %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 και%n άλλo αρχείo(α) έχουν καταργηθεί.</numerusform><numerusform>%1 και%n άλλo αρχείo(α) έχουν καταργηθεί.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 και%n άλλο αρχείο(ο) έχουν ληφθεί.</numerusform><numerusform>%1 και%n άλλο αρχείο(ο) έχουν ληφθεί.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 και%n άλλο αρχείο(α) έχουν ενημερωθεί.</numerusform><numerusform>%1 και%n άλλο αρχείο(α) έχουν ενημερωθεί.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 μετονομάστηκε σε %2 και %n άλλο αρχείο(α) έχουν μετονομαστεί.</numerusform><numerusform>%1 μετονομάστηκε σε %2 και %n άλλο αρχείο(α) έχουν μετονομαστεί.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 έχει μετακινηθεί σε %2 και %n άλλo αρχείο(α) έχουν μετακινηθεί.</numerusform><numerusform>%1 έχει μετακινηθεί σε %2 και %n άλλo αρχείο(α) έχουν μετακινηθεί.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 έχει και %n άλλο αρχείο(α) έχουν διένεξη συγχρονισμού.</numerusform><numerusform>%1 έχει και %n άλλο αρχείο(α) έχουν διένεξη συγχρονισμού.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 έχει μια διένεξη συγχρονισμού. Παρακαλώ ελέγξτε τη διένεξη του αρχείου! </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 και %n άλλο(α) αρχείο(α) δεν μπορούν να συγχρονιστούν λόγω σφαλμάτων. Δείτε το ιστορικό για λεπτομέρειες</numerusform><numerusform>%1 και %n άλλο αρχείο(α) δεν μπορούν να συγχρονιστούν λόγω σφαλμάτων. Δείτε το ημερολόγιο για λεπτομέρειες. </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 δεν ήταν δυνατό να συγχρονιστεί εξαιτίας ενός σφάλματος. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Δραστηριότητα Συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <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="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Προστέθηκε ένας φάκελος από εξωτερικό αποθηκευτικό χώρο. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <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="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Λήψη νέων αρχείων;</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Λήψη νέων αρχείων</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Διατήρηση τοπικών αρχείων</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Αν αυτό ήταν ένα ατύχημα και αποφασίσατε να διατηρήσετε τα αρχεία σας, θα συγχρονιστούν εκ νέου από το διακομιστή.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -903,17 +998,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="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Ανιχνεύθηκε αντίγραφο ασφαλείας</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Κανονικός συγχρονισμός</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Διατήρηση τοπικών αρχείων ως Διένεξη</translation> </message> @@ -963,7 +1058,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderman.cpp" line="1220"/> <source>Sync was successful, unresolved conflicts.</source> - <translation type="unfinished"/> + <translation>Ο συγχρονισμός ήταν επιτυχής, μη διευθετημένες διενέξεις.</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1222"/> @@ -1029,12 +1124,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Προσθήκη σύνδεσης συγχρονισμού φακέλου</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Αρχείο</translation> </message> @@ -1064,7 +1159,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Σφάλμα κατά τη φόρτωση της λίστας φακέλων από το διακομιστή.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Αποσύνδεση</translation> </message> @@ -1076,110 +1171,110 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> <source>There are unresolved conflicts. Click for details.</source> - <translation type="unfinished"/> + <translation>Υπάρχουν μη επιλύσιμες συγκρούσεις. Πατήστε εδώ για λεπτομέρειες.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Συγχρονισμός %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>λήψη %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>μεταφόρτωση %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> - <translation type="unfinished"/> + <translation>Γίνεται έλεγχος για αλλαγές στο τοπικό '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 από %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Απομένει %5, %1 από %2, αρχείο %3 από %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 από %2, αρχείο %3 από %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>αρχείο %1 από %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Αναμονή...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Αναμονή για %n άλλο φάκελο...</numerusform><numerusform>Αναμονή για %n άλλους φακέλους...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Προετοιμασία για συγχρονισμό...</translation> </message> @@ -1310,11 +1405,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Νομική ειδοποίηση</translation> @@ -1332,7 +1422,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.ui" line="89"/> <source>Show Server &Notifications</source> - <translation type="unfinished"/> + <translation>Εμφάνιση των ειδοποιήσεων διακομιστή</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="163"/> @@ -1399,7 +1489,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.cpp" line="49"/> <source>Server notifications that require attention.</source> - <translation type="unfinished"/> + <translation>Ειδοποιήσεις από τον διακομιστή που απαιτούν την προσοχή σας.</translation> </message> </context> <context> @@ -1463,83 +1553,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Αρχεία που αγνοούνται από τα πρότυπα</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Προσθήκη</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Αυτή η είσοδος παρέχεται από το σύστημα στο '%1' και δεν μπορεί να τροποποιηθεί σε αυτή την προβολή.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Αφαίρεση όλων</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Πρότυπα</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Να πειτρέπεται η διαγραφή</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Αφαίρεση</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>Αρχεία ή φάκελοι αρχείων που ταιριάζουν με αυτό το πρότυπο δεν θα συγχρονιστούν. - -Τα στοιχεία όπου επιτρέπεται η διαγραφή θα διαγράφονται εάν εμποδίζουν την αφαίρεση ενός φακέλου αρχείων. Αυτό είναι χρήσιμο για μετα-δεδομένα.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Αδυναμία ανοίγματος αρχείου</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Αδυναμία εγγραφής αλλαγών στο '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Προσθήκη Προτύπου Αγνόησης</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Προσθήκη νέου προτύπου αγνόησης:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Αυτή η είσοδος παρέχεται από το σύστημα στο '%1' και δεν μπορεί να τροποποιηθεί σε αυτή την προβολή.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Παράθυρο διαλόγου</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Νομική ειδοποίηση</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Κλείσιμο</translation> @@ -1580,7 +1666,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/logbrowser.cpp" line="101"/> <source>Permanently save logs</source> - <translation type="unfinished"/> + <translation>Μόνιμη αποθήκευση των αρχείων καταγραφής</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="103"/> @@ -1669,11 +1755,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Ρυθμίσεις Ενδιάμεσου Διακομιστή</translation> @@ -1779,7 +1860,7 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/creds/oauth.cpp" line="112"/> <source>Error returned from the server: <em>%1</em></source> - <translation type="unfinished"/> + <translation>Ο διακομιστής επέστρεψε το σφάλμα: <em>%1</em></translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="115"/> @@ -1902,7 +1983,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/> <source>Free space: %1</source> - <translation type="unfinished"/> + <translation>Ελεύθερος χώρος: %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> @@ -1918,7 +1999,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> <source>There isn't enough free space in the local folder!</source> - <translation type="unfinished"/> + <translation>Δεν υπάρχει αρκετός ελεύθερος χώρος στον τοπικό φάκελο!</translation> </message> </context> <context> @@ -1982,12 +2063,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> <source>Login in your browser</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Αντιγραφή συνδέσμου στο πρόχειρο</translation> + <translation>Σύνδεση στον προεπιλεγμένο περιηγητή ιστοσελίδων</translation> </message> </context> <context> @@ -2005,22 +2081,22 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="83"/> <source>Keep your data secure and under your control</source> - <translation type="unfinished"/> + <translation>Διατηρείστε τα δεδομένα σας ασφαλή και υπό τον έλεγχο σας</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/> <source>Secure collaboration & file exchange</source> - <translation type="unfinished"/> + <translation>Ασφαλής συνεργασία & ανταλλαγή αρχείων</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/> <source>Easy-to-use web mail, calendaring & contacts</source> - <translation type="unfinished"/> + <translation>Εύχρηστο web mail, ημερολόγιο & επαφές</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/> <source>Screensharing, online meetings & web conferences</source> - <translation type="unfinished"/> + <translation>Κοινή χρήση οθόνης, ηλεκτρονικές συναντήσεις & συνέδρια</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="180"/> @@ -2040,14 +2116,14 @@ It is not advisable to use it.</source> <translation>&Επόμενο ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> - <translation type="unfinished"/> + <translation>Μη έγκυρη διεύθυνση URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> - <translation type="unfinished"/> + <translation>Δεν ήταν δυνατή η φόρτωση του πιστοποιητικού. Ίσος είναι λάθος ο κωδικός;</translation> </message> </context> <context> @@ -2095,7 +2171,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> <source>The server reported the following error:</source> - <translation type="unfinished"/> + <translation>Ο διακομιστής αναφέρει το ακόλουθο σφάλμα:</translation> </message> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/> @@ -2123,79 +2199,79 @@ It is not advisable to use it.</source> <translation>Αδυναμία δημιουργίας τοπικού φακέλου %1 </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Δεν προσδιορίστηκε κανένας απομακρυσμένος φάκελος!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Σφάλμα: %1 </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> - <translation type="unfinished"/> + <translation>δημιουργία φακέλου στο Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Ο απομακρυσμένος φάκελος %1 δημιουργήθηκε με επιτυχία.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Ο απομακρυσμένος φάκελος %1 υπάρχει ήδη. Θα συνδεθεί για συγχρονισμό. </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Η δημιουργία φακέλου είχε ως αποτέλεσμα τον κωδικό σφάλματος HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <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="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <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="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <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="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Επιτυχής σύνδεση με %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Αδυναμία σύνδεσης στον %1. Παρακαλώ ελέξτε ξανά.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Αποτυχία μετονομασίας φακέλου</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Επιτυχής δημιουργία τοπικού φακέλου %1 για συγχρονισμό!</b></font></translation> </message> @@ -2203,12 +2279,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Οδηγός Σύνδεσης</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Παράλειψη διαμόρφωσης φακέλων</translation> </message> @@ -2242,7 +2318,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> </message> @@ -2252,7 +2328,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/propagatedownload.cpp" line="364"/> <source>File %1 can not be downloaded because encryption information is missing.</source> - <translation type="unfinished"/> + <translation>Δεν είναι δυνατή η λήψη του αρχείου %1, διότι λείπουν οι πληροφορίες κρυπτογράφησης.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="434"/> @@ -2270,32 +2346,32 @@ It is not advisable to use it.</source> <translation>Ο διαθέσιμος χώρος στο δίσκο είναι λιγότερος από %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Το αρχείο διαγράφηκε από τον διακομιστή</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <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="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> </message> @@ -2308,7 +2384,7 @@ It is not advisable to use it.</source> <translation>; Η Αποκατάσταση Απέτυχε: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Ένα αρχείο ή ένας κατάλογος αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση, αλλά η επαναφορά απέτυχε: %1</translation> </message> @@ -2440,27 +2516,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Ο διακομιστής επέστρεψε απροσδόκητο κωδικό (%1) </translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Απουσία ID αρχείου από τον διακομιστή</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Απουσία ETag από τον διακομιστή</translation> </message> @@ -2669,22 +2745,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> - <translation type="unfinished"/> + <translation>&Διαμοιρασμός συνδέσμου</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Συνθηματικό :</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Ημερομηνία λήξης:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -2706,7 +2782,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Allow Upload && Editing</source> - <translation type="unfinished"/> + <translation>Επιτρέψτε την Μεταφόρτωση && Επεξεργασία</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> @@ -2757,22 +2833,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <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="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Αντιγραφή συνδέσμου</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Κανένα αποτέλεσμα για '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation type="unfinished"/> </message> @@ -2790,22 +2866,27 @@ It is not advisable to use it.</source> <translation>δυνατότητα επεξεργασίας</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Δυνατότητα να διαμοιραστεί ξανά</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Διακοπή διαμοιρασμού</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Δυνατότητα δημιουργίας</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> - <translation type="unfinished"/> + <translation>Μπορεί να αλλάξει</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Μπορεί να διαγράψει</translation> </message> @@ -2832,8 +2913,8 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Προβολή SSL Chipher Debug </translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3018,11 +3099,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Προσθήκη αυτού του πιστοποιητικού στα έμπιστα παρ'όλα αυτά</translation> @@ -3051,44 +3127,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Οργανισμός: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Μονάδα: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Χώρα: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Αποτύπωμα (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Αποτύπωμα (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Ημερομηνία Έναρξης: 1%</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Ημερομηνία Λήξης: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Εκδότης: %1</translation> </message> @@ -3379,11 +3460,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Έκδοση %1. Για περισσότερες πληροφορίες δείτε <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3391,25 +3472,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> - <translation type="unfinished"/> + <translation>Εντοπίστηκε μη έγκυρο πιστοποιητικό</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3477,11 +3558,6 @@ It is not advisable to use it.</source> <translation>Ρυθμίσεις...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Λεπτομέρειες...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Βοήθεια</translation> @@ -3593,6 +3669,11 @@ It is not advisable to use it.</source> <translation>Νέος λογαριασμός...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3652,23 +3733,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Διακομιστής</translation> @@ -3710,11 +3774,6 @@ It is not advisable to use it.</source> <translation>&Τοπικός Φάκελος</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Διατήρηση τοπικών δεδομένων</translation> @@ -3733,11 +3792,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Όνομα Χρήστη</translation> @@ -3751,11 +3805,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation type="unfinished"/> @@ -3770,21 +3819,15 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3818,26 +3861,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Ολόκληρος ο λογαριασμός σας έχει συγχρονιστεί με τον τοπικό φάκελο</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3892,7 +3919,7 @@ It is not advisable to use it.</source> <translation>Λίγη ώρα πριν</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3975,14 +4002,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_en.ts b/translations/client_en.ts index e533ffe82..ec872db5f 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -88,11 +88,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"></translation> @@ -118,13 +113,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"></translation> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation type="unfinished"></translation> @@ -138,11 +184,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation type="unfinished"></translation> @@ -189,12 +230,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"></translation> </message> @@ -202,266 +243,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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 type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <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> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation type="unfinished"></translation> </message> @@ -545,32 +597,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation type="unfinished"></translation> </message> @@ -657,7 +699,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation type="unfinished"></translation> </message> @@ -665,12 +707,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"></translation> </message> @@ -725,6 +767,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"></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> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -742,36 +837,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -779,7 +874,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -787,7 +882,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -795,7 +890,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -803,7 +898,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -811,7 +906,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -819,12 +914,12 @@ </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -832,49 +927,49 @@ </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -883,7 +978,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -891,46 +986,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"></translation> </message> @@ -1046,12 +1141,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation type="unfinished"></translation> </message> @@ -1081,7 +1176,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> @@ -1096,102 +1191,102 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1199,7 +1294,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation type="unfinished"></translation> </message> @@ -1330,11 +1425,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"></translation> @@ -1483,81 +1573,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"></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> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"></translation> @@ -1687,11 +1775,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation type="unfinished"></translation> @@ -2001,11 +2084,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2056,12 +2134,12 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"></translation> </message> @@ -2139,79 +2217,79 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation type="unfinished"></translation> </message> @@ -2219,12 +2297,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation type="unfinished"></translation> </message> @@ -2258,7 +2336,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation type="unfinished"></translation> </message> @@ -2286,32 +2364,32 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation type="unfinished"></translation> </message> @@ -2324,7 +2402,7 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"></translation> </message> @@ -2456,27 +2534,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation type="unfinished"></translation> </message> @@ -2685,22 +2763,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> @@ -2773,22 +2851,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation type="unfinished"></translation> </message> @@ -2806,22 +2884,27 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"></translation> </message> @@ -2848,7 +2931,7 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"></translation> </message> <message> @@ -3032,11 +3115,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation type="unfinished"></translation> @@ -3065,44 +3143,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> + <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> - <source>Fingerprint (SHA1): <tt>%1</tt></source> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation type="unfinished"></translation> </message> @@ -3393,11 +3476,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"></translation> </message> @@ -3405,25 +3488,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"></translation> </message> @@ -3491,11 +3574,6 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation type="unfinished"></translation> @@ -3607,6 +3685,11 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"></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> @@ -3666,23 +3749,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation type="unfinished"></translation> @@ -3724,11 +3790,6 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation type="unfinished"></translation> @@ -3747,11 +3808,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation type="unfinished"></translation> @@ -3765,11 +3821,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation type="unfinished"></translation> @@ -3784,20 +3835,14 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>OwncloudSetupPage</name> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>OwncloudSetupPage</name> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> @@ -3832,26 +3877,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>QObject</name> @@ -3924,7 +3953,7 @@ It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation type="unfinished"></translation> @@ -4025,14 +4054,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 6d9c37127..84b373b01 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialogue</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Label</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Form</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Pick a local folder on your computer to sync</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Select a remote destination folder</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>End to end encryption mnemonic</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Storage space: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronised to this computer any more</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Synchronise all</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Synchronize none</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Apply manual changes</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Apply</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Connected with <server> as <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No account configured.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Add new</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Remove</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Show E2E mnemonic</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Encrypt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Choose what to sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Force sync now</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Restart sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Remove folder sync connection</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Folder creation failed</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Could not create local folder <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirm Folder Sync Connection Removal</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Remove Folder Sync Connection</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sync Running</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>The syncing operation is running.<br/>Do you want to terminate it?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 in use</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 as <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>The server version %1 is old and unsupported! Proceed at your own risk.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Connected to %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 is temporarily unavailable.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 is currently in maintenance mode.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Signed out from %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obtaining authorisation from the browser. <a href='%1'>Click here</a> to re-open the browser.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Connecting to %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>No connection to %1 at %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Log in</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>There are folders that were not synchronised because they are too big: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>There are folders that were not synchronised because they are external storages: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>There are folders that were not synchronised because they are too big or external storages: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirm Account Removal</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>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></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Remove connection</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Open folder</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Log out</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Resume sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pause sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>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></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 of %2 in use</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Currently there is no storage usage information available.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No %1 connection configured.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Retry all uploads</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Account %1 does not have activities enabled.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error writing metadata to the database</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Enter E2E passphrase</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 is not readable.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 has been removed.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 has been downloaded.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 has been updated.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 has been renamed to %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 has been moved to %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 and %n other file have been removed.</numerusform><numerusform>%1 and %n other files have been removed.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 and %n other file have been downloaded.</numerusform><numerusform>%1 and %n other files have been downloaded.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 and %n other file have been updated.</numerusform><numerusform>%1 and %n other files have been updated.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 has been renamed to %2 and %n other file have been renamed.</numerusform><numerusform>%1 has been renamed to %2 and %n other files have been renamed.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 has been moved to %2 and %n other file have been moved.</numerusform><numerusform>%1 has been moved to %2 and %n other files have been moved.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 has and %n other file have sync conflicts.</numerusform><numerusform>%1 has and %n other files have sync conflicts.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 has a sync conflict. Please check the conflict file!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 and %n other file could not be synced due to errors. See the log for details.</numerusform><numerusform>%1 and %n other files could not be synced due to errors. See the log for details.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 could not be synced due to an error. See the log for details.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sync Activity</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Could not read system exclude file</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>A new folder larger than %1 MB has been added: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>A folder from an external storage has been added. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Please go in the settings to select it if you wish to download it.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,7 +961,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -877,22 +972,22 @@ If you decide to keep the files, they will be re-synced with the server if you h If you decide to delete the files, they will be unavailable to you, unless you are the owner.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Download new files?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Download new files</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Keep local files</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -901,7 +996,7 @@ Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -910,17 +1005,17 @@ 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?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Backup detected</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Normal Synchronisation</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Keep Local Files as Conflict</translation> </message> @@ -1036,12 +1131,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Add Folder Sync Connection</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Synchronized with local folder</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>File</translation> </message> @@ -1071,7 +1166,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Error while loading the list of folders from the server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Signed out</translation> </message> @@ -1086,107 +1181,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>There are unresolved conflicts. Click for details.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciling changes</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Syncing %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Checking for changes in remote '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Checking for changes in local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 of %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 left, %1 of %2, file %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 of %2, file %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>file %1 of %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Waiting...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Waiting for %n other folder...</numerusform><numerusform>Waiting for %n other folders...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparing to sync...</translation> </message> @@ -1317,11 +1412,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Legal notice</translation> @@ -1472,83 +1562,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Files Ignored by Patterns</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Add</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>This entry is provided by the system at '%1' and cannot be modified in this view.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Remove all</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Pattern</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Allow Deletion</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Remove</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Files or folders matching a pattern will not be synchronised. - -Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Could not open file</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Cannot write changes to '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Add Ignore Pattern</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Add a new ignore pattern:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>This entry is provided by the system at '%1' and cannot be modified in this view.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialogue</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Legal notice</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Close</translation> @@ -1680,11 +1766,6 @@ Logs will be written to %1</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Proxy Settings</translation> @@ -1995,11 +2076,6 @@ for additional privileges during the process.</translation> <source>Login in your browser</source> <translation>Login in your browser</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Copy link to clipboard</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2051,12 +2127,12 @@ It is not advisable to use it.</translation> <translation>&Next ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Invalid URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Could not load certificate. Maybe wrong password?</translation> </message> @@ -2134,79 +2210,79 @@ It is not advisable to use it.</translation> <translation>Could not create local folder %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>No remote folder specified!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>creating folder on Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Remote folder %1 created successfully.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>The remote folder %1 already exists. Connecting it for syncing.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>The folder creation resulted in HTTP error code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Remote folder %1 creation failed with error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>A sync connection from %1 to remote directory %2 was set up.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Successfully connected to %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Connection to %1 could not be established. Please check again.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Folder rename failed</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>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.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Local sync folder %1 successfully created!</b></font></translation> </message> @@ -2214,12 +2290,12 @@ It is not advisable to use it.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Connection Wizard</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Skip folders configuration</translation> </message> @@ -2253,7 +2329,7 @@ It is not advisable to use it.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Error writing metadata to the database</translation> </message> @@ -2281,32 +2357,32 @@ It is not advisable to use it.</translation> <translation>Free space on disk is less than %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>File was deleted from server</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>The file could not be downloaded completely.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>File %1 cannot be saved because of a local file name clash!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>File has changed since discovery</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error writing metadata to the database</translation> </message> @@ -2319,7 +2395,7 @@ It is not advisable to use it.</translation> <translation>; Restoration Failed: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>A file or folder was removed from a read only share, but restoring failed: %1</translation> </message> @@ -2451,27 +2527,27 @@ It is not advisable to use it.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>The local file was removed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Local file changed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Unexpected return code from server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Missing File ID from server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Missing ETag from server</translation> </message> @@ -2680,22 +2756,22 @@ It is not advisable to use it.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Share link</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Password:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Expiration date:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -2768,22 +2844,22 @@ It is not advisable to use it.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Share with users or groups ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Copy link</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No results for '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>I shared something with you</translation> </message> @@ -2801,22 +2877,27 @@ It is not advisable to use it.</translation> <translation>can edit</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Can reshare</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Can create</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Can change</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Can delete</translation> </message> @@ -2843,8 +2924,8 @@ It is not advisable to use it.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>SSL Cipher Debug View</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3029,11 +3110,6 @@ It is not advisable to use it.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Trust this certificate anyway</translation> @@ -3062,44 +3138,49 @@ It is not advisable to use it.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organisation: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unit: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Country: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Fingerprint (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingerprint (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Effective Date: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Expiration Date: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Issuer: %1</translation> </message> @@ -3390,11 +3471,11 @@ It is not advisable to use it.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>This release was supplied by %1</p></translation> </message> @@ -3402,25 +3483,25 @@ It is not advisable to use it.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>You have been logged out of %1 as user %2. Please login again</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Please login with the user: %1</translation> </message> @@ -3488,11 +3569,6 @@ It is not advisable to use it.</translation> <translation>Settings...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Details...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Help</translation> @@ -3604,6 +3680,11 @@ It is not advisable to use it.</translation> <translation>New account...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3663,23 +3744,6 @@ It is not advisable to use it.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Server</translation> @@ -3721,11 +3785,6 @@ It is not advisable to use it.</translation> <translation>&Local Folder</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Keep local data</translation> @@ -3744,11 +3803,6 @@ It is not advisable to use it.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Username</translation> @@ -3762,11 +3816,6 @@ It is not advisable to use it.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Please switch to your browser to proceed.</translation> @@ -3781,21 +3830,15 @@ It is not advisable to use it.</translation> <source>Re-open Browser</source> <translation>Re-open Browser</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></translation> @@ -3829,26 +3872,10 @@ It is not advisable to use it.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Your entire account is synced to the local folder </translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3903,7 +3930,7 @@ It is not advisable to use it.</translation> <translation>Some time ago</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3986,14 +4013,6 @@ It is not advisable to use it.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Form</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_eo.ts b/translations/client_eo.ts index 16686ba4e..9d5193b2d 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialogo</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etikedo</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Elektilo</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Elekti lokan dosierujon ĉe via komputilo por sinkronigi</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Elektu foran celdosierujon</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Memorigilo por tutvoja ĉifrado</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Por protekti vian ĉifran identecon, ni ĉifras ĝin kun memorigilo de 12 vortoj el la vortaro. Bv. noti tiujn kaj gardi tion en sekura loko. Vi bezonos ilin por aldoni aliajn aparatojn al via konto (kiel via poŝtelefono aŭ via portebla komputilo).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Konserveja spaco: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Malmarkitaj dosierujoj estos <b>forigitaj</b> el via loka dosiersistemo kaj ne plu estos sinkronigitaj ĉe tiu ĉi komputilo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Ĉion sinkronigi</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sinkronigi neniu</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Validigi permanajn ŝanĝojn</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Validigi</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Nuligi</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Konektita kun servilo <server> kiel uzanto <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Neniu konto agordita.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Aldoni novan</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Forigi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Tiu konto subtenas tutvojan ĉifradon</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Ebligi ĉifradon</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Montri E2E memorigilon</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Ĉifri</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elekti tion, kion sinkronigi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Sinkronigi nun</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Rekomenci sinkronigon</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Ne plu sinkronigi tiun dosierujon</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Kreo de dosierujo malsukcesis</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Ne eblis krei lokan dosierujon <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Konfirmu la forigadon de la sinkronigo de tiu dosierujo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Ne plu sinkronigi tiun dosierujon</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sinkronigo ruliĝanta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Sinkronigo estas ruliĝanta.<br/>Ĉu vi volas fini ĝin?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 uzata(j)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 per la konto <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>La servilo je versio %1 estas malnova kaj nesubtenata. Daŭrigu je via risko.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Konektita al %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Servilo %1 dumtempe ne disponeblas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>La servilo %1 estas en reĝimo de prizorgado</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Elsalutita de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Atendante rajtigon el la retumilo. <a href='%1'>Alklaku ĉi tie</a> por remalfermi la retumilon.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Konektante al %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Neniu konekto al servilo %1 je la adreso %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Ensaluti</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Kelkaj dosierujoj ne sinkroniĝis, ĉar ili estas tro grandaj:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Kelkaj dosierujoj ne sinkroniĝis, ĉar ili estas konservataj en ekstera konservejo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Kelkaj dosierujoj ne sinkroniĝis, ĉar ili estas tro grandaj âù konservataj en ekstera konservejo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Konfirmi forigadon de la konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Ĉu vi vere volas forigi konekton al la konto <i>%1</i>?</p><p><b>Notu:</b> Tio <b>ne</b> forigos la dosierojn.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Forigi konekton</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Malfermi dosierujon</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Elsaluti</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Daŭrigi sinkronigon</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Paŭzigi sinkronigon</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Ĉu vi vere volas ĉesi sinkronigi la dosierujon <i>%1</i>?</p><p><b>Notu:</b> Tio <b>ne</b> forigos la dosierojn.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) el %2 uzataj. Certaj dosierujoj, inkluzive de rete muntitaj aŭ kunhavigitaj dosierujoj, eble havas aliajn limigojn.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 el %2 uzitaj</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Ĉi-momente estas neniu informo pri konservejospaco.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Neniu konekto al %1 agordita.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Akcepti</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Sinkronigita</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Reprovi ĉiujn alŝutoj</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Konto %1 ne havas ebligitajn aktivaĵojn.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Eraro dum konservado de pridatumoj en la datumbazo</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Bv. entajpi vian pasfrazon de tutvoja ĉifrado:<br><br>Uzanto: %2<br>Konto: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Entajpu E2E (tutvoja) pasfrazon</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 ne estas legebla.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 estis forigita.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 estis elŝutita.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 estis ĝisdatigita.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 estis alinomita al %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 estis movita al %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 estis forigita.</numerusform><numerusform>%1 kaj %n plia(j) dosiero(j) estis forigitaj.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 estis elŝutita.</numerusform><numerusform>%1 kaj %n plia(j) dosiero(j) estis elŝutitaj.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 ĝisdatiĝis.</numerusform><numerusform>%1 kaj %n plia(j) dosiero(j) ĝisdatiĝis.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 estis alinomita al %2.</numerusform><numerusform>%1 estis alinomita al %2, kaj %n plia(j) dosiero(j) estis alinomitaj.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 estis movita al %2.</numerusform><numerusform>%1 estis movita al %2, kaj %n plia(j) dosiero(j) estis movitaj.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 havas sinkronigajn konfliktojn.</numerusform><numerusform>%1 kaj %n plia(j) dosiero(j) havas sinkronigajn konfliktojn.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 havas sinkronigan konflikton. Bv. kontroli la dosieron pri konfliktoj!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 ne estis sinkronigita pro eraroj. Vidu la protokolon por detaloj.</numerusform><numerusform>%1 kaj %n plia(j) dosiero(j) ne estis sinkronigitaj pro eraroj. Vidu la protokolon por detaloj.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 ne estis sinkronigita pro eraro. Vidu la protokolon por detaloj.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sinkronigaj aktivaĵoj</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Ne eblis legi la sisteman dosieron pri esceptoj</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Nova dosierujo pli granda ol %1 MB estis aldonita: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Dosierujo el ekstera konservejo estis aldonita. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Bv. iri al la agordoj por elekti, ĉu vi volas elŝuti ĝin.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>La dosierujo %1 estis kreita sed estis eksigita el sinkronigo antaŭe. Datumoj ene de ĝi ne estos sinkronigitaj.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>La dosiero %1 estis kreita sed estis eksigita el sinkronigo antaŭe. Ĝi ne estos sinkronigita.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,7 +961,7 @@ Tio signifas, ke la sinkroniga kliento eble ne alŝutas tuj lokajn ŝanĝojn kaj %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -877,22 +972,22 @@ Se vi decidas gardi la dosierojn, ili estos resinkronigitaj al la servilo, se vi Se vi decidas forigi la dosierojn, ili ne plus estos haveblaj al vi, krom se vi estas la posedanto.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Ĉu elŝuti la novajn dosierojn?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Elŝuti la novajn dosierojn</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Gardi la lokajn dosierojn</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -901,7 +996,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Se tio estis neintenca kaj se vi decidas gardi viajn dosierojn, ili estos resinkronigitaj el la servilo.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -910,17 +1005,17 @@ Tio estas eble kaŭzita de restaŭro de savkopio ĉe la servilo. Se vi plu sinkronigas, la sinkronigo anstataŭigos ĉiujn viajn dosierojn per antaŭaj versioj el viaj dosieroj. Ĉu vi volas gardi la plej freŝajn dosierojn kiel konfliktajn dosierojn?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Savkopio eltrovita</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Kutima sinkronigo</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Konservi la lokajn dosierojn kiel konfliktojn</translation> </message> @@ -1036,12 +1131,12 @@ Se vi plu sinkronigas, la sinkronigo anstataŭigos ĉiujn viajn dosierojn per an <translation>Aldoni dosierujan sinkronigon</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Sinkronigita kun loka dosierujo</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Dosiero</translation> </message> @@ -1071,7 +1166,7 @@ Se vi plu sinkronigas, la sinkronigo anstataŭigos ĉiujn viajn dosierojn per an <translation>Eraro dum ŝargado de la listo de dosierujoj el la servilo.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Elsalutita</translation> </message> @@ -1086,107 +1181,107 @@ Se vi plu sinkronigas, la sinkronigo anstataŭigos ĉiujn viajn dosierojn per an <translation>Estas nesolvitaj konfliktoj. Alklaku por detaloj.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Komparante ŝanĝoj</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>„%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sinkronigo de %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>elŝuto %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>alŝuto %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Kontrolante ŝanĝojn en fora „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Kontrolante ŝanĝojn en loka „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 el %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restas, %1 el %2, dosiero %3 el %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 el %2, dosiero %3 el %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>dosiero %1 el %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Atendante...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Atendante %n plian dosierujon....</numerusform><numerusform>Atendante %n pliajn dosierujojn....</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Pretigante sinkronigon...</translation> </message> @@ -1317,11 +1412,6 @@ Se vi plu sinkronigas, la sinkronigo anstataŭigos ĉiujn viajn dosierojn per an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Atentigo pri kopirajto</translation> @@ -1472,83 +1562,79 @@ Se vi plu sinkronigas, la sinkronigo anstataŭigos ĉiujn viajn dosierojn per an <translation>Dosieroj ignoritaj per nomomodeloj</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Aldoni</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Tiu elemento estas provizita de la sistemo en „%1“, kaj ĝi ne povas esti modifita tie ĉi.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Ĉion forigi</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Modelo</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permesi forigon</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Forigi</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Dosieroj aŭ dosierujoj, kiuj kongruas kun la modelo ne sinkroniĝos. - -Elementoj, kun opcio „Permesi forigon“ ebligita, estos forigitaj, se ili malhelpas forigon de dosierujo; tio utilas por pridatumoj.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Ne eblis malfermi dosieron</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Ne eblas skribi ŝanĝojn al „%1“. </translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Aldoni ignoran modelon</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Aldoni novan ignoran modelon:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Tiu elemento estas provizita de la sistemo en „%1“, kaj ĝi ne povas esti modifita tie ĉi.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialogo</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Atentigo pri kopirajto</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Fermi</translation> @@ -1680,11 +1766,6 @@ Protokoloj estos skribataj al %1.</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Agordoj pri prokurilo</translation> @@ -1994,11 +2075,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>Ensaluti pere de via retumilo</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Kopii ligilon al tondujo</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2050,12 +2126,12 @@ Uzi ĝin ne konsilindas.</translation> <translation>&Sekva ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Nevalida retadreso</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Ne eblis ŝargi atestilon. Ĉu neĝusta pasvorto?</translation> </message> @@ -2133,79 +2209,79 @@ Uzi ĝin ne konsilindas.</translation> <translation>Ne eblis krei lokan dosierujon %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Neniu fora dosierujo specifita!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Eraro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>kreado de dosierujo ĉe Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Fora dosierujo %1 sukcese kreita</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La fora dosierujo %1 jam ekzistas. Konektante.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Dosieruja kreado ricevis HTTP-eraran kodon %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Kreo de fora dosierujo malsukcesis, ĉar la akreditiloj ne ĝustas!<br/>Bv. antaŭeniri kaj kontroli viajn akreditilojn.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Kreado de fora dosierujo malsukcesis, eble ĉar la akreditiloj ne ĝustas.</font><br/>Bv. antaŭeniri kaj kontroli viajn akreditilojn.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Kreado de fora dosierujo %1 malsukcesis kun eraro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Sinkroniga konekto el %1 al fora dosierujo %2 agordiĝis.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Sukcese konektita al %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Konekto al %1 ne eblis. Bv. rekontroli.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Dosieruja alinomado malsukcesis.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Ne eblas forigi kaj savkopii la dosierujon, ĉar tiu dosierujo aŭ iu dosiero ene de ĝi estas malfermita en alia programo. Bv. malfermi la dosierujon aŭ dosieron kaj reprovi, aŭ nuligu la agordojn.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Loka sinkroniga dosierujo %1 sukcese kreita!</b></font></translation> </message> @@ -2213,12 +2289,12 @@ Uzi ĝin ne konsilindas.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>Asistilo pri konekto %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Preterpasi agordon de dosierujoj</translation> </message> @@ -2252,7 +2328,7 @@ Uzi ĝin ne konsilindas.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Eraro dum skribo de pridatumoj en la datumbazo</translation> </message> @@ -2280,32 +2356,32 @@ Uzi ĝin ne konsilindas.</translation> <translation>Libera diskospaco estas malpli ol %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Dosiero estis forigita el la servilo</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>La dosiero ne estis elŝutita plene.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>La elŝutita dosiero malplenas, kvankam la servilo anoncis, ke ĝi estos %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Dosiero %1 ne eblis esti konservita pro konflikto kun loka dosiernomo!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Dosiero ŝanĝiĝis ekde sia malkovro</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Eraro dum konservado de pridatumoj en la datumbazo</translation> </message> @@ -2318,7 +2394,7 @@ Uzi ĝin ne konsilindas.</translation> <translation>; malsukcesis la restaŭro: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Dosiero aŭ dosierujo estis forigita el nurlega kunhavo, sed restaŭrado malsukcesis: %1</translation> </message> @@ -2450,27 +2526,27 @@ Uzi ĝin ne konsilindas.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Loka dosiero estis forigita dum sinkronigo.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Loka dosiero ŝanĝiĝis dum sinkronigo.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Neatendita elirkodo el servilo (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Mankanta identigilo de dosiero el la servilo</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Mankanta ETag el la servilo</translation> </message> @@ -2679,22 +2755,22 @@ Uzi ĝin ne konsilindas.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Kunhava ligilo</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Pasvorto:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Limdato:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -2767,22 +2843,22 @@ Uzi ĝin ne konsilindas.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Kunhavigi kun uzantoj aŭ grupoj...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Kopii ligilon</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Neniu rezulto por „%1“</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Mi kunhavigis ion kun vi</translation> </message> @@ -2800,22 +2876,27 @@ Uzi ĝin ne konsilindas.</translation> <translation>povas redakti</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Eblas rekunhavigi</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Malkunhavigi</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Povas krei</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Eblas ŝanĝi</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Povas forigi</translation> </message> @@ -2842,7 +2923,7 @@ Uzi ĝin ne konsilindas.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation>Vido pri sencimigo de SSL-ĉifrado</translation> </message> <message> @@ -2867,7 +2948,7 @@ Uzi ĝin ne konsilindas.</translation> <message> <location filename="../src/gui/socketapi.cpp" line="491"/> <source>Context menu share</source> - <translation type="unfinished"/> + <translation>Menuo pri kunhavigo</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="612"/> @@ -3027,11 +3108,6 @@ Uzi ĝin ne konsilindas.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Fidi ĉi tiun atestilon ĉiuokaze</translation> @@ -3060,44 +3136,49 @@ Uzi ĝin ne konsilindas.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organizaĵo:</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unuo: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Lando: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>MD5-fingrospuro: <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>SHA1-fingrospuro: <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Ekvalida dato: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Limdato: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Eldonanto: %1</translation> </message> @@ -3388,11 +3469,11 @@ Uzi ĝin ne konsilindas.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versio %1. Por pli da informoj, bv. viziti <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Versio %1. Por pli da informoj, alklaku <a href='%2'>ĉi tie</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Tiu eldono estis liverita de %1</p></translation> </message> @@ -3400,25 +3481,25 @@ Uzi ĝin ne konsilindas.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Nevalida atestilo eltrovita</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>La gastigo „%1“ provizis nevalidan atestilon. Ĉu daŭrigi?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Vi estis elsalutita de %1 kiel uzanto %2. Bv. re-ensaluti.</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Bv. ensaluti kun la uzanto: %1</translation> </message> @@ -3486,11 +3567,6 @@ Uzi ĝin ne konsilindas.</translation> <translation>Agordoj...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detaloj...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Helpo</translation> @@ -3602,6 +3678,11 @@ Uzi ĝin ne konsilindas.</translation> <translation>Nova konto...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Vidi pli da aktivaĵoj...</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> @@ -3661,23 +3742,6 @@ Uzi ĝin ne konsilindas.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servilo</translation> @@ -3719,11 +3783,6 @@ Uzi ĝin ne konsilindas.</translation> <translation>&Loka dosierujo</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Gardi lokajn datumojn</translation> @@ -3742,11 +3801,6 @@ Uzi ĝin ne konsilindas.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Uzantnomo</translation> @@ -3760,11 +3814,6 @@ Uzi ĝin ne konsilindas.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Bv. iri al via retumilo por daŭrigi.</translation> @@ -3779,21 +3828,15 @@ Uzi ĝin ne konsilindas.</translation> <source>Re-open Browser</source> <translation>Remalfermi retumilon</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Gastigu vian propran servilon</span></a></translation> @@ -3827,26 +3870,10 @@ Uzi ĝin ne konsilindas.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Via tuta konta sinkroniĝas kun la loka dosierujo.</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3901,7 +3928,7 @@ Uzi ĝin ne konsilindas.</translation> <translation>Antaŭ nelonge</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3984,14 +4011,6 @@ Uzi ĝin ne konsilindas.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Elektilo</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_es.ts b/translations/client_es.ts index 0b7935942..c9f0147a6 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Cuadro de diálogo</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etiqueta</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> <translation>Formulario</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor, cambie a su navegador para proceder.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Ha ocurrido un error al conectarse. Por favor, vuelve a intentarlo.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Reabrir navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar enlaces</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor, cambie a su navegador para proceder.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Se ha producido un error al conectarse. Por favor, inténtelo de nuevo.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Reabrir navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Copiar enlace</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Seleccione una carpeta local en su equipo para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Seleccionar una carpeta remota de destino</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Regla mnemotécnica del cifrado de extremo a extremo</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Para proteger tu identidad criptográfica, la ciframos con una regla nemotécnica de 12 palabras del diccionario. Por favor, anótalas y mantenlas a salvo. Estas palabras serán necesarias para añadir otros dispositivos a su cuenta (como un teléfono móvil o un portátil). </translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espacio de almacenamiento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Las carpetas no seleccionadas serán <b>eliminadas</b> de su carpeta local y ya no serán sincronizadas en este ordenador</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>No sincronizar nada</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuales</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado a <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No se ha configurado ninguna cuenta.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Añadir nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Esta cuenta soporta cifrado punto a punto</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Habilitar cifrado</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Mostrar mnemotécnica E2E</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Cifrar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Editar archivos ignorados</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elija qué sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Eliminar la sincronización de carpetas conectadas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Ha fallado la creación de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No se ha podido crear la carpeta local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirme la sincronización para la eliminación de la carpeta conectada</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar carpeta de sincronización conectada</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 es antigua y no está soportada! Si continúas, lo haces bajo tu propio riesgo.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Servidor %1 no está disponible temporalmente.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>El servidor %1 está actualmente en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Cerró sesión desde %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización desde el navegador. <a href='%1'>Haga clic aquí</a> para re-abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Sin conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no se han sincronizado porque son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no se han sincronizado porque están en el almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hay carpetas que no se han sincronizado porque son demasiado grandes o están en el almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirmar eliminación de cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>¿De verdad quiere eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> eliminará los archivos.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Cerrar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Continuar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>¿De verdad quiere dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> elminará los archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algunas carpetas, como carpetas de red o compartidas, podrían tener límites diferentes.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No hay ninguna conexión de %1 configurada.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Aceptar</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Sincronizado</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Reintentar todas las subidas</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>La cuenta %1 no tiene actividades habilitadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos en la base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Por favor, introduce la frase de seguridad del cifrado extremo a extremo: <br><br>Usuario: %2<br>Cuenta: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Introduce la frase de acceso E2E</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Error devuelto por el servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Se encontró un error al acceder al 'token' del punto final: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>No se puede procesar el código JSON recibido del servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La respuesta del servidor no contiene todos los campos esperados</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Conectado a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Inicia sesión en tu navegador Web (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>No se ha podido abrir el navegador, por favor copie el enlace en su navegador.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>No se ha podido abrir el navegador, por favor copie el enlace en su navegador.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 es ilegible.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ha sido renombrado a %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 ha sido movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 y otro archivo han sido borrados.</numerusform><numerusform>%1 y otros %n archivos han sido borrados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 y otro archivo han sido descargados.</numerusform><numerusform>%1 y otros %n archivos han sido descargados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 y otro archivo han sido actualizados.</numerusform><numerusform>%1 y otros %n archivos han sido actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 ha sido renombrado a %2 y otro archivo ha sido renombrado.</numerusform><numerusform>%1 ha sido renombrado a %2 y otros %n archivos han sido renombrado.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 ha sido movido a %2 y otro archivo ha sido movido.</numerusform><numerusform>%1 ha sido movido a %2 y otros %n archivos han sido movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 y otro archivo han tenido conflictos al sincronizar.</numerusform><numerusform>%1 y otros %n archivos han tenido conflictos al sincronizar.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>Conflicto al sincronizar %1. ¡Por favor compruebe el archivo!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 y otro archivo no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform><numerusform>%1 y otros %n archivos no se han podido sincronizar debido a errores. Para más detalles vea el registro.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no se ha podido sincronizar debido a un error. Para más detalles, vea el registro.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Actividad de la sincronización</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>No se ha podido leer el archivo de exclusión del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una carpeta mayor de %1 MB ha sido añadida: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Una carpeta de almacenamiento externo ha sido añadida. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor vaya a opciones a seleccionarlo si desea descargar esto.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Se ha creado la carpeta %1 pero se excluyó de la sincronización con anterioridad. Los datos en su interior no se sincronizarán.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Se ha creado el archivo %1 pero se excluyó de la sincronización con anterioridad. No se sincronizará.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,7 +961,7 @@ Esto significa que el cliente de sincronización podría no subir inmediatamente %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -877,22 +972,22 @@ Si decides mantener los archivos, se resubirán al servidor si tienes permisos p Si decides eliminar los archivos, no podrás disponer de ellos a no ser que seas el propietario.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>¿Descargar los archivos nuevos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Descargar archivos nuevos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Mantener los archivos locales</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -901,7 +996,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados con el servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -910,17 +1005,17 @@ Esto puede deberse a que una copia de seguridad fue restaurada en el servidor. Si continua con la sincronización todos los archivos serán remplazados por su versión previa. ¿Desea mantener los archivos locales en su versión actual como archivos en conflicto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Backup detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronización normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener los archivos locales en caso de conflicto</translation> </message> @@ -1036,12 +1131,12 @@ Si continua con la sincronización todos los archivos serán remplazados por su <translation>Añadir conexión para el directorio de sincronización</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Sincronizada con la carpeta local</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>Sincronizado con carpeta local (%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1071,7 +1166,7 @@ Si continua con la sincronización todos los archivos serán remplazados por su <translation>Error mientras se cargaba la lista de carpetas desde el servidor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Cerrar sesión</translation> </message> @@ -1086,107 +1181,107 @@ Si continua con la sincronización todos los archivos serán remplazados por su <translation>Hay conflictos sin resolver. Haz clic para más detalles.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando: %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Buscando cambios en la carpeta remota '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Buscando cambios en la carpeta local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restantes, %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Esperando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando por %n carpeta...</numerusform><numerusform>Esperando a otras %n carpetas...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando la sincronizarción..</translation> </message> @@ -1317,11 +1412,6 @@ Si continua con la sincronización todos los archivos serán remplazados por su <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Aviso legal</translation> @@ -1472,83 +1562,81 @@ Si continua con la sincronización todos los archivos serán remplazados por su <translation>Archivos ignorados por patrones</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Añadir</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entrada la proporciona el sistema en '%1' y no se puede modificar en esta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Eliminar todo</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation>IgnoreListTableWidget</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation>Patrón</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permitir eliminación</translation> + <translation>Permitir borrado</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>Añadir</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation>Eliminar todos</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>Los archivos o directorios que coincidan con un patrón no serán sincronizados. + <translation>Los archivos o carpetas que coincidan con un patrón no se sincronizarán. -Los elementos cuya eliminación está permitida serán eliminados si impiden que un directorio sea eliminado. Esto es útil para sus metadatos.</translation> +Los elemntos en los que se permite el borrado se eliminarán si impiden que un directorio se elimine. Esto es útil para los metadatos.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No se ha podido abrir el archivo</translation> + <translation>No se ha podido abrir el archivo.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No se pueden guardar cambios en '%1'.</translation> + <translation>No se han podido escribir los cambios a '%1'.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Añadir patrón para ignorar</translation> + <translation>Añadir patrón de ignorados</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Añadir nuevo patrón para ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entrada la proporciona el sistema en '%1' y no se puede modificar en esta vista.</translation> + <translation>Añadir un nuevo patrón de archivos ignorados:</translation> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Cuadro de diálogo</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Aviso legal</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Cerrar</translation> @@ -1680,11 +1768,6 @@ Los registros se guardarán en: %1</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configuración del proxy</translation> @@ -1994,11 +2077,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>Inicia sesión en tu navegador Web</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Copiar enlace al portapapeles</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2050,12 +2128,12 @@ No se recomienda usarla.</translation> <translation>&Siguiente ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Dirección URL incorrecta</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>No se ha podido guardar el certificado. ¿Quizás la contraseña sea incorrecta?</translation> </message> @@ -2133,79 +2211,79 @@ No se recomienda usarla.</translation> <translation>No se ha podido crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>¡No se ha especificado ninguna carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>Creando carpeta en Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Carpeta remota %1 creado correctamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectándola para sincronizacion.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta ha producido el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota ha fallado debido a que las credenciales proporcionadas son incorrectas!<br/>Por favor, vuelva atrás y compruebe sus credenciales</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creación de la carpeta remota ha fallado, probablemente porque las credenciales proporcionadas son incorrectas.</font><br/>Por favor, vuelva atrás y compruebe sus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Creación %1 de carpeta remota ha fallado con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Se ha configarado una conexión de sincronización desde %1 al directorio remoto %2</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>¡Conectado con éxito a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No se ha podido establecer la conexión con %1. Por favor, compruébelo de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Error al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>No se puede eliminar y respaldar la carpeta porque la misma o un fichero en ella está abierto por otro programa. Por favor, cierre la carpeta o el fichero y reintente, o cancele la instalación.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Carpeta de sincronización local %1 creada con éxito</b></font></translation> </message> @@ -2213,12 +2291,12 @@ No se recomienda usarla.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>Asistente de conexión %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Omitir la configuración de carpetas</translation> </message> @@ -2252,7 +2330,7 @@ No se recomienda usarla.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos en la base de datos</translation> </message> @@ -2280,32 +2358,32 @@ No se recomienda usarla.</translation> <translation>El espacio libre en el disco es inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Se ha eliminado el archivo del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>No se ha podido descargar el archivo completamente.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>El archivo descargado está vacío a pesar de que el servidor comunicó que debería haber sido %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede guardarse debido a un conflicto con el nombre de otro archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos en la base de datos</translation> </message> @@ -2318,7 +2396,7 @@ No se recomienda usarla.</translation> <translation>; Fallo al restaurar: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un archivo o directorio ha sido eliminado de una carpeta compartida de solo lectura pero la recuperación ha fallado: %1</translation> </message> @@ -2450,27 +2528,27 @@ No se recomienda usarla.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>El archivo local ha sido eliminado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Un archivo local fue modificado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Respuesta inesperada del servidor (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>ID perdido del archivo del servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Perdido ETag del servidor</translation> </message> @@ -2679,22 +2757,22 @@ No se recomienda usarla.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>Compartir enlace</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Contraseña:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Fecha de caducidad</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -2767,22 +2845,22 @@ No se recomienda usarla.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuarios o grupos ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Copiar enlace</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No hay resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>He compartido algo contigo</translation> </message> @@ -2800,22 +2878,27 @@ No se recomienda usarla.</translation> <translation>puede editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Puede compartir</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>No compartir</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Puede crear</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Puede cambiar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Puede eliminar</translation> </message> @@ -2842,8 +2925,8 @@ No se recomienda usarla.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista depuradador Chipher SSL</translation> + <source>SSL Cipher Debug View</source> + <translation>Vista Depurador Chipher SSL</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3028,11 +3111,6 @@ No se recomienda usarla.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar en este certificado de todas maneras</translation> @@ -3061,44 +3139,49 @@ No se recomienda usarla.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Huella (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huella dactilar (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Huella dactirlar (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>Huella dactilar (SHA-512): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Fecha de vigencia: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Fecha de caducidad: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emisor: %1</translation> </message> @@ -3389,11 +3472,11 @@ No se recomienda usarla.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versión %1. Para obtener más información, visita <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Versión %1. Para obtener más información, haga clic <a href='%2'> aquí </a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Esta versión ha sido suministrada por %1</p></translation> </message> @@ -3401,25 +3484,25 @@ No se recomienda usarla.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Certificado inválido detectado</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>El host "%1" ha ofrecido un certificado no válido. ¿Continuar?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Has sido desconectado de %1 como el usuario %2. Por favor, vuelve a entrar</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Por favor, entra con el usuario: %1</translation> </message> @@ -3487,11 +3570,6 @@ No se recomienda usarla.</translation> <translation>Ajustes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ayuda</translation> @@ -3603,6 +3681,11 @@ No se recomienda usarla.</translation> <translation>Nueva cuenta ...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Ver más actividad ...</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> @@ -3662,23 +3745,6 @@ No se recomienda usarla.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>Etiqueta de texto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3720,11 +3786,6 @@ No se recomienda usarla.</translation> <translation>Carpeta &local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantener datos locales</translation> @@ -3743,11 +3804,6 @@ No se recomienda usarla.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nombre de usuario</translation> @@ -3761,11 +3817,6 @@ No se recomienda usarla.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Por favor vaya a su navegador para proceder.</translation> @@ -3780,21 +3831,15 @@ No se recomienda usarla.</translation> <source>Re-open Browser</source> <translation>Reabra el navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar enlace</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Etiqueta</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Hospeda tu propio servidor</span></a></translation> @@ -3828,26 +3873,10 @@ No se recomienda usarla.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Texto Etiqueta</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Tu cuenta entera está sincronizada con la carpeta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>BotónPulsable</translation> - </message> </context> <context> <name>QObject</name> @@ -3902,7 +3931,7 @@ No se recomienda usarla.</translation> <translation>Hace tiempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3985,14 +4014,6 @@ No se recomienda usarla.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Formulario</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index f7242f6e5..fbc1ad299 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Formulario</translation> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Seleccioná un directorio local en tu equipo para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecciona una carpeta de destino remota</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espacio de almacenamiento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Deseleccionar Carpetas que serán <b>eliminadas</b> de su sistema de archivos local y no será sincronizado más en este equipo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todos</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sincronizar ninguno</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuales</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No hay cuenta configurada.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Agregar nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elegir que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reinicia sincronización </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Eliminar conexión de sincronización de carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Falló la creacion de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No pudó ser creada la carpeta local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar eliminación de conexión de sincronización de carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La sincronización está en curso.<br/>¿Querés interrumpirla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 de <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor% 1 es antigua y no está soportada! Proceda bajo su propio riesgo.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 esta temporalmente sin conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Servidor %1 actualmente en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Registrado desde %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización del navegador. <a href='%1'>Click aquí</a> para volver a abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Sin conexión a %1 desde %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirmar la eliminación de la cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Cerrar la sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Reanudar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Realmente quieres detener la sincronización de la carpeta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> eliminara ningun archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No hay ninguna conexión de %1 configurada.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation type="unfinished"/> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error escribiendo metadatos a la base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,118 +835,118 @@ <translation>No se puede leer %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Actividad de Sync</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -860,7 +955,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -868,46 +963,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronizacón Normal.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener Archivos Locales como Conflicto</translation> </message> @@ -1023,12 +1118,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1058,7 +1153,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Desautentificado</translation> </message> @@ -1073,107 +1168,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargado %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Cargado %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 of %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Queda(n) %5, %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>Archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Esperando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1304,11 +1399,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1457,81 +1547,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Agregar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entrada es provista por el sistema en '%1' y no puede ser modificada en esta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Borrar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No se pudo abrir el archivo</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No se pueden guardar cambios en '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Agregar patrón a ignorar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Añadir nuevo patrón a ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entrada es provista por el sistema en '%1' y no puede ser modificada en esta vista.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1661,11 +1749,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configuración del proxy</translation> @@ -1975,11 +2058,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2030,12 +2108,12 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2113,79 +2191,79 @@ It is not advisable to use it.</source> <translation>No fue posible crear el directorio local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>¡No se ha especificado un directorio remoto!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>El directorio remoto %1 fue creado con éxito.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>El directorio remoto %1 ya existe. Estableciendo conexión para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación del directorio resultó en un error HTTP con código de error %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Error al crear el directorio remoto porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Error al crear el directorio remoto, probablemente porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Se prtodujo un error <tt>%2</tt> al crear el directorio remoto %1.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Fue creada una conexión de sincronización desde %1 al directorio remoto %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Conectado con éxito a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No fue posible establecer la conexión a %1. Por favor, intentalo nuevamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Error Al Renombrar Directorio</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Directorio local %1 creado</b></font></translation> </message> @@ -2193,12 +2271,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Asistente de Conexión</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation type="unfinished"/> </message> @@ -2232,7 +2310,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Error escribiendo metadatos a la base de datos</translation> </message> @@ -2260,32 +2338,32 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error escribiendo metadatos a la base de datos</translation> </message> @@ -2298,7 +2376,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -2430,27 +2508,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -2659,22 +2737,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -2747,22 +2825,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuario o grupo ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation type="unfinished"/> </message> @@ -2780,22 +2858,27 @@ It is not advisable to use it.</source> <translation>podés editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2822,7 +2905,7 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> @@ -3006,11 +3089,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar en este certificado de todas maneras</translation> @@ -3039,44 +3117,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Empresa: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Huella (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huella (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Desde: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Generado por: %1</translation> </message> @@ -3367,11 +3450,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3379,25 +3462,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3465,11 +3548,6 @@ It is not advisable to use it.</source> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ayuda</translation> @@ -3581,6 +3659,11 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3640,23 +3723,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation type="unfinished"/> @@ -3698,11 +3764,6 @@ It is not advisable to use it.</source> <translation>Directorio &local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantener datos locales</translation> @@ -3721,11 +3782,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nombre de usuario</translation> @@ -3739,11 +3795,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation type="unfinished"/> @@ -3758,21 +3809,15 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3807,26 +3852,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Etiqueta</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Tu cuenta completa está sincronizada al directorio local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Botón</translation> - </message> </context> <context> <name>QObject</name> @@ -3881,7 +3910,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3964,14 +3993,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index 479715fcf..656b09965 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Forma</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Elige una carpeta local en tu computadora para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecciona la ubiucación de la carpeta destino</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espacio de almacenamiento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Las carpetas no marcadas serán <b>eliminadas</b> de tu sistema de archivos local y ya no serán sincronizados a esta computadora</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sincronizar nada</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuales</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No hay cuentas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Agregar nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elige que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Eliminar la conexión de sincronización de carpetas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Falló la creación de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No fue posible crear la carpeta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar la Conexión de Sincronización de la Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La operación de sincronización está en curso. <br/>¿Deseas terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 se encuntra temporalmente no disponible</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Cerraste sesión en %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización del navegador. <a href='%1'>Haz click aquí</a> para re-abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>No hay conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirma la Remosion de la Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>¿Realmente quieres eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Reanudar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>¿Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible del espacio usado.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No hay %1 conexión configurada. </translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>La cuenta %1 no tiene las actividades habilitadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>No se puede leer %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ha sido renombrado a %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 se ha movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tiene un conflicto de sincronización. ¡Por favor verifica el archivo con conflicto!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no pudo ser sincronizado por un error. Consulta la bitácora para más detalles. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sincronizar Actividad</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>No fue posible leer el archivo de exclusión del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Una carpeta de un almacenamiento externo ha sido agregada. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -904,17 +999,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea ¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Respaldo detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronización Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener los Archivos Locales como Conflictos</translation> </message> @@ -1030,12 +1125,12 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Agregar una Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1065,7 +1160,7 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Se presentó un error al cargar la lista de carpetas desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> @@ -1080,107 +1175,107 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Hay conflictos sin resolver. Haz click para más detalles. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando los cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>faltan %5 , %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Aguardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1311,11 +1406,6 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1464,83 +1554,79 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Archivos Ignorados por Patrones</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Agregar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permitir el Borrado</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Eliminar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Los archivos y carpetas que coincidan con el patrón no podrán ser sincronizadas. - -Lo elelemtnos donde el borrado se permita, serán borrados si evitan que un directorio sea eliminado. Esto es útil para los metadatos. </translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No fue posible abrir el archivo</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No se pueden escribir los cambios a '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Agrega Ignorar Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Agregar un nuevo patrón para ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1670,11 +1756,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configuraciones del Proxy</translation> @@ -1985,11 +2066,6 @@ mas privilegios durante el proceso.</translation> <source>Login in your browser</source> <translation>Iniciar sesión en tu navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2041,12 +2117,12 @@ No es recomendable usarlo. </translation> <translation>&Siguiente></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2124,79 +2200,79 @@ No es recomendable usarlo. </translation> <translation>No fue posible crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>¡No se especificó la carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 fue creada exitosamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectandola para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta dio como resultado el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota falló porque las credenciales proporcionadas están mal!<br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creación de la carpeta remota falló probablemente porque las credenciales proporcionadas son incorrectas. </font><br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creación de la carpeta remota %1 falló con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una conexión de sincronización de %1 al directorio remoto %2 fue establecida.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>¡Conectado exitosamente a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No se pudo establecer la conexión a %1. Por favor verifica de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Falla al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>No se puede eliminar la carpeta de respaldos porque la carpeta o un archivo en ella está en uso por otro programa. Por favor cierra la carpeta o archivo y haz click en reintentar o cancela la configuración.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>¡La carpeta de sincronización local %1 fue creada exitosamente!</b></font></translation> </message> @@ -2204,12 +2280,12 @@ No es recomendable usarlo. </translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Asistente de Conexión</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Omitir las carpetas de configuración</translation> </message> @@ -2243,7 +2319,7 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> @@ -2271,32 +2347,32 @@ No es recomendable usarlo. </translation> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos a la base de datos</translation> </message> @@ -2309,7 +2385,7 @@ No es recomendable usarlo. </translation> <translation>; La Restauración Falló: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un archivo o carpeta fue eliminado de un elemento compartido de solo lectura, pero la restauracion falló: %1</translation> </message> @@ -2441,27 +2517,27 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -2670,22 +2746,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -2758,22 +2834,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuarios o grupos ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Compartí algo contigo</translation> </message> @@ -2791,22 +2867,27 @@ No es recomendable usarlo. </translation> <translation>puede editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2833,8 +2914,8 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista de Depuración del Cifrado SSL</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3019,11 +3100,6 @@ No es recomendable usarlo. </translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar en este certificado de cualquier modo</translation> @@ -3052,44 +3128,49 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Huella (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huekka (SHA1):<tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Fecha Efectiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Fecha de Expiración: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emitido por: %1</translation> </message> @@ -3380,11 +3461,11 @@ No es recomendable usarlo. </translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versión %1. Para más información por favor visita <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3392,25 +3473,25 @@ No es recomendable usarlo. </translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3478,11 +3559,6 @@ No es recomendable usarlo. </translation> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ayuda</translation> @@ -3594,6 +3670,11 @@ No es recomendable usarlo. </translation> <translation>Nueva cuenta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3653,23 +3734,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3711,11 +3775,6 @@ No es recomendable usarlo. </translation> <translation>Carpeta &Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantener los datos locales</translation> @@ -3734,11 +3793,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nombre de Usuario</translation> @@ -3752,11 +3806,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Por favor cambia a tu navegador para continuar.</translation> @@ -3771,21 +3820,15 @@ No es recomendable usarlo. </translation> <source>Re-open Browser</source> <translation>Re-abrir el Navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3819,26 +3862,10 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>La totalidad de tu cuenta está sincronizada a la carpeta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3893,7 +3920,7 @@ No es recomendable usarlo. </translation> <translation>Hace algún tiempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3976,14 +4003,6 @@ No es recomendable usarlo. </translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index 127ecbf99..d95356648 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Forma</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Elige una carpeta local en tu computadora para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecciona la ubiucación de la carpeta destino</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espacio de almacenamiento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Las carpetas no marcadas serán <b>eliminadas</b> de tu sistema de archivos local y ya no serán sincronizados a esta computadora</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sincronizar nada</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuales</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No hay cuentas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Agregar nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elige que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Eliminar la conexión de sincronización de carpetas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Falló la creación de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No fue posible crear la carpeta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar la Conexión de Sincronización de la Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La operación de sincronización está en curso. <br/>¿Deseas terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 se encuntra temporalmente no disponible</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Cerraste sesión en %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización del navegador. <a href='%1'>Haz click aquí</a> para re-abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>No hay conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirma la Remosion de la Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>¿Realmente quieres eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Reanudar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>¿Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible del espacio usado.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No hay %1 conexión configurada. </translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>La cuenta %1 no tiene las actividades habilitadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>No se puede leer %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ha sido renombrado a %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 se ha movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tiene un conflicto de sincronización. ¡Por favor verifica el archivo con conflicto!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no pudo ser sincronizado por un error. Consulta la bitácora para más detalles. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sincronizar Actividad</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>No fue posible leer el archivo de exclusión del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Una carpeta de un almacenamiento externo ha sido agregada. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -904,17 +999,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea ¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Respaldo detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronización Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener los Archivos Locales como Conflictos</translation> </message> @@ -1030,12 +1125,12 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Agregar una Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1065,7 +1160,7 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Se presentó un error al cargar la lista de carpetas desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> @@ -1080,107 +1175,107 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Hay conflictos sin resolver. Haz click para más detalles. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando los cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>faltan %5 , %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Aguardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1311,11 +1406,6 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1464,83 +1554,79 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Archivos Ignorados por Patrones</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Agregar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permitir el Borrado</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Eliminar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Los archivos y carpetas que coincidan con el patrón no podrán ser sincronizadas. - -Lo elelemtnos donde el borrado se permita, serán borrados si evitan que un directorio sea eliminado. Esto es útil para los metadatos. </translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No fue posible abrir el archivo</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No se pueden escribir los cambios a '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Agrega Ignorar Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Agregar un nuevo patrón para ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1670,11 +1756,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configuraciones del Proxy</translation> @@ -1985,11 +2066,6 @@ mas privilegios durante el proceso.</translation> <source>Login in your browser</source> <translation>Iniciar sesión en tu navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2041,12 +2117,12 @@ No es recomendable usarlo. </translation> <translation>&Siguiente></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2124,79 +2200,79 @@ No es recomendable usarlo. </translation> <translation>No fue posible crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>¡No se especificó la carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 fue creada exitosamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectandola para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta dio como resultado el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota falló porque las credenciales proporcionadas están mal!<br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creación de la carpeta remota falló probablemente porque las credenciales proporcionadas son incorrectas. </font><br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creación de la carpeta remota %1 falló con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una conexión de sincronización de %1 al directorio remoto %2 fue establecida.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>¡Conectado exitosamente a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No se pudo establecer la conexión a %1. Por favor verifica de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Falla al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>No se puede eliminar la carpeta de respaldos porque la carpeta o un archivo en ella está en uso por otro programa. Por favor cierra la carpeta o archivo y haz click en reintentar o cancela la configuración.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>¡La carpeta de sincronización local %1 fue creada exitosamente!</b></font></translation> </message> @@ -2204,12 +2280,12 @@ No es recomendable usarlo. </translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Asistente de Conexión</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Omitir las carpetas de configuración</translation> </message> @@ -2243,7 +2319,7 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> @@ -2271,32 +2347,32 @@ No es recomendable usarlo. </translation> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos a la base de datos</translation> </message> @@ -2309,7 +2385,7 @@ No es recomendable usarlo. </translation> <translation>; La Restauración Falló: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un archivo o carpeta fue eliminado de un elemento compartido de solo lectura, pero la restauracion falló: %1</translation> </message> @@ -2441,27 +2517,27 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -2670,22 +2746,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -2758,22 +2834,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuarios o grupos ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Compartí algo contigo</translation> </message> @@ -2791,22 +2867,27 @@ No es recomendable usarlo. </translation> <translation>puede editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2833,8 +2914,8 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista de Depuración del Cifrado SSL</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3019,11 +3100,6 @@ No es recomendable usarlo. </translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar en este certificado de cualquier modo</translation> @@ -3052,44 +3128,49 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Huella (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huekka (SHA1):<tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Fecha Efectiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Fecha de Expiración: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emitido por: %1</translation> </message> @@ -3380,11 +3461,11 @@ No es recomendable usarlo. </translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versión %1. Para más información por favor visita <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3392,25 +3473,25 @@ No es recomendable usarlo. </translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3478,11 +3559,6 @@ No es recomendable usarlo. </translation> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ayuda</translation> @@ -3594,6 +3670,11 @@ No es recomendable usarlo. </translation> <translation>Nueva cuenta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3653,23 +3734,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3711,11 +3775,6 @@ No es recomendable usarlo. </translation> <translation>Carpeta &Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantener los datos locales</translation> @@ -3734,11 +3793,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nombre de Usuario</translation> @@ -3752,11 +3806,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Por favor cambia a tu navegador para continuar.</translation> @@ -3771,21 +3820,15 @@ No es recomendable usarlo. </translation> <source>Re-open Browser</source> <translation>Re-abrir el Navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3819,26 +3862,10 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>La totalidad de tu cuenta está sincronizada a la carpeta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3893,7 +3920,7 @@ No es recomendable usarlo. </translation> <translation>Hace algún tiempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3976,14 +4003,6 @@ No es recomendable usarlo. </translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index 19cb4d354..f11b861a6 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Forma</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Elige una carpeta local en tu computadora para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecciona la ubiucación de la carpeta destino</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espacio de almacenamiento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Las carpetas no marcadas serán <b>eliminadas</b> de tu sistema de archivos local y ya no serán sincronizados a esta computadora</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sincronizar nada</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuales</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No hay cuentas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Agregar nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elige que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Eliminar la conexión de sincronización de carpetas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Falló la creación de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No fue posible crear la carpeta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar la Conexión de Sincronización de la Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La operación de sincronización está en curso. <br/>¿Deseas terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 se encuntra temporalmente no disponible</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Cerraste sesión en %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización del navegador. <a href='%1'>Haz click aquí</a> para re-abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>No hay conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirma la Remosion de la Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>¿Realmente quieres eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Reanudar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>¿Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible del espacio usado.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No hay %1 conexión configurada. </translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>La cuenta %1 no tiene las actividades habilitadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>No se puede leer %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ha sido renombrado a %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 se ha movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tiene un conflicto de sincronización. ¡Por favor verifica el archivo con conflicto!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no pudo ser sincronizado por un error. Consulta la bitácora para más detalles. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sincronizar Actividad</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>No fue posible leer el archivo de exclusión del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Una carpeta de un almacenamiento externo ha sido agregada. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -904,17 +999,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea ¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Respaldo detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronización Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener los Archivos Locales como Conflictos</translation> </message> @@ -1030,12 +1125,12 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Agregar una Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1065,7 +1160,7 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Se presentó un error al cargar la lista de carpetas desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> @@ -1080,107 +1175,107 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Hay conflictos sin resolver. Haz click para más detalles. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando los cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>faltan %5 , %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Aguardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1311,11 +1406,6 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1464,83 +1554,79 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Archivos Ignorados por Patrones</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Agregar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permitir el Borrado</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Eliminar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Los archivos y carpetas que coincidan con el patrón no podrán ser sincronizadas. - -Lo elelemtnos donde el borrado se permita, serán borrados si evitan que un directorio sea eliminado. Esto es útil para los metadatos. </translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No fue posible abrir el archivo</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No se pueden escribir los cambios a '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Agrega Ignorar Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Agregar un nuevo patrón para ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1670,11 +1756,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configuraciones del Proxy</translation> @@ -1985,11 +2066,6 @@ mas privilegios durante el proceso.</translation> <source>Login in your browser</source> <translation>Iniciar sesión en tu navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2041,12 +2117,12 @@ No es recomendable usarlo. </translation> <translation>&Siguiente></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2124,79 +2200,79 @@ No es recomendable usarlo. </translation> <translation>No fue posible crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>¡No se especificó la carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 fue creada exitosamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectandola para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta dio como resultado el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota falló porque las credenciales proporcionadas están mal!<br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creación de la carpeta remota falló probablemente porque las credenciales proporcionadas son incorrectas. </font><br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creación de la carpeta remota %1 falló con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una conexión de sincronización de %1 al directorio remoto %2 fue establecida.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>¡Conectado exitosamente a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No se pudo establecer la conexión a %1. Por favor verifica de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Falla al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>No se puede eliminar la carpeta de respaldos porque la carpeta o un archivo en ella está en uso por otro programa. Por favor cierra la carpeta o archivo y haz click en reintentar o cancela la configuración.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>¡La carpeta de sincronización local %1 fue creada exitosamente!</b></font></translation> </message> @@ -2204,12 +2280,12 @@ No es recomendable usarlo. </translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Asistente de Conexión</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Omitir las carpetas de configuración</translation> </message> @@ -2243,7 +2319,7 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> @@ -2271,32 +2347,32 @@ No es recomendable usarlo. </translation> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos a la base de datos</translation> </message> @@ -2309,7 +2385,7 @@ No es recomendable usarlo. </translation> <translation>; La Restauración Falló: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un archivo o carpeta fue eliminado de un elemento compartido de solo lectura, pero la restauracion falló: %1</translation> </message> @@ -2441,27 +2517,27 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -2670,22 +2746,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -2758,22 +2834,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuarios o grupos ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Compartí algo contigo</translation> </message> @@ -2791,22 +2867,27 @@ No es recomendable usarlo. </translation> <translation>puede editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2833,8 +2914,8 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista de Depuración del Cifrado SSL</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3019,11 +3100,6 @@ No es recomendable usarlo. </translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar en este certificado de cualquier modo</translation> @@ -3052,44 +3128,49 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Huella (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huekka (SHA1):<tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Fecha Efectiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Fecha de Expiración: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emitido por: %1</translation> </message> @@ -3380,11 +3461,11 @@ No es recomendable usarlo. </translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versión %1. Para más información por favor visita <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3392,25 +3473,25 @@ No es recomendable usarlo. </translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3478,11 +3559,6 @@ No es recomendable usarlo. </translation> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ayuda</translation> @@ -3594,6 +3670,11 @@ No es recomendable usarlo. </translation> <translation>Nueva cuenta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3653,23 +3734,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3711,11 +3775,6 @@ No es recomendable usarlo. </translation> <translation>Carpeta &Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantener los datos locales</translation> @@ -3734,11 +3793,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nombre de Usuario</translation> @@ -3752,11 +3806,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Por favor cambia a tu navegador para continuar.</translation> @@ -3771,21 +3820,15 @@ No es recomendable usarlo. </translation> <source>Re-open Browser</source> <translation>Re-abrir el Navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3819,26 +3862,10 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>La totalidad de tu cuenta está sincronizada a la carpeta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3893,7 +3920,7 @@ No es recomendable usarlo. </translation> <translation>Hace algún tiempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3976,14 +4003,6 @@ No es recomendable usarlo. </translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index 8679215aa..2676391c5 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Forma</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Elige una carpeta local en tu computadora para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecciona la ubiucación de la carpeta destino</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espacio de almacenamiento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Las carpetas no marcadas serán <b>eliminadas</b> de tu sistema de archivos local y ya no serán sincronizados a esta computadora</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sincronizar nada</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuales</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No hay cuentas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Agregar nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elige que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Eliminar la conexión de sincronización de carpetas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Falló la creación de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No fue posible crear la carpeta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar la Conexión de Sincronización de la Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La operación de sincronización está en curso. <br/>¿Deseas terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 se encuntra temporalmente no disponible</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Cerraste sesión en %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización del navegador. <a href='%1'>Haz click aquí</a> para re-abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>No hay conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirma la Remosion de la Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>¿Realmente quieres eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Reanudar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>¿Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible del espacio usado.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No hay %1 conexión configurada. </translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>La cuenta %1 no tiene las actividades habilitadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>No se puede leer %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ha sido renombrado a %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 se ha movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tiene un conflicto de sincronización. ¡Por favor verifica el archivo con conflicto!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no pudo ser sincronizado por un error. Consulta la bitácora para más detalles. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sincronizar Actividad</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>No fue posible leer el archivo de exclusión del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Una carpeta de un almacenamiento externo ha sido agregada. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -904,17 +999,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea ¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Respaldo detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronización Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener los Archivos Locales como Conflictos</translation> </message> @@ -1030,12 +1125,12 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Agregar una Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1065,7 +1160,7 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Se presentó un error al cargar la lista de carpetas desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> @@ -1080,107 +1175,107 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Hay conflictos sin resolver. Haz click para más detalles. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando los cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>faltan %5 , %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Aguardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1311,11 +1406,6 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1464,83 +1554,79 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Archivos Ignorados por Patrones</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Agregar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permitir el Borrado</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Eliminar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Los archivos y carpetas que coincidan con el patrón no podrán ser sincronizadas. - -Lo elelemtnos donde el borrado se permita, serán borrados si evitan que un directorio sea eliminado. Esto es útil para los metadatos. </translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No fue posible abrir el archivo</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No se pueden escribir los cambios a '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Agrega Ignorar Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Agregar un nuevo patrón para ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1670,11 +1756,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configuraciones del Proxy</translation> @@ -1985,11 +2066,6 @@ mas privilegios durante el proceso.</translation> <source>Login in your browser</source> <translation>Iniciar sesión en tu navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2041,12 +2117,12 @@ No es recomendable usarlo. </translation> <translation>&Siguiente></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2124,79 +2200,79 @@ No es recomendable usarlo. </translation> <translation>No fue posible crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>¡No se especificó la carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 fue creada exitosamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectandola para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta dio como resultado el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota falló porque las credenciales proporcionadas están mal!<br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creación de la carpeta remota falló probablemente porque las credenciales proporcionadas son incorrectas. </font><br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creación de la carpeta remota %1 falló con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una conexión de sincronización de %1 al directorio remoto %2 fue establecida.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>¡Conectado exitosamente a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No se pudo establecer la conexión a %1. Por favor verifica de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Falla al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>No se puede eliminar la carpeta de respaldos porque la carpeta o un archivo en ella está en uso por otro programa. Por favor cierra la carpeta o archivo y haz click en reintentar o cancela la configuración.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>¡La carpeta de sincronización local %1 fue creada exitosamente!</b></font></translation> </message> @@ -2204,12 +2280,12 @@ No es recomendable usarlo. </translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Asistente de Conexión</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Omitir las carpetas de configuración</translation> </message> @@ -2243,7 +2319,7 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> @@ -2271,32 +2347,32 @@ No es recomendable usarlo. </translation> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos a la base de datos</translation> </message> @@ -2309,7 +2385,7 @@ No es recomendable usarlo. </translation> <translation>; La Restauración Falló: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un archivo o carpeta fue eliminado de un elemento compartido de solo lectura, pero la restauracion falló: %1</translation> </message> @@ -2441,27 +2517,27 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -2670,22 +2746,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -2758,22 +2834,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuarios o grupos ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Compartí algo contigo</translation> </message> @@ -2791,22 +2867,27 @@ No es recomendable usarlo. </translation> <translation>puede editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2833,8 +2914,8 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista de Depuración del Cifrado SSL</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3019,11 +3100,6 @@ No es recomendable usarlo. </translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar en este certificado de cualquier modo</translation> @@ -3052,44 +3128,49 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Huella (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huekka (SHA1):<tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Fecha Efectiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Fecha de Expiración: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emitido por: %1</translation> </message> @@ -3380,11 +3461,11 @@ No es recomendable usarlo. </translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versión %1. Para más información por favor visita <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3392,25 +3473,25 @@ No es recomendable usarlo. </translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3478,11 +3559,6 @@ No es recomendable usarlo. </translation> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ayuda</translation> @@ -3594,6 +3670,11 @@ No es recomendable usarlo. </translation> <translation>Nueva cuenta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3653,23 +3734,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3711,11 +3775,6 @@ No es recomendable usarlo. </translation> <translation>Carpeta &Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantener los datos locales</translation> @@ -3734,11 +3793,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nombre de Usuario</translation> @@ -3752,11 +3806,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Por favor cambia a tu navegador para continuar.</translation> @@ -3771,21 +3820,15 @@ No es recomendable usarlo. </translation> <source>Re-open Browser</source> <translation>Re-abrir el Navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3819,26 +3862,10 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>La totalidad de tu cuenta está sincronizada a la carpeta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3893,7 +3920,7 @@ No es recomendable usarlo. </translation> <translation>Hace algún tiempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3976,14 +4003,6 @@ No es recomendable usarlo. </translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 038964182..1c36a262d 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Forma</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Elige una carpeta local en tu computadora para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecciona la ubiucación de la carpeta destino</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espacio de almacenamiento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Las carpetas no marcadas serán <b>eliminadas</b> de tu sistema de archivos local y ya no serán sincronizados a esta computadora</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sincronizar nada</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuales</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No hay cuentas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Agregar nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elige que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Eliminar la conexión de sincronización de carpetas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Falló la creación de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No fue posible crear la carpeta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar la Conexión de Sincronización de la Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La operación de sincronización está en curso. <br/>¿Deseas terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 se encuntra temporalmente no disponible</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Cerraste sesión en %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización del navegador. <a href='%1'>Haz click aquí</a> para re-abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>No hay conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirma la Remosion de la Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>¿Realmente quieres eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Reanudar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>¿Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible del espacio usado.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No hay %1 conexión configurada. </translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>La cuenta %1 no tiene las actividades habilitadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>No se puede leer %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ha sido renombrado a %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 se ha movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tiene un conflicto de sincronización. ¡Por favor verifica el archivo con conflicto!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no pudo ser sincronizado por un error. Consulta la bitácora para más detalles. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sincronizar Actividad</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>No fue posible leer el archivo de exclusión del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Una carpeta de un almacenamiento externo ha sido agregada. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -904,17 +999,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea ¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Respaldo detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronización Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener los Archivos Locales como Conflictos</translation> </message> @@ -1030,12 +1125,12 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Agregar una Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1065,7 +1160,7 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Se presentó un error al cargar la lista de carpetas desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> @@ -1080,107 +1175,107 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Hay conflictos sin resolver. Haz click para más detalles. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando los cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>faltan %5 , %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Aguardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1311,11 +1406,6 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1464,83 +1554,79 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Archivos Ignorados por Patrones</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Agregar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permitir el Borrado</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Eliminar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Los archivos y carpetas que coincidan con el patrón no podrán ser sincronizadas. - -Lo elelemtnos donde el borrado se permita, serán borrados si evitan que un directorio sea eliminado. Esto es útil para los metadatos. </translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No fue posible abrir el archivo</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No se pueden escribir los cambios a '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Agrega Ignorar Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Agregar un nuevo patrón para ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1670,11 +1756,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configuraciones del Proxy</translation> @@ -1985,11 +2066,6 @@ mas privilegios durante el proceso.</translation> <source>Login in your browser</source> <translation>Iniciar sesión en tu navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2041,12 +2117,12 @@ No es recomendable usarlo. </translation> <translation>&Siguiente></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2124,79 +2200,79 @@ No es recomendable usarlo. </translation> <translation>No fue posible crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>¡No se especificó la carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 fue creada exitosamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectandola para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta dio como resultado el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota falló porque las credenciales proporcionadas están mal!<br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creación de la carpeta remota falló probablemente porque las credenciales proporcionadas son incorrectas. </font><br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creación de la carpeta remota %1 falló con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una conexión de sincronización de %1 al directorio remoto %2 fue establecida.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>¡Conectado exitosamente a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No se pudo establecer la conexión a %1. Por favor verifica de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Falla al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>No se puede eliminar la carpeta de respaldos porque la carpeta o un archivo en ella está en uso por otro programa. Por favor cierra la carpeta o archivo y haz click en reintentar o cancela la configuración.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>¡La carpeta de sincronización local %1 fue creada exitosamente!</b></font></translation> </message> @@ -2204,12 +2280,12 @@ No es recomendable usarlo. </translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Asistente de Conexión</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Omitir las carpetas de configuración</translation> </message> @@ -2243,7 +2319,7 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> @@ -2271,32 +2347,32 @@ No es recomendable usarlo. </translation> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos a la base de datos</translation> </message> @@ -2309,7 +2385,7 @@ No es recomendable usarlo. </translation> <translation>; La Restauración Falló: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un archivo o carpeta fue eliminado de un elemento compartido de solo lectura, pero la restauracion falló: %1</translation> </message> @@ -2441,27 +2517,27 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -2670,22 +2746,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -2758,22 +2834,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuarios o grupos ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Compartí algo contigo</translation> </message> @@ -2791,22 +2867,27 @@ No es recomendable usarlo. </translation> <translation>puede editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2833,8 +2914,8 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista de Depuración del Cifrado SSL</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3019,11 +3100,6 @@ No es recomendable usarlo. </translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar en este certificado de cualquier modo</translation> @@ -3052,44 +3128,49 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Huella (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huekka (SHA1):<tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Fecha Efectiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Fecha de Expiración: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emitido por: %1</translation> </message> @@ -3380,11 +3461,11 @@ No es recomendable usarlo. </translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versión %1. Para más información por favor visita <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3392,25 +3473,25 @@ No es recomendable usarlo. </translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3478,11 +3559,6 @@ No es recomendable usarlo. </translation> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ayuda</translation> @@ -3594,6 +3670,11 @@ No es recomendable usarlo. </translation> <translation>Nueva cuenta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3653,23 +3734,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3711,11 +3775,6 @@ No es recomendable usarlo. </translation> <translation>Carpeta &Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantener los datos locales</translation> @@ -3734,11 +3793,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nombre de Usuario</translation> @@ -3752,11 +3806,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Por favor cambia a tu navegador para continuar.</translation> @@ -3771,21 +3820,15 @@ No es recomendable usarlo. </translation> <source>Re-open Browser</source> <translation>Re-abrir el Navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3819,26 +3862,10 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>La totalidad de tu cuenta está sincronizada a la carpeta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3893,7 +3920,7 @@ No es recomendable usarlo. </translation> <translation>Hace algún tiempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3976,14 +4003,6 @@ No es recomendable usarlo. </translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index 46a6e58bf..09058367f 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Forma</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Elige una carpeta local en tu computadora para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecciona la ubiucación de la carpeta destino</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espacio de almacenamiento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Las carpetas no marcadas serán <b>eliminadas</b> de tu sistema de archivos local y ya no serán sincronizados a esta computadora</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sincronizar nada</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuales</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No hay cuentas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Agregar nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elige que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Eliminar la conexión de sincronización de carpetas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Falló la creación de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No fue posible crear la carpeta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar la Conexión de Sincronización de la Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La operación de sincronización está en curso. <br/>¿Deseas terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 se encuntra temporalmente no disponible</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Cerraste sesión en %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización del navegador. <a href='%1'>Haz click aquí</a> para re-abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>No hay conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirma la Remosion de la Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>¿Realmente quieres eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Reanudar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>¿Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible del espacio usado.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No hay %1 conexión configurada. </translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>La cuenta %1 no tiene las actividades habilitadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>No se puede leer %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ha sido renombrado a %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 se ha movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tiene un conflicto de sincronización. ¡Por favor verifica el archivo con conflicto!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no pudo ser sincronizado por un error. Consulta la bitácora para más detalles. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sincronizar Actividad</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>No fue posible leer el archivo de exclusión del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Una carpeta de un almacenamiento externo ha sido agregada. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -904,17 +999,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea ¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Respaldo detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronización Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener los Archivos Locales como Conflictos</translation> </message> @@ -1030,12 +1125,12 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Agregar una Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1065,7 +1160,7 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Se presentó un error al cargar la lista de carpetas desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> @@ -1080,107 +1175,107 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Hay conflictos sin resolver. Haz click para más detalles. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando los cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>faltan %5 , %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Aguardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1311,11 +1406,6 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1464,83 +1554,79 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Archivos Ignorados por Patrones</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Agregar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permitir el Borrado</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Eliminar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Los archivos y carpetas que coincidan con el patrón no podrán ser sincronizadas. - -Lo elelemtnos donde el borrado se permita, serán borrados si evitan que un directorio sea eliminado. Esto es útil para los metadatos. </translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No fue posible abrir el archivo</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No se pueden escribir los cambios a '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Agrega Ignorar Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Agregar un nuevo patrón para ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1670,11 +1756,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configuraciones del Proxy</translation> @@ -1985,11 +2066,6 @@ mas privilegios durante el proceso.</translation> <source>Login in your browser</source> <translation>Iniciar sesión en tu navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2041,12 +2117,12 @@ No es recomendable usarlo. </translation> <translation>&Siguiente></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2124,79 +2200,79 @@ No es recomendable usarlo. </translation> <translation>No fue posible crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>¡No se especificó la carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 fue creada exitosamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectandola para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta dio como resultado el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota falló porque las credenciales proporcionadas están mal!<br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creación de la carpeta remota falló probablemente porque las credenciales proporcionadas son incorrectas. </font><br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creación de la carpeta remota %1 falló con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una conexión de sincronización de %1 al directorio remoto %2 fue establecida.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>¡Conectado exitosamente a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No se pudo establecer la conexión a %1. Por favor verifica de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Falla al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>No se puede eliminar la carpeta de respaldos porque la carpeta o un archivo en ella está en uso por otro programa. Por favor cierra la carpeta o archivo y haz click en reintentar o cancela la configuración.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>¡La carpeta de sincronización local %1 fue creada exitosamente!</b></font></translation> </message> @@ -2204,12 +2280,12 @@ No es recomendable usarlo. </translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Asistente de Conexión</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Omitir las carpetas de configuración</translation> </message> @@ -2243,7 +2319,7 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> @@ -2271,32 +2347,32 @@ No es recomendable usarlo. </translation> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos a la base de datos</translation> </message> @@ -2309,7 +2385,7 @@ No es recomendable usarlo. </translation> <translation>; La Restauración Falló: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un archivo o carpeta fue eliminado de un elemento compartido de solo lectura, pero la restauracion falló: %1</translation> </message> @@ -2441,27 +2517,27 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -2670,22 +2746,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -2758,22 +2834,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuarios o grupos ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Compartí algo contigo</translation> </message> @@ -2791,22 +2867,27 @@ No es recomendable usarlo. </translation> <translation>puede editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2833,8 +2914,8 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista de Depuración del Cifrado SSL</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3019,11 +3100,6 @@ No es recomendable usarlo. </translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar en este certificado de cualquier modo</translation> @@ -3052,44 +3128,49 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Huella (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huekka (SHA1):<tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Fecha Efectiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Fecha de Expiración: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emitido por: %1</translation> </message> @@ -3380,11 +3461,11 @@ No es recomendable usarlo. </translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versión %1. Para más información por favor visita <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3392,25 +3473,25 @@ No es recomendable usarlo. </translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3478,11 +3559,6 @@ No es recomendable usarlo. </translation> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ayuda</translation> @@ -3594,6 +3670,11 @@ No es recomendable usarlo. </translation> <translation>Nueva cuenta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3653,23 +3734,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3711,11 +3775,6 @@ No es recomendable usarlo. </translation> <translation>Carpeta &Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantener los datos locales</translation> @@ -3734,11 +3793,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nombre de Usuario</translation> @@ -3752,11 +3806,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Por favor cambia a tu navegador para continuar.</translation> @@ -3771,21 +3820,15 @@ No es recomendable usarlo. </translation> <source>Re-open Browser</source> <translation>Re-abrir el Navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3819,26 +3862,10 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>La totalidad de tu cuenta está sincronizada a la carpeta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3893,7 +3920,7 @@ No es recomendable usarlo. </translation> <translation>Hace algún tiempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3976,14 +4003,6 @@ No es recomendable usarlo. </translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index 193ae492d..07a375476 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Forma</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Elige una carpeta local en tu computadora para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecciona la ubiucación de la carpeta destino</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espacio de almacenamiento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Las carpetas no marcadas serán <b>eliminadas</b> de tu sistema de archivos local y ya no serán sincronizados a esta computadora</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sincronizar nada</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuales</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No hay cuentas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Agregar nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elige que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Eliminar la conexión de sincronización de carpetas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Falló la creación de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No fue posible crear la carpeta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar la Conexión de Sincronización de la Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La operación de sincronización está en curso. <br/>¿Deseas terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 se encuntra temporalmente no disponible</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Cerraste sesión en %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización del navegador. <a href='%1'>Haz click aquí</a> para re-abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>No hay conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirma la Remosion de la Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>¿Realmente quieres eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Reanudar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>¿Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible del espacio usado.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No hay %1 conexión configurada. </translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>La cuenta %1 no tiene las actividades habilitadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>No se puede leer %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ha sido renombrado a %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 se ha movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tiene un conflicto de sincronización. ¡Por favor verifica el archivo con conflicto!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no pudo ser sincronizado por un error. Consulta la bitácora para más detalles. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sincronizar Actividad</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>No fue posible leer el archivo de exclusión del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Una carpeta de un almacenamiento externo ha sido agregada. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -904,17 +999,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea ¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Respaldo detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronización Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener los Archivos Locales como Conflictos</translation> </message> @@ -1030,12 +1125,12 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Agregar una Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1065,7 +1160,7 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Se presentó un error al cargar la lista de carpetas desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> @@ -1080,107 +1175,107 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Hay conflictos sin resolver. Haz click para más detalles. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando los cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>faltan %5 , %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Aguardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1311,11 +1406,6 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1464,83 +1554,79 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Archivos Ignorados por Patrones</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Agregar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permitir el Borrado</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Eliminar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Los archivos y carpetas que coincidan con el patrón no podrán ser sincronizadas. - -Lo elelemtnos donde el borrado se permita, serán borrados si evitan que un directorio sea eliminado. Esto es útil para los metadatos. </translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No fue posible abrir el archivo</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No se pueden escribir los cambios a '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Agrega Ignorar Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Agregar un nuevo patrón para ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1670,11 +1756,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configuraciones del Proxy</translation> @@ -1985,11 +2066,6 @@ mas privilegios durante el proceso.</translation> <source>Login in your browser</source> <translation>Iniciar sesión en tu navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2041,12 +2117,12 @@ No es recomendable usarlo. </translation> <translation>&Siguiente></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2124,79 +2200,79 @@ No es recomendable usarlo. </translation> <translation>No fue posible crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>¡No se especificó la carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 fue creada exitosamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectandola para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta dio como resultado el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota falló porque las credenciales proporcionadas están mal!<br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creación de la carpeta remota falló probablemente porque las credenciales proporcionadas son incorrectas. </font><br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creación de la carpeta remota %1 falló con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una conexión de sincronización de %1 al directorio remoto %2 fue establecida.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>¡Conectado exitosamente a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No se pudo establecer la conexión a %1. Por favor verifica de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Falla al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>No se puede eliminar la carpeta de respaldos porque la carpeta o un archivo en ella está en uso por otro programa. Por favor cierra la carpeta o archivo y haz click en reintentar o cancela la configuración.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>¡La carpeta de sincronización local %1 fue creada exitosamente!</b></font></translation> </message> @@ -2204,12 +2280,12 @@ No es recomendable usarlo. </translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Asistente de Conexión</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Omitir las carpetas de configuración</translation> </message> @@ -2243,7 +2319,7 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> @@ -2271,32 +2347,32 @@ No es recomendable usarlo. </translation> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos a la base de datos</translation> </message> @@ -2309,7 +2385,7 @@ No es recomendable usarlo. </translation> <translation>; La Restauración Falló: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un archivo o carpeta fue eliminado de un elemento compartido de solo lectura, pero la restauracion falló: %1</translation> </message> @@ -2441,27 +2517,27 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -2670,22 +2746,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -2758,22 +2834,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuarios o grupos ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Compartí algo contigo</translation> </message> @@ -2791,22 +2867,27 @@ No es recomendable usarlo. </translation> <translation>puede editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2833,8 +2914,8 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista de Depuración del Cifrado SSL</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3019,11 +3100,6 @@ No es recomendable usarlo. </translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar en este certificado de cualquier modo</translation> @@ -3052,44 +3128,49 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Huella (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huekka (SHA1):<tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Fecha Efectiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Fecha de Expiración: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emitido por: %1</translation> </message> @@ -3380,11 +3461,11 @@ No es recomendable usarlo. </translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versión %1. Para más información por favor visita <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3392,25 +3473,25 @@ No es recomendable usarlo. </translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3478,11 +3559,6 @@ No es recomendable usarlo. </translation> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ayuda</translation> @@ -3594,6 +3670,11 @@ No es recomendable usarlo. </translation> <translation>Nueva cuenta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3653,23 +3734,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3711,11 +3775,6 @@ No es recomendable usarlo. </translation> <translation>Carpeta &Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantener los datos locales</translation> @@ -3734,11 +3793,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nombre de Usuario</translation> @@ -3752,11 +3806,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Por favor cambia a tu navegador para continuar.</translation> @@ -3771,21 +3820,15 @@ No es recomendable usarlo. </translation> <source>Re-open Browser</source> <translation>Re-abrir el Navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3819,26 +3862,10 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>La totalidad de tu cuenta está sincronizada a la carpeta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3893,7 +3920,7 @@ No es recomendable usarlo. </translation> <translation>Hace algún tiempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3976,14 +4003,6 @@ No es recomendable usarlo. </translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index 98fa7d5c8..b741e1ded 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Forma</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Elige una carpeta local en tu computadora para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecciona la ubiucación de la carpeta destino</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espacio de almacenamiento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Las carpetas no marcadas serán <b>eliminadas</b> de tu sistema de archivos local y ya no serán sincronizados a esta computadora</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sincronizar nada</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuales</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No hay cuentas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Agregar nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elige que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Eliminar la conexión de sincronización de carpetas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Falló la creación de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No fue posible crear la carpeta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar la Conexión de Sincronización de la Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La operación de sincronización está en curso. <br/>¿Deseas terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 se encuntra temporalmente no disponible</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Cerraste sesión en %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización del navegador. <a href='%1'>Haz click aquí</a> para re-abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>No hay conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirma la Remosion de la Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>¿Realmente quieres eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Reanudar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>¿Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible del espacio usado.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No hay %1 conexión configurada. </translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>La cuenta %1 no tiene las actividades habilitadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>No se puede leer %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ha sido renombrado a %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 se ha movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tiene un conflicto de sincronización. ¡Por favor verifica el archivo con conflicto!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no pudo ser sincronizado por un error. Consulta la bitácora para más detalles. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sincronizar Actividad</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>No fue posible leer el archivo de exclusión del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Una carpeta de un almacenamiento externo ha sido agregada. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -904,17 +999,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea ¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Respaldo detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronización Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener los Archivos Locales como Conflictos</translation> </message> @@ -1030,12 +1125,12 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Agregar una Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1065,7 +1160,7 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Se presentó un error al cargar la lista de carpetas desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> @@ -1080,107 +1175,107 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Hay conflictos sin resolver. Haz click para más detalles. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando los cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>faltan %5 , %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Aguardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1311,11 +1406,6 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1464,83 +1554,79 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Archivos Ignorados por Patrones</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Agregar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permitir el Borrado</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Eliminar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Los archivos y carpetas que coincidan con el patrón no podrán ser sincronizadas. - -Lo elelemtnos donde el borrado se permita, serán borrados si evitan que un directorio sea eliminado. Esto es útil para los metadatos. </translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No fue posible abrir el archivo</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No se pueden escribir los cambios a '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Agrega Ignorar Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Agregar un nuevo patrón para ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1670,11 +1756,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configuraciones del Proxy</translation> @@ -1985,11 +2066,6 @@ mas privilegios durante el proceso.</translation> <source>Login in your browser</source> <translation>Iniciar sesión en tu navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2041,12 +2117,12 @@ No es recomendable usarlo. </translation> <translation>&Siguiente></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2124,79 +2200,79 @@ No es recomendable usarlo. </translation> <translation>No fue posible crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>¡No se especificó la carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 fue creada exitosamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectandola para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta dio como resultado el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota falló porque las credenciales proporcionadas están mal!<br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creación de la carpeta remota falló probablemente porque las credenciales proporcionadas son incorrectas. </font><br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creación de la carpeta remota %1 falló con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una conexión de sincronización de %1 al directorio remoto %2 fue establecida.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>¡Conectado exitosamente a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No se pudo establecer la conexión a %1. Por favor verifica de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Falla al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>No se puede eliminar la carpeta de respaldos porque la carpeta o un archivo en ella está en uso por otro programa. Por favor cierra la carpeta o archivo y haz click en reintentar o cancela la configuración.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>¡La carpeta de sincronización local %1 fue creada exitosamente!</b></font></translation> </message> @@ -2204,12 +2280,12 @@ No es recomendable usarlo. </translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Asistente de Conexión</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Omitir las carpetas de configuración</translation> </message> @@ -2243,7 +2319,7 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> @@ -2271,32 +2347,32 @@ No es recomendable usarlo. </translation> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos a la base de datos</translation> </message> @@ -2309,7 +2385,7 @@ No es recomendable usarlo. </translation> <translation>; La Restauración Falló: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un archivo o carpeta fue eliminado de un elemento compartido de solo lectura, pero la restauracion falló: %1</translation> </message> @@ -2441,27 +2517,27 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -2670,22 +2746,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -2758,22 +2834,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuarios o grupos ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Compartí algo contigo</translation> </message> @@ -2791,22 +2867,27 @@ No es recomendable usarlo. </translation> <translation>puede editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2833,8 +2914,8 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista de Depuración del Cifrado SSL</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3019,11 +3100,6 @@ No es recomendable usarlo. </translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar en este certificado de cualquier modo</translation> @@ -3052,44 +3128,49 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Huella (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huekka (SHA1):<tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Fecha Efectiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Fecha de Expiración: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emitido por: %1</translation> </message> @@ -3380,11 +3461,11 @@ No es recomendable usarlo. </translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versión %1. Para más información por favor visita <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3392,25 +3473,25 @@ No es recomendable usarlo. </translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3478,11 +3559,6 @@ No es recomendable usarlo. </translation> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ayuda</translation> @@ -3594,6 +3670,11 @@ No es recomendable usarlo. </translation> <translation>Nueva cuenta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3653,23 +3734,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3711,11 +3775,6 @@ No es recomendable usarlo. </translation> <translation>Carpeta &Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantener los datos locales</translation> @@ -3734,11 +3793,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nombre de Usuario</translation> @@ -3752,11 +3806,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Por favor cambia a tu navegador para continuar.</translation> @@ -3771,21 +3820,15 @@ No es recomendable usarlo. </translation> <source>Re-open Browser</source> <translation>Re-abrir el Navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3819,26 +3862,10 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>La totalidad de tu cuenta está sincronizada a la carpeta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3893,7 +3920,7 @@ No es recomendable usarlo. </translation> <translation>Hace algún tiempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3976,14 +4003,6 @@ No es recomendable usarlo. </translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index c036be18e..97157444b 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Forma</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Elige una carpeta local en tu computadora para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecciona la ubiucación de la carpeta destino</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espacio de almacenamiento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Las carpetas no marcadas serán <b>eliminadas</b> de tu sistema de archivos local y ya no serán sincronizados a esta computadora</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sincronizar nada</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuales</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>No hay cuentas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Agregar nuevo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Elige que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Eliminar la conexión de sincronización de carpetas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Falló la creación de la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No fue posible crear la carpeta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar la Conexión de Sincronización de la Carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La operación de sincronización está en curso. <br/>¿Deseas terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>El servidor %1 se encuntra temporalmente no disponible</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Cerraste sesión en %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obteniendo autorización del navegador. <a href='%1'>Haz click aquí</a> para re-abrir el navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>No hay conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirma la Remosion de la Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>¿Realmente quieres eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Reanudar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>¿Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrará ningún archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible del espacio usado.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>No hay %1 conexión configurada. </translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>La cuenta %1 no tiene las actividades habilitadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>No se puede leer %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ha sido renombrado a %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 se ha movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido descargados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform><numerusform>%1 y %n otro(s) archivo(s) tienen confictos de sincronización.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tiene un conflicto de sincronización. ¡Por favor verifica el archivo con conflicto!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform><numerusform>%1 y %n otro(s) archivo(s) no puideron ser sincronizado por errores. Consulta la bitácora para más detalles. </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no pudo ser sincronizado por un error. Consulta la bitácora para más detalles. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sincronizar Actividad</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>No fue posible leer el archivo de exclusión del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Una carpeta de un almacenamiento externo ha sido agregada. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Si esto fue un accidente y decides mantener tus archivos, estos se re-sincronizaran desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -904,17 +999,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea ¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Respaldo detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronización Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener los Archivos Locales como Conflictos</translation> </message> @@ -1030,12 +1125,12 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Agregar una Conexión de Sincronización de Carpeta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Archivo</translation> </message> @@ -1065,7 +1160,7 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Se presentó un error al cargar la lista de carpetas desde el servidor. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Sesión cerrada</translation> </message> @@ -1080,107 +1175,107 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Hay conflictos sin resolver. Haz click para más detalles. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando los cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargando %1/seg</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>faltan %5 , %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Aguardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando a %n otra(s) carpeta(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1311,11 +1406,6 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1464,83 +1554,79 @@ Continuar con la sincronización como normal causará que todos tus archivos sea <translation>Archivos Ignorados por Patrones</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Agregar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permitir el Borrado</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Eliminar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Los archivos y carpetas que coincidan con el patrón no podrán ser sincronizadas. - -Lo elelemtnos donde el borrado se permita, serán borrados si evitan que un directorio sea eliminado. Esto es útil para los metadatos. </translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>No fue posible abrir el archivo</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>No se pueden escribir los cambios a '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Agrega Ignorar Patrón</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Agregar un nuevo patrón para ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entidad la proporciona el sistema en '%1' y no puede ser modificada en esta vista.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1670,11 +1756,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configuraciones del Proxy</translation> @@ -1985,11 +2066,6 @@ mas privilegios durante el proceso.</translation> <source>Login in your browser</source> <translation>Iniciar sesión en tu navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2041,12 +2117,12 @@ No es recomendable usarlo. </translation> <translation>&Siguiente></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2124,79 +2200,79 @@ No es recomendable usarlo. </translation> <translation>No fue posible crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>¡No se especificó la carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 fue creada exitosamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectandola para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta dio como resultado el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota falló porque las credenciales proporcionadas están mal!<br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creación de la carpeta remota falló probablemente porque las credenciales proporcionadas son incorrectas. </font><br/> Por favor regresa y verifica tus credenciales.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creación de la carpeta remota %1 falló con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una conexión de sincronización de %1 al directorio remoto %2 fue establecida.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>¡Conectado exitosamente a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No se pudo establecer la conexión a %1. Por favor verifica de nuevo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Falla al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>No se puede eliminar la carpeta de respaldos porque la carpeta o un archivo en ella está en uso por otro programa. Por favor cierra la carpeta o archivo y haz click en reintentar o cancela la configuración.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>¡La carpeta de sincronización local %1 fue creada exitosamente!</b></font></translation> </message> @@ -2204,12 +2280,12 @@ No es recomendable usarlo. </translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Asistente de Conexión</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Omitir las carpetas de configuración</translation> </message> @@ -2243,7 +2319,7 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> @@ -2271,32 +2347,32 @@ No es recomendable usarlo. </translation> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos a la base de datos</translation> </message> @@ -2309,7 +2385,7 @@ No es recomendable usarlo. </translation> <translation>; La Restauración Falló: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un archivo o carpeta fue eliminado de un elemento compartido de solo lectura, pero la restauracion falló: %1</translation> </message> @@ -2441,27 +2517,27 @@ No es recomendable usarlo. </translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -2670,22 +2746,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -2758,22 +2834,22 @@ No es recomendable usarlo. </translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuarios o grupos ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>No se encontraron resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Compartí algo contigo</translation> </message> @@ -2791,22 +2867,27 @@ No es recomendable usarlo. </translation> <translation>puede editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2833,8 +2914,8 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista de Depuración del Cifrado SSL</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3019,11 +3100,6 @@ No es recomendable usarlo. </translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar en este certificado de cualquier modo</translation> @@ -3052,44 +3128,49 @@ No es recomendable usarlo. </translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidad: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Huella (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Huekka (SHA1):<tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Fecha Efectiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Fecha de Expiración: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emitido por: %1</translation> </message> @@ -3380,11 +3461,11 @@ No es recomendable usarlo. </translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versión %1. Para más información por favor visita <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3392,25 +3473,25 @@ No es recomendable usarlo. </translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3478,11 +3559,6 @@ No es recomendable usarlo. </translation> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ayuda</translation> @@ -3594,6 +3670,11 @@ No es recomendable usarlo. </translation> <translation>Nueva cuenta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3653,23 +3734,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3711,11 +3775,6 @@ No es recomendable usarlo. </translation> <translation>Carpeta &Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantener los datos locales</translation> @@ -3734,11 +3793,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nombre de Usuario</translation> @@ -3752,11 +3806,6 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Por favor cambia a tu navegador para continuar.</translation> @@ -3771,21 +3820,15 @@ No es recomendable usarlo. </translation> <source>Re-open Browser</source> <translation>Re-abrir el Navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3819,26 +3862,10 @@ No es recomendable usarlo. </translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>La totalidad de tu cuenta está sincronizada a la carpeta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3893,7 +3920,7 @@ No es recomendable usarlo. </translation> <translation>Hace algún tiempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3976,14 +4003,6 @@ No es recomendable usarlo. </translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_et.ts b/translations/client_et.ts index 1d0cc962c..4b6399113 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Vorm</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Vali oma arvutist sünkroniseeritav kataloog</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Vali eemalolev sihtkaust</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Salvestusruum: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Märkimata kataloogid <b>eemaldatakse</b> kohalikust failisüsteemist ning neid ei sünkroniseerita enam sellesse arvutisse</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Rakenda</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Loobu</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Ühendatud <server> kasutajana <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Ühtegi kontot pole seadistatud</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Lisa uus</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eemalda</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Vali, mida sünkroniseerida</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Kausta loomine ebaõnnestus</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sünkroniseerimine on käimas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 kasutusel</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 as <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Ühendatud %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 pole ajutiselt saadaval.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Logi sisse</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Kinnita konto eemaldamine</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Eemalda ühendus</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Ava kaust</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Logi välja</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Taasta sünroonimist</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Peata sünkroonimine</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Hetkel pole mahu kasutuse info saadaval.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Ühtegi %1 ühendust pole seadistatud.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Tekstisilt</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation type="unfinished"/> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,118 +835,118 @@ <translation>%1 pole loetav.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 on eemaldatud.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 on alla laaditud.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 on uuendatud.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 on ümber nimetatud %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 on tõstetud %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 sünkroniseerimine ebaõnnestus tõrke tõttu. Lisainfot vaata logist.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sünkroniseerimise tegevus</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Süsteemi väljajätmiste faili lugemine ebaõnnestus</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -860,7 +955,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -868,46 +963,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Leiti varukoopia</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Tavaline sünkroonimine</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1023,12 +1118,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Fail</translation> </message> @@ -1058,7 +1153,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Välja logitud</translation> </message> @@ -1073,107 +1168,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sünkroniseerimine %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>allalaadimine %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>üleslaadimine %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 / %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 / %2, fail %3 / %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>fail %1 / %2-st</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Ootamine...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Sünkroniseerimiseks valmistumine...</translation> </message> @@ -1304,11 +1399,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1457,81 +1547,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Mustri poolt ignoreeritud failid</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Lisa</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Selle kirje on pakkunud süsteem '%1' ning seda ei saa antud vaates muuta.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Muster</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Luba kustutamine</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Eemalda</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Ei suutunud avada faili</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Ei saa kirjutada muudatusi '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Lisa ignoreerimise muster</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Lisa uus ignoreerimise muster:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Selle kirje on pakkunud süsteem '%1' ning seda ei saa antud vaates muuta.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1661,11 +1749,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Proksi seaded</translation> @@ -1975,11 +2058,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2031,12 +2109,12 @@ Selle kasutamine pole soovitatav.</translation> <translation>&Edasi ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2114,79 +2192,79 @@ Selle kasutamine pole soovitatav.</translation> <translation>Ei suuda tekitada kohalikku kataloogi %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Ühtegi võrgukataloogi pole määratletud!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Viga: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Eemalolev kaust %1 on loodud.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Serveris on kataloog %1 juba olemas. Ühendan selle sünkroniseerimiseks.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Kausta tekitamine lõppes HTTP veakoodiga %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Kataloogi loomine serverisse ebaõnnestus, kuna kasutajatõendid on valed!<br/>Palun kontrolli oma kasutajatunnust ja parooli.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Serveris oleva kataloogi tekitamine ebaõnnestus tõenäoliselt valede kasutajatunnuste tõttu.</font><br/>Palun mine tagasi ning kontrolli kasutajatunnust ning parooli.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Kataloogi %1 tekitamine serverisse ebaõnnestus veaga <tt>%2</tt></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Loodi sünkroniseerimisühendus kataloogist %1 serveri kataloogi %2</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Edukalt ühendatud %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Ühenduse loomine %1 ebaõnnestus. Palun kontrolli uuesti.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Kataloogi ümbernimetamine ebaõnnestus</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Ei suuda eemaldada ning varundada kataloogi kuna kataloog või selles asuv fail on avatud mõne teise programmi poolt. Palun sulge kataloog või fail ning proovi uuesti või katkesta paigaldus.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Kohalik kataloog %1 edukalt loodud!</b></font></translation> </message> @@ -2194,12 +2272,12 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 seadistamise juhendaja</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Jäta kaustade seadistamine vahele</translation> </message> @@ -2233,7 +2311,7 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -2261,32 +2339,32 @@ Selle kasutamine pole soovitatav.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Fail on serverist kustutatud</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Faili täielik allalaadimine ebaõnnestus.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Faili on pärast avastamist muudetud</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -2299,7 +2377,7 @@ Selle kasutamine pole soovitatav.</translation> <translation>; Taastamine ebaõnnestus: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -2431,27 +2509,27 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -2660,22 +2738,22 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>Tekstisilt</translation> </message> @@ -2748,22 +2826,22 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Jaga kasutajate või gruppidega ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation type="unfinished"/> </message> @@ -2781,22 +2859,27 @@ Selle kasutamine pole soovitatav.</translation> <translation>saab muuta</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2823,7 +2906,7 @@ Selle kasutamine pole soovitatav.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> @@ -3009,11 +3092,6 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Usalda siiski seda sertifikaati</translation> @@ -3042,44 +3120,49 @@ Selle kasutamine pole soovitatav.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organisatsioon: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Ühik: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Riik: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Sõrmejälg (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Sõrmejälg (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Efektiivne kuupäev: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Aegumise kuupäev: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Esitaja: %1</translation> </message> @@ -3370,11 +3453,11 @@ Selle kasutamine pole soovitatav.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3382,25 +3465,25 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3468,11 +3551,6 @@ Selle kasutamine pole soovitatav.</translation> <translation>Seaded...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Üksikasjad...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Abiinfo</translation> @@ -3584,6 +3662,11 @@ Selle kasutamine pole soovitatav.</translation> <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3643,23 +3726,6 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>Tekstisilt</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Server</translation> @@ -3701,11 +3767,6 @@ Selle kasutamine pole soovitatav.</translation> <translation>&Kohalik kataloog</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Säilita kohalikud andmed</translation> @@ -3724,11 +3785,6 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Kasutajatunnus</translation> @@ -3742,11 +3798,6 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation type="unfinished"/> @@ -3761,21 +3812,15 @@ Selle kasutamine pole soovitatav.</translation> <source>Re-open Browser</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Tekstisilt</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3809,26 +3854,10 @@ Selle kasutamine pole soovitatav.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TekstiSilt</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Kogu Su konto sünkroniseeriti kohalikku kataloogi</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Nupp</translation> - </message> </context> <context> <name>QObject</name> @@ -3883,7 +3912,7 @@ Selle kasutamine pole soovitatav.</translation> <translation>Mõni aeg tagasi</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3966,14 +3995,6 @@ Selle kasutamine pole soovitatav.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_eu.ts b/translations/client_eu.ts index fd72a44b3..a61a5f619 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -4,93 +4,88 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="107"/> <source>%1 (%2, %3)</source> - <translation type="unfinished"/> + <translation>%1 (%2, %3)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/> <source>Checking for changes in '%1'</source> - <translation type="unfinished"/> + <translation>'%1'-(e)an aldaketak begiratzen</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/> <source>Syncing %1 of %2 (%3 left)</source> - <translation type="unfinished"/> + <translation>Sinkronizatzen %2-tik %1 (%3 falta da)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/> <source>Syncing %1 of %2</source> - <translation type="unfinished"/> + <translation>Sinkronizatzen %2-tik %1</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/> <source>Syncing %1 (%2 left)</source> - <translation type="unfinished"/> + <translation>Sinkronizatzen %1 (%2 falta da)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/> <source>Syncing %1</source> - <translation type="unfinished"/> + <translation>Sinkronizatzen %1 </translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation type="unfinished"/> + <translation>Azken aldian ez aldaketarik egon.</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> <source>Sync paused</source> - <translation type="unfinished"/> + <translation>Sinkronizazioa pausatua</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="184"/> <source>Syncing</source> - <translation type="unfinished"/> + <translation>Sinkronizatzen</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>Ireki webgunea</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>Azken aldian aldatuta</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>Pausatu sinkronizazioa</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>Laguntza</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>Ezarpenak</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>Amaitu saioa</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> <source>Quit sync client</source> - <translation type="unfinished"/> + <translation>Irten sinkronizazio bezerotik</translation> </message> </context> <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etiketa</translation> @@ -101,28 +96,79 @@ <message> <location filename="../src/common/filesystembase.cpp" line="445"/> <source>Could not make directories in trash</source> - <translation type="unfinished"/> + <translation>Ezin da direktoriorik egin zakarrontzian</translation> </message> <message> <location filename="../src/common/filesystembase.cpp" line="459"/> <location filename="../src/common/filesystembase.cpp" line="465"/> <source>Could not move '%1' to '%2'</source> - <translation type="unfinished"/> + <translation>Ezin da '%1' '%2'-ra mugitu</translation> </message> <message> <location filename="../src/common/filesystembase.cpp" line="502"/> <source>Moving to the trash is not implemented on this platform</source> + <translation>Plataforma honetan ezin da mugitu zakarrontzira</translation> + </message> +</context> +<context> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> <translation type="unfinished"/> </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Formularioa</translation> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Hautatu zure ordenagailuko karpeta lokala sinkronizatzeko</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formularioa</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Hautatu hurruneko helburu karpeta</translation> @@ -181,285 +222,296 @@ <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="403"/> <source>Server replied "%1 %2" to "%3 %4"</source> - <translation type="unfinished"/> + <translation>Zerbitzariak erantzun du "%1 %2" "%3 %4"-ra</translation> </message> </context> <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> - <translation type="unfinished"/> + <translation>Amaitu muturretik muturrerako zifratzea</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> - <translation type="unfinished"/> + <translation>Zure nortasun kriptografikoa babesteko, hiztegietako 12 hitzen mnemoniko batekin zifratzen dugu. Mesedez, kontuan hartu horiek eta gorde itzazu. Beharrezkoak izango dira zure kontuan beste gailu batzuk gehitzeko (telefono mugikorra edo ordenagailu eramangarria adibidez).</translation> </message> </context> <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formularioa</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Biltegiratze ahalmena: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Desmarkatutako karpetak zure bertako fitxategi sistematik <b>ezabatuko</b> dira eta ez dira gehiago ordenagailu honekin sinkronizatuko</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sinkronizatu dena</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Ez sinkronizatu ezer</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplikatu eskuzko aldaketak</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplikatu</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Ezeztatu</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation><user> bezala <server>-n konektatuta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Ez da konturik konfiguratu.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Gehitu berria</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Ezabatu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Kontua</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Kontu honek onartzen du muturretik muturrerako zifratzea</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Gaitu zifratzea</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> - <translation type="unfinished"/> + <translation>Erakutsi E2E mnemoteknikoa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Zifratu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Hautatu zer sinkronizatu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Behartu orain sinkronizatzen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Berrabiarazi sinkronizazioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Ezabatu karpeta honen konexioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Karpeta sortzeak huts egin du</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Ezin izan da <i>%1</i> bertako karpeta sortu.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Baieztatu Karpetaren Konexioaren Ezabatzea</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Ezabatu Karpeta Honen Konexioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sinkronizazioa martxan da</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 erabiltzen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Zerbitzariaren bertsioa %1 zaharra eta euskarririk gabekoa da! Zure ardurapean aritu.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>%1ra konektatuta.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>%1 zerbitzaria ez dago orain eskuragarri</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>%1 zerbitzaria une honetan mantenu lanetan dago.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>%1etik saioa itxita.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Nabigatzailearen baimena eskuratzen. Egin <a href= '%1'>klik hemen</a> nabigatzailea berrabiarazteko.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> - <translation>%1(r)ekin konektatzen</translation> + <translation>%1(r)ekin konektatzen...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Konexiorik ez %1-ekin %2-etan</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Hasi saioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hainbat karpeta ez dira sinkronizatu handiegiak direlako:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hainbat karpeta ez dira sinkronizatu kanpoko biltegietan daudelako:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hainbat karpeta ez dira sinkronizatu handiegiak direlako edo kanpoko biltegietan daudelako:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Baieztatu Kontuaren Ezabatzea</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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"/> + <translation><p>Ziur zaude <i>%1</i>kontuaren konexioa kendu nahi duzula?</p><p><b>Oharra:</b> Honek<b>ez</b> du fitxategirik ezabatuko.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Ezabatu konexioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Ireki karpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Saioa bukatu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Berrekin sinkronizazioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Gelditu sinkronizazioa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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 type="unfinished"/> + <translation><p>Ziur zaude <i>%1</i>karpetaren sinkronizazioa gelditu nahi duzula?</p><p><b>Oharra:</b> Honek <b>ez</b> du fitxategirik ezabatuko.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> - <translation type="unfinished"/> + <translation>%2-tik %1 (%3%) erabiltzen ari da. Zenbait karpetek, sarean muntatutako edo partekatutako karpetak barne, muga desberdinak izan ditzakete.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%2tik %1 erabilita</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Ez dago %1 konexiorik konfiguratuta.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formularioa</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TestuEtiketa</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Onartu</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> - <translation type="unfinished"/> + <translation>Sinkronizatuta</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> - <translation type="unfinished"/> + <translation>Saiatu berriro denak kargatzen</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>%1 kontuak ez ditu jarduerak gaituta.</translation> </message> @@ -588,7 +630,7 @@ <message> <location filename="../src/gui/addcertificatedialog.ui" line="35"/> <source>Certificate & Key (pkcs12) :</source> - <translation type="unfinished"/> + <translation>Egiaztagiria eta gakoa (pkcs12) :</translation> </message> <message> <location filename="../src/gui/addcertificatedialog.ui" line="51"/> @@ -621,12 +663,12 @@ <message> <location filename="../src/gui/application.cpp" line="193"/> <source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source> - <translation type="unfinished"/> + <translation>% 1 konfigurazio fitxategian sartzean akats bat gertatu da. Egiaztatu zure erabiltzaileak fitxategi hau atzitzeko baimena duela.</translation> </message> <message> <location filename="../src/gui/application.cpp" line="196"/> <source>Quit %1</source> - <translation type="unfinished"/> + <translation>%1etik Irten</translation> </message> </context> <context> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Errorea metadatuak datu-basean idaztean</translation> </message> @@ -663,14 +705,14 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> - <translation type="unfinished"/> + <translation>Sartu zure muturretik muturrerako zifratzeko pasahitza:<br><br>Erabiltzailea: %2<br>Kontua: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> - <translation type="unfinished"/> + <translation>Sartu muturretik muturrerako (E2E) pasahitza</translation> </message> </context> <context> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,178 +835,190 @@ <translation>%1 ezin da irakurri.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ezabatua izan da.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 deskargatu da.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 kargatu da.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 %2-(e)ra berrizendatu da.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 %2-(e)ra mugitu da.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%1 eta beste fitxategi %n ezabatu dira.</numerusform><numerusform>%1 eta beste %n fitxategi ezabatu dira.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%1 eta beste fitxategi %n deskargatu dira.</numerusform><numerusform>%1 eta beste %n fitxategi deskargatu dira.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%1 eta beste fitxategi %n eguneratu dira.</numerusform><numerusform>%1 eta beste %n fitxategi eguneratu dira.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%1 fitxategiak %2 izen berria hartu du eta beste fitxategi %n berrizendatu da.</numerusform><numerusform>%1 fitxategiak %2 izen berria hartu du eta beste %n fitxategi berrizendatu dira.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%1 fitxategia %2-ra mugitu da eta beste fitxategi %n mugitu da.</numerusform><numerusform>%1 fitxategia %2-ra mugitu da eta beste %n fitxategi mugitu dira.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%1 eta beste fitxategi %n sinkronizazio gatazkak izan dituzte.</numerusform><numerusform>%1 eta beste %n fitxategi sinkronizazio gatazkak izan dituzte.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> - <translation type="unfinished"/> + <translation>%1 sinkronizazio gatazka izan du. Begiratu gatazkaren fitxategia!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%1 eta beste fitxateg %ni ezin izan dira sinkronizatu erroreak direla eta. Ikusi egunkaria xehetasun gehiago izateko.</numerusform><numerusform>%1 eta beste %n fitxategi ezin izan dira sinkronizatu erroreak direla eta. Ikusi egunkaria xehetasun gehiago izateko.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> - <translation>%1 ezin izan da sinkronizatu akats bat dela eta. Ikusi egunerkoa zehaztapen gehiago izateko.</translation> + <translation>%1 ezin izan da sinkronizatu errore bat dela eta. Ikusi egunkaria xehetasun gehiago izateko.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sinkronizazio Jarduerak</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Ezin izan da sistemako baztertutakoen fitxategia irakurri</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>%1 MB baino handiagoa den karpeta berri bat gehitu da: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Kanpoko biltegi bateko karpeta gehitu da. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> - <translation type="unfinished"/> + <translation>Jo ezarpenetara aukeratzeko deskargatu nahi ote duzun.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> - <translation type="unfinished"/> + <translation>%1 karpeta sortu zen baina sinkronizaziotik kanpo ezarri zen. Haren barneko fitxategiak ez dira sinkronizatuko.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> - <translation type="unfinished"/> + <translation>%1 fitxategia sortu zen baina sinkronizaziotik kanpo ezarri zen. Fitxategia ez da sinkronizatuko.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). %1</source> - <translation type="unfinished"/> + <translation>Sinkronizatutako karpeten aldaketen segimendua ezin izan da egin fidagarritasunez. + +Honek esan nahi du sinkronizazio bezeroak agian ez duela berehalakoan kargatuko tokiko aldaketak eta haren ordez tokiko aldaketak bilatu eta tarteka kargatuko ditu (berez, bi orduero). + +%1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep 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>Sinkronizazio '%1' karpetako fitxategi guztiak ezabatu dira zerbitzarian. +Ezabaketa horiek zure tokiko sinkronizazio karpetan sinkronizatuko dira, hartara ezingo dituzu fitxategiok erabili leheneratzeko eskubidea izan ezean. +Fitxategiok mantentzea erabakitzen baduzu, birsinkronizatuko dira zerbitzarian, horretarako eskubiderik baduzu. +Fitxategiok ezabatzea erabakitzen baduzu, ezingo dituzu berriro erabili, horien jabea izan ezean.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Fitxategi berriak deskargatu?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Fitxategi berriak deskargatu</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> - <translation type="unfinished"/> + <translation>Mantendu tokiko fitxategiak</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> - <translation type="unfinished"/> + <translation>Zure tokiko '%1' sinkronizazio karpetako fitxategi guztiak ezabatu dira. Ezabaketa hauek zerbitzarian sinkronizatuko dira, beraz ezingo dituzu fitxategiok erabili leheneratu ezean. +Ziur zaude ekintza hauek zerbitzarian sinkronizatu nahi dituzula? +Ezabaketa nahigabea izan bada eta erabakitzen baduzu fitxategiok mantentzea, hauek zerbitzarian bir-sinkronizatuko dira.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> - <translation type="unfinished"/> + <translation>Sinkronizazio honek '%1' sinkronizazio karpetako fitxategiak aurreko egoerara berrezarriko ditu. +Hau izan daiteke babeskopia bat zerbitzarian leheneratu delako. +Sinkronizazio honekin segitzen baduzu litekeena da aurreko egoerako fitxategiek oraingoak berridaztea. +Nahi al duzu zure tokiko fitxategi berrienak gatazkako fitxategi gisa mantentzea?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> - <translation type="unfinished"/> + <translation>Babes-kopia hauteman da</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> - <translation type="unfinished"/> + <translation>Sinkronizazio normala</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> - <translation type="unfinished"/> + <translation>Mantendu fitxategi lokalak gatazka gisa</translation> </message> </context> <context> @@ -959,12 +1066,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderman.cpp" line="1220"/> <source>Sync was successful, unresolved conflicts.</source> - <translation type="unfinished"/> + <translation>Sinkronizazioa behar bezala burutu da, konpondu gabeko gatazkak.</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1222"/> <source>Last Sync was successful.</source> - <translation>Azkeneko sinkronizazioa ongi burutu zen.</translation> + <translation>Azkeneko sinkronizazioa behar bezala burutu da.</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1228"/> @@ -974,7 +1081,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderman.cpp" line="1231"/> <source>User Abort.</source> - <translation>Erabiltzaileak bertan behera utzi.</translation> + <translation>Erabiltzaileak bertan behera utzi du.</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1234"/> @@ -989,7 +1096,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderman.cpp" line="1248"/> <source>No valid folder selected!</source> - <translation>Ez da karpeta egokirik hautatu!</translation> + <translation>Ez da baliozko karpetarik hautatu!</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1258"/> @@ -1004,17 +1111,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderman.cpp" line="1318"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> - <translation type="unfinished"/> + <translation>Dagoeneko sinkronizazio bat dago zerbitzaritik karpeta lokal honetara. Aukeratu tokiko beste karpeta bat!</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1298"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> - <translation type="unfinished"/> + <translation>Tokiko '%1' karpetak badu dagoeneko sinkronizatutako karpeta bat. Hautatu beste bat!</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1304"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> - <translation type="unfinished"/> + <translation>Tokiko '%1' karpeta dagoeneko sinkronizatutako karpeta batean dago. Hautatu beste bat!</translation> </message> </context> <context> @@ -1025,12 +1132,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Gehitu Karpeta Sinkronizatzeko Konexioa</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Fitxategia</translation> </message> @@ -1060,7 +1167,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Errorea zerbitzaritik karpeten zerrenda eskuratzean.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Saioa bukatuta</translation> </message> @@ -1075,107 +1182,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Konpondu gabeko gatazkak daude. Klikatu zehaztasunak ikusteko.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> - <translation type="unfinished"/> + <translation>Aldaketak bateratzen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>%1 Sinkronizatzen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Deskargatu %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> - <translation>igo %1/s</translation> + <translation>Kargatu %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> - <translation type="unfinished"/> + <translation>Begiratzen ea aldaketarik dagoen urrutiko '%1'-(e)an</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> - <translation type="unfinished"/> + <translation>Begiratzen ea aldaketarik dagoen tokiko '%1'-(e)an</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%4 - %3tik)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> - <translation type="unfinished"/> + <translation>%5 falta da,%2tik %1 , %4tik %3 fitxategi</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> - <translation type="unfinished"/> + <translation>%2tik %1 , %4tik %3 fitxategi</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>%1. fitxategia %2tik</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Itxoiten...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Itxoiten beste karpeta %n...</numerusform><numerusform>Itxoiten beste %n karpeta...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Sinkronizatzeko prestatzen...</translation> </message> @@ -1185,7 +1292,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> - <translation type="unfinished"/> + <translation>Arazo hau normalean inotify erlojuak agortu direnean gertatzen da. Begiratu ohiko galderetan zehaztasunetarako.</translation> </message> </context> <context> @@ -1306,14 +1413,9 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formularioa</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> - <translation type="unfinished"/> + <translation>Legezko oharra</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="66"/> @@ -1323,12 +1425,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.ui" line="72"/> <source>For System Tray</source> - <translation type="unfinished"/> + <translation>Sistemaren erretilurako</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="89"/> <source>Show Server &Notifications</source> - <translation type="unfinished"/> + <translation>Erakutsi zerbitzariaren jakinarazpenak</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="163"/> @@ -1338,7 +1440,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.ui" line="195"/> <source>Ask for confirmation before synchronizing folders larger than</source> - <translation type="unfinished"/> + <translation>Eskatu baimena handiagoak diren karpetak sinkronizatu baino lehen</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="215"/> @@ -1349,7 +1451,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.ui" line="239"/> <source>Ask for confirmation before synchronizing external storages</source> - <translation type="unfinished"/> + <translation>Eskatu baimena kanpoko biltegiak sinkronizatu baino lehen</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="82"/> @@ -1364,17 +1466,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.ui" line="171"/> <source>Edit &Ignored Files</source> - <translation type="unfinished"/> + <translation>Editatu eta baztertutako fitxategiak</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="250"/> <source>Show sync folders in &Explorer's Navigation Pane</source> - <translation type="unfinished"/> + <translation>Erakutsi sinkronizatutako karpetak arakatzailearen nabigazio panelean</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="267"/> <source>S&how crash reporter</source> - <translation type="unfinished"/> + <translation>Erakutsi kraskaduraren txostena</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="20"/> @@ -1395,7 +1497,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.cpp" line="49"/> <source>Server notifications that require attention.</source> - <translation type="unfinished"/> + <translation>Arreta eskatzen duten zerbitzariaren jakinarazpenak.</translation> </message> </context> <context> @@ -1403,14 +1505,16 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/socketapi.cpp" line="520"/> <source>Sharing error</source> - <translation>Akatsa partekatzerakoan</translation> + <translation>Errorea partekatzerakoan</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="521"/> <source>Could not retrieve or create the public link share. Error: %1</source> - <translation type="unfinished"/> + <translation>Ezin izan da berreskuratu edo sortu esteka publikoaren partekatzea. Errorea: + +%1</translation> </message> </context> <context> @@ -1418,12 +1522,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="100"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> - <translation type="unfinished"/> + <translation>Sartu %1 pasahitza:<br><br>Erabiltzailea: %2<br>Kontua: %3<br></translation> </message> <message> <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="114"/> <source>Reading from keychain failed with error: '%1'</source> - <translation type="unfinished"/> + <translation>Giltzatako irakurketa errorea: '%1'</translation> </message> <message> <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="120"/> @@ -1433,7 +1537,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="156"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> - <translation type="unfinished"/> + <translation><a href="%1">Egin klik hemen</a> eskatzeko aplikazio pasahitz bat web interfazetik.</translation> </message> </context> <context> @@ -1446,7 +1550,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 type="unfinished"/> + <translation>Ezikusien ezarpen orokorrak </translation> </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="26"/> @@ -1456,84 +1560,80 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/ignorelisteditor.ui" line="36"/> <source>Files Ignored by Patterns</source> - <translation type="unfinished"/> + <translation>Ezikusitako fitxategiak ereduen arabera</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Gehitu</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Sarrera hau sistemak "% 1" gunean ematen du eta ezin da ikuspegi honetan aldatu.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Dena kendu</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Eredua</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Baimendu Ezabatzea</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Ezabatu</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>Eredu bat jarraitzen duten fitxategiak ez dira sinkronizatuko. - -Ezabatzeko baimena duten itemak ezabatuko dira hauek karpeta bat ezabatzea uzten ez badute. Hau meta datuentzat interesgarria da.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Ezin izan da fitxategia ireki</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Ezin izan dira aldaketa idatzi hemen '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Gehitu Baztertzeko Eredua</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Gehitu baztertzeko eredu berria:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> + <translation>Ohar legala</translation> </message> <message> <location filename="../src/gui/legalnotice.ui" line="58"/> @@ -1548,7 +1648,7 @@ Ezabatzeko baimena duten itemak ezabatuko dira hauek karpeta bat ezabatzea uzten <message> <location filename="../src/gui/legalnotice.cpp" line="30"/> <source><p>Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.</p></source> - <translation type="unfinished"/> + <translation><p>GNU General Public License (GPL) 2.0 edo ondorengo bertsioan lizentziatua.</p></translation> </message> </context> <context> @@ -1576,14 +1676,15 @@ Ezabatzeko baimena duten itemak ezabatuko dira hauek karpeta bat ezabatzea uzten <message> <location filename="../src/gui/logbrowser.cpp" line="101"/> <source>Permanently save logs</source> - <translation type="unfinished"/> + <translation>Gorde erregistroak era iraunkorrean</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="103"/> <source>When this option is enabled and no other logging is configured, logs will be written to a temporary folder and expire after a few hours. This setting persists across client restarts. Logs will be written to %1</source> - <translation type="unfinished"/> + <translation>Aukera hau aktiboa dagoenean eta bestelako erregistro sistema konfiguratua ez dagoenean, erregistroak behin behineko karpeta batean idazten dira eta ordu gutxi batzuetan iraungitzen dira. Ezarpen hauek mantentzen dira bezeroa berrabiaraztean. +Erregistroak %1(e)an idatziko dira.</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="115"/> @@ -1618,7 +1719,7 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/logbrowser.cpp" line="222"/> <source>Could not write to log file %1</source> - <translation type="unfinished"/> + <translation>Ezin da idatzi %1 erregistro fitxategian</translation> </message> </context> <context> @@ -1665,11 +1766,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formularioa</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Proxy Ezarpenak</translation> @@ -1707,7 +1803,7 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/networksettings.ui" line="190"/> <source>Download Bandwidth</source> - <translation>Deskargatzeko Banda Zabalera</translation> + <translation>Deskargako banda zabalera</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="196"/> @@ -1736,7 +1832,7 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/networksettings.ui" line="269"/> <source>Upload Bandwidth</source> - <translation>Igotzeko Banda Zabalera</translation> + <translation>Kargako banda zabalera</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="253"/> @@ -1814,7 +1910,8 @@ Logs will be written to %1</source> <location filename="../src/gui/updater/ocupdater.cpp" line="104"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> - <translation type="unfinished"/> + <translation>%1-etarako eguneraketa bat instalatzeko prest dago. Instalatzaileak +pribilegio gehigarriak eskatzen ahal dizu prozesuan.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="143"/> @@ -1824,7 +1921,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="147"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> - <translation type="unfinished"/> + <translation>Ezin da eguneraketa deskargatu. Egin klik <a href='%1'>hemen</a> eguneraketa eskuz deskargatzeko.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="149"/> @@ -1897,7 +1994,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/> <source>Free space: %1</source> - <translation type="unfinished"/> + <translation>Toki librea: %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> @@ -1913,7 +2010,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> <source>There isn't enough free space in the local folder!</source> - <translation type="unfinished"/> + <translation>Ez dago nahikoa toki librerik karpeta lokalean!</translation> </message> </context> <context> @@ -1979,11 +2076,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>Saioa hasi zure nabigatzailean</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Esteka arbelera kopiatu</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2000,7 +2092,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="83"/> <source>Keep your data secure and under your control</source> - <translation type="unfinished"/> + <translation>Mantendu zure datuak seguru eta zure kontrolpean</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/> @@ -2010,7 +2102,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/> <source>Easy-to-use web mail, calendaring & contacts</source> - <translation type="unfinished"/> + <translation>Web posta, egutegi eta kontaktuak erabilerraza</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/> @@ -2035,14 +2127,14 @@ Ez da gomendagarria erabltzea.</translation> <translation>&Hurrengoa ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> - <translation type="unfinished"/> + <translation>Baliogabeko URLa</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> - <translation type="unfinished"/> + <translation>Ezin izan da ziurtagira kargatu. Baliteke pasahitza okerra izatea?</translation> </message> </context> <context> @@ -2118,79 +2210,79 @@ Ez da gomendagarria erabltzea.</translation> <translation>Ezin da %1 karpeta lokala sortu</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Ez da urruneko karpeta zehaztu!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Errorea: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> - <translation type="unfinished"/> + <translation>Nextcloud-en karpeta sortzen: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Urruneko %1 karpeta ongi sortu da.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Urruneko %1 karpeta dagoeneko existintzen da. Bertara konetatuko da sinkronizatzeko.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Karpeta sortzeak HTTP %1 errore kodea igorri du</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Huts egin du urrutiko karpeta sortzen emandako kredintzialak ez direlako zuzenak!<br/> Egin atzera eta egiaztatu zure kredentzialak.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Urruneko karpeten sortzeak huts egin du ziuraski emandako kredentzialak gaizki daudelako.</font><br/>Mesedez atzera joan eta egiaztatu zure kredentzialak.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Urruneko %1 karpetaren sortzeak huts egin du <tt>%2</tt> errorearekin.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Sinkronizazio konexio bat konfiguratu da %1 karpetatik urruneko %2 karpetara.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>%1-era ongi konektatu da!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>%1 konexioa ezin da ezarri. Mesedez egiaztatu berriz.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Karpetaren berrizendatzeak huts egin du</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Ezin da karpeta ezabatu eta kopia egin, karpeta edo barruko fitxategiren bat beste programa batean irekita dagoelako. Mesedez itxi karpeta edo fitxategia eta sakatu berrekin edo ezeztatu konfigurazioa.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Bertako sinkronizazio %1 karpeta ongi sortu da!</b></font></translation> </message> @@ -2198,12 +2290,12 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Konexio Morroia</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Saltatu karpeten ezarpenak</translation> </message> @@ -2237,7 +2329,7 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Errorea metadatuak datu-basean idaztean</translation> </message> @@ -2247,7 +2339,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/propagatedownload.cpp" line="364"/> <source>File %1 can not be downloaded because encryption information is missing.</source> - <translation type="unfinished"/> + <translation>%1 fitxategia ezin da deskargatu zifratze informazioa falta delako.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="434"/> @@ -2262,35 +2354,35 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/propagatedownload.cpp" line="488"/> <source>Free space on disk is less than %1</source> - <translation type="unfinished"/> + <translation>%1 baino toki libre gutxiago diskoan</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Fitxategia zerbitzaritik ezabatua izan da</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> - <translation type="unfinished"/> + <translation>Fitxategia ezin izan da guztiz deskargatu.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> - <translation type="unfinished"/> + <translation>Deskargatutako fitxategia hutsik dago zerbitzariak %1 izan beharko lituzkeela iragarri badu ere.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Errorea metadatuak datu-basean idaztean</translation> </message> @@ -2303,7 +2395,7 @@ Ez da gomendagarria erabltzea.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -2313,7 +2405,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="170"/> <source>could not delete file %1, error: %2</source> - <translation type="unfinished"/> + <translation>ezin izan da %1 fitxategia ezabatu, errorea: %2</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="185"/> @@ -2336,7 +2428,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="77"/> <source>Error removing '%1': %2;</source> - <translation>Akatsa '%1' ezabatzerakoan: %2;</translation> + <translation>Errorea '%1' ezabatzerakoan: %2;</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="102"/> @@ -2403,7 +2495,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/propagateupload.cpp" line="214"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> - <translation type="unfinished"/> + <translation>%1 fitxategia ezin da kargatu izen bereko beste fitxategi bat dagoelako -soilik kasuan ezberdina-</translation> </message> <message> <location filename="../src/libsync/propagateupload.cpp" line="348"/> @@ -2419,12 +2511,12 @@ Ez da gomendagarria erabltzea.</translation> <location filename="../src/libsync/propagateupload.cpp" line="225"/> <location filename="../src/libsync/propagateupload.cpp" line="602"/> <source>Upload of %1 exceeds the quota for the folder</source> - <translation type="unfinished"/> + <translation>%1-aren kargak karpetaren kuota gainditzen du</translation> </message> <message> <location filename="../src/libsync/propagateupload.cpp" line="334"/> <source>File Removed (start upload) %1</source> - <translation type="unfinished"/> + <translation>Fitxategia kendu da (hasi karga) %1</translation> </message> <message> <location filename="../src/libsync/propagateupload.cpp" line="684"/> @@ -2435,27 +2527,27 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -2643,7 +2735,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/sharedialog.cpp" line="104"/> <source>%1 Sharing</source> - <translation type="unfinished"/> + <translation>%1 partekatzen</translation> </message> <message> <location filename="../src/gui/sharedialog.cpp" line="80"/> @@ -2664,22 +2756,22 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Pasahitza:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> - <translation>Iraungitze data:</translation> + <translation>Iraungitze-data:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TestuEtiketa</translation> </message> @@ -2701,12 +2793,12 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Allow Upload && Editing</source> - <translation type="unfinished"/> + <translation>Onartu karga eta edizioa</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> <source>File Drop (Upload Only)</source> - <translation type="unfinished"/> + <translation>Fitxategia jaregin (karga bakarrik)</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="183"/> @@ -2716,7 +2808,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="200"/> <source>Expiration Date</source> - <translation>Iraungitze data</translation> + <translation>Iraungitze-data</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="219"/> @@ -2726,7 +2818,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="224"/> <source>Add another link</source> - <translation type="unfinished"/> + <translation>Gehitu beste esteka bat</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="402"/> @@ -2736,7 +2828,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="403"/> <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 type="unfinished"/> + <translation><p>Ziur zaude <i>%1</i>esteka publikoaren partekatzea ezabatu nahi duzula?</p><p>Oharra: Ekintza hau ezin da desegin.</p></translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="410"/> @@ -2752,22 +2844,22 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Elkarbanatu erabiltzaile edo taldearekin...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Esteka kopiatu</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Zerbait partekatu dut zurekin</translation> </message> @@ -2785,22 +2877,27 @@ Ez da gomendagarria erabltzea.</translation> <translation>editatu dezake</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Birparteka daiteke</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Ez partekatu</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Sortu dezake</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Aldatu dezake</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Ezabatu dezake</translation> </message> @@ -2815,7 +2912,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/> <source>You must sign in as user %1</source> - <translation type="unfinished"/> + <translation>Sartu behar zara %1 erabiltzaile gisa</translation> </message> </context> <context> @@ -2823,11 +2920,11 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="83"/> <source>%1 - Authenticate</source> - <translation type="unfinished"/> + <translation>%1 - Autentifikatu</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> @@ -2838,7 +2935,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> - <translation type="unfinished"/> + <translation>Zure saioa iraungi du. Sartu behar zara berriro bezeroa erabiltzen jarraitzeko.</translation> </message> </context> <context> @@ -2857,7 +2954,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/socketapi.cpp" line="612"/> <source>I shared something with you</source> - <translation type="unfinished"/> + <translation>Zerbait partekatu dut zurekin</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="625"/> @@ -2874,12 +2971,12 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/socketapi.cpp" line="628"/> <source>Send private link by email...</source> - <translation type="unfinished"/> + <translation>Bidali esteka pribatua postaz...</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="653"/> <source>Resharing this file is not allowed</source> - <translation type="unfinished"/> + <translation>Fitxategi hau birpartekatzea ez da onartzen</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="666"/> @@ -2938,7 +3035,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/sslbutton.cpp" line="99"/> <source><h3>Issuer</h3></source> - <translation type="unfinished"/> + <translation><h3>Jaulkitzailea</h3></translation> </message> <message> <location filename="../src/gui/sslbutton.cpp" line="102"/> @@ -3011,11 +3108,6 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formularioa</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Fidatu ziurtagiri honetaz hala ere</translation> @@ -3044,44 +3136,49 @@ Ez da gomendagarria erabltzea.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Erakundea: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unitatea: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Herrialdea: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Hatz-marka (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Hatz-marka (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Balio-data: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Iraungitze data: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Jaulkitzailea: %1</translation> </message> @@ -3116,7 +3213,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="168"/> <source>Error while reading folder.</source> - <translation type="unfinished"/> + <translation>Errorea karpeta irakurtzean</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="244"/> @@ -3126,7 +3223,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="516"/> <source>File/Folder is ignored because it's hidden.</source> - <translation type="unfinished"/> + <translation>Fitxategia/Karpeta ez da ikusi ezkutuan dagoelako.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="519"/> @@ -3167,7 +3264,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="1697"/> <source>There is insufficient space available on the server for some uploads.</source> - <translation type="unfinished"/> + <translation>Ez dago nahiko toki erabilgarririk zerbitzarian hainbat kargatarako.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="150"/> @@ -3192,7 +3289,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="138"/> <source>Permission denied.</source> - <translation type="unfinished"/> + <translation>Baimena ukatuta</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="141"/> @@ -3207,22 +3304,22 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="147"/> <source>No space on %1 server available.</source> - <translation type="unfinished"/> + <translation>Ez dago leku erabilgarririk %1 zerbitzarian.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="156"/> <source>The service is temporarily unavailable</source> - <translation type="unfinished"/> + <translation>Zerbitzu hau behin behinean ez dago erabilgarri</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="162"/> <source>Access is forbidden</source> - <translation type="unfinished"/> + <translation>Sarrera debekatuta</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="173"/> <source>An internal error number %1 occurred.</source> - <translation type="unfinished"/> + <translation>%1 zenbakia duen barne errorea gertatu a.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="485"/> @@ -3267,7 +3364,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="531"/> <source>Unresolved conflict.</source> - <translation type="unfinished"/> + <translation>Ebatzi gabeko gatazka.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="539"/> @@ -3282,7 +3379,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="731"/> <source>Invalid characters, please rename "%1"</source> - <translation type="unfinished"/> + <translation>Baliogabeko karaktereak, aldatu "%1" izena</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="864"/> @@ -3318,7 +3415,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="1382"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> - <translation type="unfinished"/> + <translation>Ez dago baimenik fitxategi hau kargatzek zerbitzarian irakurtzeko soilik delako, leheneratzen.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="1398"/> @@ -3372,11 +3469,11 @@ Ez da gomendagarria erabltzea.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>%1 Bertsioa. Informazio gehiago eskuratzeko ikusi <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>%1 bertsioa. Informazio gehiago eskuratzeko egin klik <a href='%2'>hemen</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3384,27 +3481,27 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> - <translation type="unfinished"/> + <translation>Sartu %1 erabiltzaile gisa</translation> </message> </context> <context> @@ -3470,11 +3567,6 @@ Ez da gomendagarria erabltzea.</translation> <translation>Ezarpenak...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Xehetasunak...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Laguntza</translation> @@ -3527,28 +3619,28 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="307"/> <source>Account synchronization is disabled</source> - <translation type="unfinished"/> + <translation>Kontuen sinkronizazioa desaktibatua dago</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="308"/> <location filename="../src/gui/owncloudgui.cpp" line="361"/> <source>Synchronization is paused</source> - <translation type="unfinished"/> + <translation>Sinkronizazioa pausatua dago</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="356"/> <source>Unresolved conflicts</source> - <translation type="unfinished"/> + <translation>Ebatzi gabeko gatazkak</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="363"/> <source>Error during synchronization</source> - <translation type="unfinished"/> + <translation>Errorea sinkronizatzean</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="367"/> <source>No sync folders configured</source> - <translation type="unfinished"/> + <translation>Ez dira ezarri sinkronizatzeko karpetak</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="413"/> @@ -3563,22 +3655,22 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="694"/> <source>Resume all synchronization</source> - <translation type="unfinished"/> + <translation>Berrabiarazi sinkronizazio guztiak</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="696"/> <source>Resume synchronization</source> - <translation type="unfinished"/> + <translation>Berrabiarazi sinkronizazioa</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="704"/> <source>Pause all synchronization</source> - <translation type="unfinished"/> + <translation>Pausatu sinkronizazio guztiak</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="706"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>Pausatu sinkronizazioa</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="781"/> @@ -3586,6 +3678,11 @@ Ez da gomendagarria erabltzea.</translation> <translation>Kontu berria...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3619,7 +3716,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="943"/> <source>Syncing %1 of %2</source> - <translation type="unfinished"/> + <translation>Sinlrnozatzen %1 %2tik</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="952"/> @@ -3645,23 +3742,6 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formularioa</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TestuEtiketa</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Zerbitzaria</translation> @@ -3669,7 +3749,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="354"/> <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Laukitxo hau markatuta badago, karpetako eduki guztia ezabatuko da sinkronizazio garbi bat hasteko zerbitzaritik.</p><p>Ez markatu laukitxoa karpeta lokalaren edukia zerbitzariko karpetara kargatu behar badar.</p></body></html></translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="357"/> @@ -3679,7 +3759,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="148"/> <source>Ask for confirmation before synchroni&zing folders larger than</source> - <translation type="unfinished"/> + <translation>Eskatu baimena handiagoak diren karpetak sinkronizatu baino lehen</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="165"/> @@ -3690,7 +3770,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="174"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> - <translation type="unfinished"/> + <translation>Eskatu baimena kanpoko biltegiak sinkronizatu baino lehen</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="198"/> @@ -3703,11 +3783,6 @@ Ez da gomendagarria erabltzea.</translation> <translation>Karpeta &lokala</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>Mantendu datu lo&kalak</translation> @@ -3726,11 +3801,6 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formularioa</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Erabiltzaile-izena</translation> @@ -3744,11 +3814,6 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formularioa</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation type="unfinished"/> @@ -3756,31 +3821,25 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> + <translation>Errore bat gertatu da konektatzean. Saiatu berriro.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> <source>Re-open Browser</source> <translation>Berrireki nabigatzailea</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formularioa</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TestuEtiketa</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">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:#0000ff;">Ostatatu zeure zerbitzaria</span></a></translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="143"/> @@ -3795,7 +3854,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="288"/> <source>Server Address</source> - <translation type="unfinished"/> + <translation>Zerbitzariaren helbidea</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="304"/> @@ -3811,26 +3870,10 @@ Ez da gomendagarria erabltzea.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formularioa</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TestuEtiketa</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Zure kontu osoa karpeta lokalera sinkronizaturik dago</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QObject</name> @@ -3842,17 +3885,17 @@ Ez da gomendagarria erabltzea.</translation> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="437"/> <source>%n day ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>duela egun %n</numerusform><numerusform>duela %n egun</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="439"/> <source>%n days ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>duela egun %n</numerusform><numerusform>duela %n egun</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="449"/> <source>%n hour ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>duela ordu %n</numerusform><numerusform>duela %n ordu</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="451"/> @@ -3872,20 +3915,20 @@ Ez da gomendagarria erabltzea.</translation> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="464"/> <source>%n minute ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>duela minutu %n</numerusform><numerusform>duela %n minutu</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="466"/> <source>%n minutes ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>duela minutu %n</numerusform><numerusform>duela %n minutu</numerusform></translation> </message> <message> <location filename="../src/common/utility.cpp" line="470"/> <source>Some time ago</source> - <translation type="unfinished"/> + <translation>Duela zenbait denbora</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3921,7 +3964,7 @@ Ez da gomendagarria erabltzea.</translation> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="311"/> <source>%n month(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>hilabete %n </numerusform><numerusform>%n hilabete</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="312"/> @@ -3931,12 +3974,12 @@ Ez da gomendagarria erabltzea.</translation> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="313"/> <source>%n hour(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>ordu %n</numerusform><numerusform>%n ordu</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="314"/> <source>%n minute(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>minutu %n</numerusform><numerusform>%n minutu</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="315"/> @@ -3968,14 +4011,6 @@ Ez da gomendagarria erabltzea.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> @@ -4006,7 +4041,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> <source>Uploaded</source> - <translation>Igoa</translation> + <translation>Kargatuta</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> @@ -4031,7 +4066,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> <source>Filesystem access error</source> - <translation type="unfinished"/> + <translation>Fitxategi sisteman sartzeko errorea</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="48"/> @@ -4041,7 +4076,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> <source>Updated local metadata</source> - <translation type="unfinished"/> + <translation>metadatu lokalak eguneratu dira</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> @@ -4057,7 +4092,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="68"/> <source>uploading</source> - <translation>igotzen</translation> + <translation>kargatzen</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> @@ -4083,7 +4118,7 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="81"/> <source>updating local metadata</source> - <translation type="unfinished"/> + <translation>metadatu lokalak eguneratzen</translation> </message> </context> <context> @@ -4116,12 +4151,12 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/libsync/theme.cpp" line="77"/> <source>Sync Error</source> - <translation>Sinkronizazio Errorea</translation> + <translation>Sinkronizazio errorea</translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="80"/> <source>Setup Error</source> - <translation>Konfigurazio Errorea</translation> + <translation>Konfigurazio errorea</translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="83"/> @@ -4149,17 +4184,17 @@ Ez da gomendagarria erabltzea.</translation> <message> <location filename="../src/gui/guiutility.cpp" line="35"/> <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source> - <translation type="unfinished"/> + <translation>Errore bat gertatu da nabigatzailea abiatzen saiatzean URL bat irekitzeko. Izan daiteke berezko nabigatzailerik ez dagoelako konfiguratua?</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="58"/> <source>Could not open email client</source> - <translation type="unfinished"/> + <translation>Ezin izan da ireki posta bezeroa</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="59"/> <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source> - <translation type="unfinished"/> + <translation>Errore bat gertatu da posta bezeroa abiatzen saiatzean mezu berri bat sortzeko. Izan daiteke berezko posta bezerorik ez dagoelako konfiguratua?</translation> </message> </context> </TS>
\ No newline at end of file diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 1e086c5a4..ac8956426 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -4,7 +4,7 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="107"/> <source>%1 (%2, %3)</source> - <translation type="unfinished"/> + <translation>%1 (%2, %3)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/> @@ -29,68 +29,63 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/> <source>Syncing %1</source> - <translation type="unfinished"/> + <translation>در حال همگام سازی %1</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation type="unfinished"/> + <translation>هیچ فایل اخیرا تغییر نکرده است</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> <source>Sync paused</source> - <translation type="unfinished"/> + <translation>همگام سازی موقتا متوقف شد</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="184"/> <source>Syncing</source> - <translation type="unfinished"/> + <translation>در حال همگام سازی</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>باز کردن وب سایت</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>اخیرا تغییر یافته</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>متوقف سازی موقت همگام سازی</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>راهنما</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>تنظیمات</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>خروج</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> <source>Quit sync client</source> - <translation type="unfinished"/> + <translation>خروج از همگام سازی مشتری</translation> </message> </context> <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>مکالمه</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>برچسب</translation> @@ -101,28 +96,79 @@ <message> <location filename="../src/common/filesystembase.cpp" line="445"/> <source>Could not make directories in trash</source> - <translation type="unfinished"/> + <translation>امکان ایجاد پوشه در سطل آشغال وجود ندارد</translation> </message> <message> <location filename="../src/common/filesystembase.cpp" line="459"/> <location filename="../src/common/filesystembase.cpp" line="465"/> <source>Could not move '%1' to '%2'</source> - <translation type="unfinished"/> + <translation>امکان انتقال '%1' به '%2' وجود ندارد</translation> </message> <message> <location filename="../src/common/filesystembase.cpp" line="502"/> <source>Moving to the trash is not implemented on this platform</source> + <translation>انتقال فایل به سطل آشغال در این فلتفرم پیاده سازی نشده است</translation> + </message> +</context> +<context> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> <translation type="unfinished"/> </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>فرم</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>یک پوشه محلی را برای اجرای بهنگامسازی انتخاب کنید</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>فرم</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>انتخاب یک پوشه مقصد راهدور</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>فرم</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>حجم فضای ذخیرهسازی: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>همگامسازی همه</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>همگام سازی هیچ</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>تایید تغییرات دستی</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>اعمال</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>منصرف شدن</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>متصل به <server> به عنوان <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>هیچ حسابکاربریای تنظیم نشده است.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>اضافه کردن جدید</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>حذف</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>حساب کاربری</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>این حساب کاربری امکان رمزنگاری انتها-به-انتها را دارد</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>فعال سازی رمزنگاری</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>رمزنگاری</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>انتخاب موارد همگامسازی</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>راه اندازی مجدد همگام سازی</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>حذف اتصال همگام سازی پوشه </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>ساخت پوشه ناموفق</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>ناتوانی در ساخت پوشه محلی <i>1%</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>تأیید حذف اتصال همگام سازی پوشه</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>حذف اتصال همگام سازی پوشه</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>همگام سازی در حال اجراست</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <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="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>1% در استفاده</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>1% به عنوان <i>2%</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <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="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>متصل به %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>سرور %1 بصورت موقت خارج از دسترس است.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>سرور 1% اکنون در حالت تعمیر است.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>از 1% خارج شد.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <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="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>اتصال به %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>اتصال به 1% در 2% وجود ندارد.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>ورود</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <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="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <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="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <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="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>تائید حذف حسابکاربری</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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> این هیچ فایلی را حذف نخواهد کرد.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>حذف ارتباط</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>بازکردن پوشه</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>خروج</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>از سرگیری همگامسازی</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>توقف بههنگامسازی </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <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="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>1% از 2% در استفاده</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>در حال حاضر هیچ اطلاعات کاربرد ذخیره سازی در دسترس نیست.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>بدون %1 اتصال پیکربندی شده.</translation> </message> @@ -517,7 +569,7 @@ <message> <location filename="../src/gui/activityitemdelegate.cpp" line="131"/> <source>%1</source> - <translation type="unfinished"/> + <translation>%1</translation> </message> <message> <location filename="../src/gui/activityitemdelegate.cpp" line="179"/> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>فرم</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>برچسب متنی</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> - <translation type="unfinished"/> + <translation>تایید</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> - <translation type="unfinished"/> + <translation>همگام سازی شد</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>تلاش مجدد برای بارگذاری همه</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>فعالیت های حساب 1% فعال نیست.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 قابل خواندن نیست.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 حذف شده است.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 بارگزاری شد.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 بروز رسانی شده است.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 به %2 تغییر نام داده شده است.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 به %2 انتقال داده شده است.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>1% و n% پرونده های دیگر حذف شده اند.</numerusform><numerusform>1% و n% پرونده های دیگر حذف شده اند.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>1% و n% پرونده های دیگر دانلود شده اند.</numerusform><numerusform>1% و n% پرونده های دیگر دانلود شده اند.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform> 1% و n% پرونده های دیگر به روز رسانی شده اند.</numerusform><numerusform> 1% و n% پرونده های دیگر به روز رسانی شده اند.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>1% به 2% تغییر نام داده شده و n% پرونده های دیگر تغییر نام داده شده اند.</numerusform><numerusform>1% به 2% تغییر نام داده شده و n% پرونده های دیگر تغییر نام داده شده اند.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>1% به 2% منتقل شده و n% پرونده های دیگر منتقل شده اند.</numerusform><numerusform>1% به 2% منتقل شده و n% پرونده های دیگر منتقل شده اند.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>1% و n% سایر پرونده ها ناسازگاری همگام سازی دارند.</numerusform><numerusform>1% و n% سایر پرونده ها ناسازگاری همگام سازی دارند.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>1% داراری ناسازگاری همگام سازی است. لطفا پرونده ناسازگار را بررسی نمایید.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>1% و n% سایر پرونده ها به دلیل خطاها نمی توانند همگام سازی شوند. برای جزییات log را مشاهده کنید.</numerusform><numerusform>1% و n% سایر پرونده ها به دلیل خطاها نمی توانند همگام سازی شوند. برای جزییات log را مشاهده کنید.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>1% به دلیل خطاها نمی تواند همگام سازی شود. برای جزییات log را مشاهده کنید.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>فعالیت همگام سازی</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>نمی توان پرونده خارجی سیستم را خواند.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <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="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>یک پوشه از یک مخزن خارجی اضافه شده است. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <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="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> - <translation type="unfinished"/> + <translation>آیا فایل های جدید بارگزاری شود؟</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>دانلود همه فایلهای جدید</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>نگهداری فایل های محلی</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ If this was an accident and you decide to keep your files, they will be re-synce اگر این یک اتفاق بوده و شما تصمیم دارید پرونده هایتان را نگه دارید، آن ها از سرور مجددا همگام سازی خواهند شد.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -903,17 +998,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="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>پشتیبان شناسایی شد</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>همگام سازی معمول</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>پرونده های محلی را به عنوان ناسازگار نگه دارید</translation> </message> @@ -1029,12 +1124,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>افزودن اتصال همگام سازی پوشه</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>همگام سازی شده با پوشه محلی</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>فایل</translation> </message> @@ -1064,7 +1159,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>خطای هنگام بارگذاری لیست پوشهها از سرور.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>خارج شد</translation> </message> @@ -1079,107 +1174,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>ناسازگاری های حل نشده ای وجود دارد. برای جزییات کلیک نمایید.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>تطبیق تغییرات</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>، '1%'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>همگامسازی %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>رشته های ترجمه نشده</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>دانلود %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>آپلود %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 از %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>5% باقی ماند، 1% از 2%، پرونده 3% از 4%</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>1% از 2%، پرونده 3% از 4%</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>فایل %1 از %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>درحال انتظار...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>در انتظار برای %n پوشهی دیگر ...</numerusform><numerusform>در انتظار برای %n پوشهی دیگر ...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>آمادهسازی همگامسازی ...</translation> </message> @@ -1310,11 +1405,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>فرم</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1463,82 +1553,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>پرونده ها توسط الگوها رد شده اند</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>افزودن</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>این ورودی توسط سیستم در '1%' ارائه شده است و در این دیدگاه قابل تغییر نیست.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>حذف همه</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>الگو</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>اجازه حذف</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>حذف</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>پرونده ها یا پوشههای مطابق با یک الگو همگام نخواهند شد. -مواردی که در آن حذف کردن مجاز است، اگر از حذف یک پوشه جلوگیری کنند حذف خواهند شد. این برای فرا داده ها مفید است.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>امکان باز کردن فایل وجود ندارد</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>نمیتوان تغییرات را در '%1' نوشت.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>افزودن الگوی رد کردن</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>افزودن یک الگوی رد کردن جدید:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>این ورودی توسط سیستم در '1%' ارائه شده است و در این دیدگاه قابل تغییر نیست.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>گفتگو</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>برچسب متن</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>بستن</translation> @@ -1668,11 +1755,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>فرم</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>تنظیمات پروکسی</translation> @@ -1900,7 +1982,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/> <source>Free space: %1</source> - <translation type="unfinished"/> + <translation>فضای خالی: %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> @@ -1916,7 +1998,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> <source>There isn't enough free space in the local folder!</source> - <translation type="unfinished"/> + <translation>فضای خالی کافی در پوشه محلی وجود ندارد!</translation> </message> </context> <context> @@ -1982,11 +2064,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>در مرورگر خود وارد شوید</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>کپی آدرس در حافظه</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2003,7 +2080,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="83"/> <source>Keep your data secure and under your control</source> - <translation type="unfinished"/> + <translation>داده های خود را امن و تحت کنترل خود نگه دارید</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/> @@ -2038,14 +2115,14 @@ It is not advisable to use it.</source> <translation>&بعدی></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>آدرس غیر معتبر</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> - <translation type="unfinished"/> + <translation>امکان بارگزاری گواهی وجود ندارد، ممکن است رمز عبور اشتباه باشد؟</translation> </message> </context> <context> @@ -2121,79 +2198,79 @@ It is not advisable to use it.</source> <translation>نمی تواند پوشه محلی ایجاد کند %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>هیچ پوشه از راه دوری مشخص نشده است!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>خطا: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> - <translation type="unfinished"/> + <translation>ایجاد پوشه در نکس کلود: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>پوشه از راه دور %1 با موفقیت ایجاد شده است.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>در حال حاضر پوشه از راه دور %1 موجود است. برای همگام سازی به آن متصل شوید.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>ایجاد پوشه به خطای HTTP کد 1% منجر شد</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <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="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <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="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <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="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>با موفقیت به %1 اتصال یافت!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>اتصال به %1 نمی تواند مقرر باشد. لطفا دوباره بررسی کنید.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>تغییر نام پوشه ناموفق بود</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b> پوشه همگام سازی محلی %1 با موفقیت ساخته شده است!</b></font></translation> </message> @@ -2201,12 +2278,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>از پیکربندی پوشهها بگذرید</translation> </message> @@ -2240,7 +2317,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> @@ -2268,32 +2345,32 @@ It is not advisable to use it.</source> <translation>فضای خالی دیسک کمتر از %1 است</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>فایل از روی سرور حذف شد</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>فایل به طور کامل قابل دانلود نیست.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <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="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>پرونده از زمان کشف تغییر کرده است.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> @@ -2306,7 +2383,7 @@ It is not advisable to use it.</source> <translation>؛ بازگردانی شکست خورد: 1%</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>یک پرونده یا پوشه از یک اشتراک فقط خواندنی حذف شد، اما بازگردانی شکست خورد: 1%</translation> </message> @@ -2438,27 +2515,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>فایل محلی در حین همگامسازی حذف شده است.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>فایل محلی در حین همگامسازی تغییر کرده است.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>کد بازگشت غیر منتظره از سرور (1%)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>فاقد شناسه پرونده از سرور</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>فاقد ETag از سرور</translation> </message> @@ -2641,7 +2718,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharedialog.ui" line="123"/> <source>Icon</source> - <translation type="unfinished"/> + <translation>آیکون</translation> </message> <message> <location filename="../src/gui/sharedialog.cpp" line="104"/> @@ -2667,22 +2744,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> - <translation type="unfinished"/> + <translation>&لینک اشتراک</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>کلمه عبور</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>تاریخ انقضا</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>برچسب متنی</translation> </message> @@ -2724,12 +2801,12 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="219"/> <source>Unshare</source> - <translation type="unfinished"/> + <translation>لغو اشتراک</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="224"/> <source>Add another link</source> - <translation type="unfinished"/> + <translation>افزودن آدرس دیگر</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="402"/> @@ -2755,22 +2832,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <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="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>کپی کردن آدرس لینک</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>هیچ نتیجه ای برای '1%' وجود ندارد</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>من چیزی را با شما به اشتراک گذاشتم</translation> </message> @@ -2788,24 +2865,29 @@ It is not advisable to use it.</source> <translation>می توان ویرایش کرد</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> + <translation>امکان اشتراک گذاری وجود دارد</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> - <translation type="unfinished"/> + <translation>امکان ایجاد وجود دارد</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> - <translation type="unfinished"/> + <translation>امکان تغییر وجود دارد</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> - <translation type="unfinished"/> + <translation>امکان حذف وجود دار</translation> </message> </context> <context> @@ -2830,7 +2912,7 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> @@ -3015,11 +3097,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>فرم</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>د رهر صورت به این گواهی نامه اطمینان کن.</translation> @@ -3048,44 +3125,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>سازماندهی : %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>واحد: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>کشور: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>اثر انگشت (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>اثرانگشت (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>تاریخ موثر: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>تاریخ انقضا: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>صادرکننده: %1</translation> </message> @@ -3196,7 +3278,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/syncengine.cpp" line="138"/> <source>Permission denied.</source> - <translation type="unfinished"/> + <translation>عدم وجود دسترسی</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="141"/> @@ -3211,7 +3293,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/syncengine.cpp" line="147"/> <source>No space on %1 server available.</source> - <translation type="unfinished"/> + <translation>فضایی در سرور %1 موجود نیست</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="156"/> @@ -3376,11 +3458,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>نسخه %1. برای اطلاعات بیشتر لطفا اینجا را مشاهده کنید t <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3388,25 +3470,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> - <translation type="unfinished"/> + <translation>گواهی نامعتبر شناسایی شد</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3474,11 +3556,6 @@ It is not advisable to use it.</source> <translation>تنظیمات...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>جزئیات...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>راهنما</translation> @@ -3557,7 +3634,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="413"/> <source>Resume all folders</source> - <translation type="unfinished"/> + <translation>از سرگیری همه پوشه ها</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="418"/> @@ -3590,6 +3667,11 @@ It is not advisable to use it.</source> <translation>حساب جدید...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3598,7 +3680,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="841"/> <source>Apps</source> - <translation type="unfinished"/> + <translation>برنامه ها</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="898"/> @@ -3649,23 +3731,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>فرم</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>برچسب متنی</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>سرور</translation> @@ -3707,11 +3772,6 @@ It is not advisable to use it.</source> <translation>&پوشه محلی</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>& نگهداری داده محلی</translation> @@ -3730,11 +3790,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>فرم</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&نامکاربری</translation> @@ -3748,11 +3803,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>فرم</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>لطفا برای ادامه به مرورگر خود سوئیچ کنید.</translation> @@ -3767,21 +3817,15 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation>مرورگر را دوباره باز کنید</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>فرم</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>برچسب متنی</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3799,7 +3843,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="288"/> <source>Server Address</source> - <translation type="unfinished"/> + <translation>آدرس سرور</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="304"/> @@ -3815,26 +3859,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>فرم</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>برچسب متنی</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>کل حساب شما با پوشه محلی همگام سازی شده است</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>دکمه</translation> - </message> </context> <context> <name>QObject</name> @@ -3846,12 +3874,12 @@ It is not advisable to use it.</source> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="437"/> <source>%n day ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n روز گذشته</numerusform><numerusform>%n روز گذشته</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="439"/> <source>%n days ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n ساعت پیش</numerusform><numerusform>%n روز پیش</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="449"/> @@ -3889,7 +3917,7 @@ It is not advisable to use it.</source> <translation>چند وقت پیش</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3972,14 +4000,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>فرم</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 1f902462a..0ee0fa876 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -35,7 +35,7 @@ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation type="unfinished"/> + <translation>Ei äskettäin muuttuneita tiedostoja</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> @@ -50,47 +50,42 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>Avaa verkkosivusto</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>Äskettäin muutettu</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>Keskeytä synkronointi</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>Ohje</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>Asetukset</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>Kirjaudu ulos</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> <source>Quit sync client</source> - <translation type="unfinished"/> + <translation>Lopeta synkronointiasiakas</translation> </message> </context> <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Lomake</translation> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Valitse synkronoitava paikalliskansio tietokoneelta</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Lomake</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Valitse etäkohdekansio</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Lomake</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Tallennustila: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Ilman valintaa olevat kansiot <b>poistetaan</b> paikallisesta tiedostojärjestelmästä, eikä niitä synkronoida enää jatkossa tämän tietokoneen kanssa</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Synkronoi kaikki</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Älä synkronoi mitään</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Toteuta manuaalimuutokset</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Toteuta</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Peruuta</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Yhdistetty palvelimeen <server> käyttäen tunnusta <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Tiliä ei ole määritelty.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Lisää uusi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Poista</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Tili</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Tämä tili tukee päästä päähän -salausta</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Ota salaus käyttöön</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Salaus</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Valitse synkronoitavat tiedot</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Pakota synkronointi nyt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Käynnistä synkronointi uudelleen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Poista kansion synkronointiyhteys</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Kansion luominen epäonnistui</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Paikallisen kansion <i>%1</i> luominen epäonnistui.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Vahvista kansion synkronointiyhteyden poisto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Poista kansion synkronointiyhteys</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Synkronointi meneillään</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 käytössä</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 käyttäjänä <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Palvelimen versio %1 on vanha ja sen tuki on loppunut! Jatka omalla vastuulla.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Yhteys muodostettu kohteeseen %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Palvelin %1 ei ole juuri nyt saatavilla.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Palvelin %1 on parhaillaan huoltotilassa.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Kirjauduttu ulos kohteesta %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Hankitaan valtuutus selaimelta. <a href='%1'>Napsauta tästä</a> avataksesi selaimen uudelleen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Yhdistetään kohteeseen %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Ei yhteyttä kohteeseen %1 osoitteessa %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Kirjaudu sisään</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Havaittiin kansioita, joita ei synkronoitu, koska ne ovat kooltaan liian suuria:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Vahvista tilin poistaminen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Haluatko varmasti poistaa tilin <i>%1</i>?</p><p><b>Huomio:</b> Tämä toimenpide <b>ei</b> poista mitään tiedostoja.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Poista yhteys</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Avaa kansio</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Kirjaudu ulos</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Palauta synkronointi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Keskeytä synkronointi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Haluatko varmasti lopettaa kansion <i>%1</i> synkronoinnin?</p><p><b>Huomio:</b> Tämä toimenpide <b>ei</b> poista mitään tiedostoja.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1/%2 (%3 %) käytössä. Jotkin kansiot, mukaan lukien verkkojaot ja jaetut kansiot, voivat sisältää eri rajoitukset.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1/%2 käytössä</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Tallennustilan käyttötietoja ei ole juuri nyt saatavilla.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>%1-yhteyttä ei ole määritelty.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Lomake</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TekstiLeima</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Hyväksy</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Synkronoitu</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Tilillä %1 ei ole toimia käytössä.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Virhe kirjoittaessa metadataa tietokantaan</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 ei ole luettavissa.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 on poistettu.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 on ladattu.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 on päivitetty.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 on nimetty uudeelleen muotoon %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 on siirretty kohteeseen %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>Kohdetta %1 ei voi synkronoida virheen vuoksi. Katso tarkemmat tiedot lokista.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Synkronointiaktiviteetti</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Uusi kansio kooltaan yli %1 Mt on lisätty: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Kansio erillisestä tallennustilasta on lisätty. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,46 +965,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Ladataanko uudet tiedostot?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Lataa uudet tiedostot</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Säilytä paikalliset tiedostot</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Varmuuskopio poistettu</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Normaali synkronointi</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1025,12 +1120,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Lisää kansion synkronointiyhteys</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Synkronoitu paikallisen kansion kanssa</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Tiedosto</translation> </message> @@ -1060,7 +1155,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Virhe ladatessa kansiolistausta palvelimelta.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Kirjauduttu ulos</translation> </message> @@ -1075,107 +1170,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Selvittämättömiä ristiriitoja. Napsauta nähdäksesi tiedot.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synkronoidaan %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3/%4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 jäljellä, %1/%2, tiedosto %3/%4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1/%2, tiedosto %3/%4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>tiedosto %1/%2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Odotetaan...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Odotetaan %n muuta kansiota...</numerusform><numerusform>Odotetaan %n muuta kansiota...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Valmistaudutaan synkronointiin...</translation> </message> @@ -1306,11 +1401,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Lomake</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Lainopillinen huomautus</translation> @@ -1459,83 +1549,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Kaavojen perusteella ohitettavat tiedostot</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Lisää</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation type="unfinished"/> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Poista kaikki</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Kaava</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Salli poistaminen</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Poista</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Kaavaa vastaavat tiedostot ja kansiot jätetään synkronoimatta. - -Kohteet, joiden poisto on sallittu, poistetaan, jos ne estävät kansion poistamisen. Tämä on hyödyllistä metatietojen osalta.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Tiedoston avaaminen ei onnistunut</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Muutoksien kirjoittaminen kohteeseen '%1' epäonnistui.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Lisää ohituskaava</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Lisää uusi ohituskaava:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Lainopillinen huomautus</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Sulje</translation> @@ -1665,11 +1751,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Lomake</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Välityspalvelimen asetukset</translation> @@ -1785,7 +1866,7 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/creds/oauth.cpp" line="118"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation type="unfinished"/> + <translation>Ei voitu jäsentää palvelimen palauttamaa JSON:ia: <br><em>%1</em></translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="121"/> @@ -1979,11 +2060,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>Kirjaudu selaimellasi</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Kopioi linkki leikepöydälle</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2035,12 +2111,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>&Seuraava ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Virheellinen URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Varmennetta ei voitu ladata. Kenties salasana oli väärin.</translation> </message> @@ -2118,79 +2194,79 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>Paikalliskansion %1 luonti epäonnistui</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Etäkansiota ei määritelty!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Virhe: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Etäkansio %1 luotiin onnistuneesti.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Etäkansio %1 on jo olemassa. Otetaan siihen yhteyttä tiedostojen täsmäystä varten.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Kansion luonti aiheutti HTTP-virhekoodin %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Etäkansion luominen epäonnistui koska antamasi tunnus/salasana ei täsmää!<br/>Ole hyvä ja palaa tarkistamaan tunnus/salasana</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Pilvipalvelun etäkansion luominen ei onnistunut , koska tunnistautumistietosi ovat todennäköisesti väärin.</font><br/>Palaa takaisin ja tarkista käyttäjätunnus ja salasana.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Etäkansion %1 luonti epäonnistui, virhe <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Täsmäysyhteys kansiosta %1 etäkansioon %2 on asetettu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Yhteys kohteeseen %1 muodostettiin onnistuneesti!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Yhteyttä osoitteeseen %1 ei voitu muodostaa. Ole hyvä ja tarkista uudelleen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Kansion nimen muuttaminen epäonnistui</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Paikallinen synkronointikansio %1 luotu onnistuneesti!</b></font></translation> </message> @@ -2198,12 +2274,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1-yhteysavustaja</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Ohita kansioiden määritykset</translation> </message> @@ -2237,7 +2313,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Virhe kirjoittaessa metadataa tietokantaan</translation> </message> @@ -2265,32 +2341,32 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>Levyllä on vapaata tilaa vähemmän kuin %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Tiedosto poistettiin palvelimelta</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Tiedostoa ei voitu ladata täysin.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Tiedosto on muuttunut löytymisen jälkeen</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Virhe kirjoittaessa metadataa tietokantaan</translation> </message> @@ -2303,7 +2379,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -2435,27 +2511,27 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Odottamaton paluukoodi palvelimelta (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -2664,22 +2740,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Jaa linkki</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Salasana:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Vanhenemispäivä:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TekstiLeima</translation> </message> @@ -2752,22 +2828,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Jaa käyttäjien tai ryhmien kanssa…</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Kopioi linkki</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Ei tuloksia haulla '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Jaoin jotain kanssasi</translation> </message> @@ -2785,22 +2861,27 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>voi muokata</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Voi uudelleenjakaa</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Voi luoda</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Voi muuttaa</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Voi poistaa</translation> </message> @@ -2827,7 +2908,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> @@ -3013,11 +3094,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Lomake</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Luota tähän varmisteeseen silti</translation> @@ -3046,44 +3122,49 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organisaatio: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Yksikkö: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Maa: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Sormenjälki (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Sormenjälki (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Voimassa oleva päivämäärä: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Vanhenemispäivä: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Myöntäjä: %1</translation> </message> @@ -3209,7 +3290,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="147"/> <source>No space on %1 server available.</source> - <translation type="unfinished"/> + <translation>%1-palvelimella ei ole tilaa jäljellä.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="156"/> @@ -3374,11 +3455,11 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versio %1. Lisätietoja osoitteessa <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3386,27 +3467,27 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Virheellinen varmenne havaittu</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> - <translation>Isäntä "%1" lähetti virheellisen varmenteen. Jatketaanko?</translation> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> - <translation type="unfinished"/> + <translation>Kirjaudu käyttäjänä: %1</translation> </message> </context> <context> @@ -3472,11 +3553,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>Asetukset...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Tiedot...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ohje</translation> @@ -3588,6 +3664,11 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>Uusi tili...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3647,23 +3728,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Lomake</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TekstiLeima</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Palvelin</translation> @@ -3705,11 +3769,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>&Paikallinen kansio</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Säilytä paikallinen data</translation> @@ -3728,11 +3787,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Lomake</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Käyttäjätunnus</translation> @@ -3746,11 +3800,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Lomake</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Vaihda selaimeen jatkaaksesi.</translation> @@ -3765,29 +3814,23 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <source>Re-open Browser</source> <translation>Avaa selain uudelleen</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Lomake</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TekstiLeima</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">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:#0000ff;">Ylläpidä omaa palvelintasi</span></a></translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="143"/> <source>Register with a provider</source> - <translation type="unfinished"/> + <translation>Rekisteröidy palveluntarjoajalle</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="165"/> @@ -3813,26 +3856,10 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Lomake</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TekstiLeima</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Koko tilisi on synkronoitu paikalliseen kansioon</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation type="unfinished"/> - </message> </context> <context> <name>QObject</name> @@ -3887,7 +3914,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> <translation>Jokin aika sitten</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3970,14 +3997,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 14c69c0e9..87718b7d9 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialogue</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Libellé</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation>Formulaire</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Merci de basculer vers votre navigateur pour terminer.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Une erreur s'est produite pendant la connexion. Veuillez ré-essayer.</translation> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Ré-ouvrir le navigateur</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copier le lien</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> <translation>Formulaire</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Merci de basculer vers votre navigateur pour terminer.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Une erreur s'est produite pendant la connexion. Veuillez ré-essayer.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Ré-ouvrir le navigateur</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Copier le lien</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Sélectionner un dossier local de votre ordinateur à synchroniser</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Veuillez sélectionner un dossier distant</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Chiffrement de bout en bout mnémotechnique</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Pour protéger votre identité cryptographique, nous la chiffrons avec une mnémonique de 12 mots du dictionnaire. Veuillez les noter et les garder en sécurité. Ils seront nécessaires pour ajouter d’autres appareils à votre compte (comme votre téléphone portable ou votre ordinateur portable).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espace de stockage : ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Les dossiers décochés seront <b>supprimés</b> de votre disque local et ne seront plus synchronisés avec cet ordinateur.</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Tout synchroniser</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Ne rien synchroniser</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Appliquer les changements manuellement</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Appliquer</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Connecté au serveur <server> avec le compte <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Aucun compte configuré.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Ajouter un nouveau compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Ce compte prend en charge le chiffrement de bout en bout.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Activer le chiffrement</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Afficher le code mnémotechnique E2E</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Chiffrer</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Modifier les fichiers ignorés</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Sélectionner le contenu à synchroniser</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forcer la synchronisation maintenant</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Redémarrer la synchronisation</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Supprimer la synchronisation du dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Échec de création du dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Impossible de créer le dossier local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmer la suppression de synchronisation de dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Supprimer la synchronisation de ce dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La synchronisation est en cours.<br/>Voulez-vous l'arrêter ?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 utilisé(s)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 avec le compte <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>La version %1 du serveur est ancienne et n'est pas prise en charge. Continuez à vos risques et périls.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Connecté au serveur %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Le serveur %1 est temporairement indisponible.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Le serveur %1 est en cours de maintenance.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Session sur %1 fermée.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>En attente d'autorisation du navigateur. <a href='%1'>Cliquer ici</a> pour recharger le navigateur.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Connexion à %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Aucune connexion au serveur %1 à l'adresse %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Se connecter</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Certains dossiers n'ont pas été synchronisés parce qu'ils sont de taille trop importante :</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Certains dossiers n'ont pas été synchronisés parce qu'ils sont localisés sur un stockage externe :</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Certains dossiers n'ont pas été synchronisés par qu'ils sont localisés sur un stockage externe ou qu'ils sont de taille trop importante :</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirmation de retrait du compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Êtes-vous certain de vouloir retirer <i>%1</i> des comptes synchronisés avec le serveur ?</p><p><b>Remarque :</b> cela ne supprimera pas votre compte sur le serveur et aucun fichier ne sera supprimé ni localement ni en ligne.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Retirer le compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Ouvrir le dossier local</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Se déconnecter</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Reprendre la synchronisation</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Mettre en pause</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Voulez-vous vraiment arrêter de synchroniser le dossier <i>%1</i> ?</p><p><b>Note :</b> Aucun fichier ne sera supprimé.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) utilisés sur %2. Certains dossiers, montés depuis le réseau ou partagés, peuvent avoir des limites différentes.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 utilisés sur %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Aucune connexion à %1 configurée</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Accepter</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Synchronisé</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Relancer tous les envois</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Le compte %1 n'a aucune activité activée.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Merci de saisir votre phrase secrète E2E : <br><br>Utilisateur : %2<br>Compte : %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Entrez la phrase secrète E2E</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Erreur renvoyée par le serveur : <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Une erreur s'est produite lors de l'accès au point d'arrivée 'jeton' : <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Impossible d'analyser le JSON renvoyé par le serveur : <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La réponse du serveur ne contient pas tous les champs attendus</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Connexion à %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Connectez-vous avec votre navigateur web (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>Impossible d'ouvrir le navigateur, veuillez copier le lien dans votre navigateur Web.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>Impossible d'ouvrir le navigateur, veuillez copier le lien dans votre navigateur Web.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,98 +835,98 @@ <translation>%1 ne peut pas être lu.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 a été supprimé.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 a été téléchargé.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 a été mis à jour.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 a été renommé en %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 a été déplacé vers %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 a été supprimé.</numerusform><numerusform>%1 et %n autres fichiers ont été supprimés.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 a été téléchargé.</numerusform><numerusform>%1 et %n autres fichiers ont été téléchargés.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 a été mis à jour.</numerusform><numerusform>%1 et %n autres fichiers ont été mis à jour.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 a été renommé en %2.</numerusform><numerusform>%1 a été renommé en %2 et %n autres fichiers ont été renommés.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 a été déplacé vers %2.</numerusform><numerusform>%1 a été déplacé vers %2 et %n autres fichiers ont été déplacés.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 a un conflit de synchronisation.</numerusform><numerusform>%1 et %n autres fichiers ont des problèmes de synchronisation.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 a un problème de synchronisation. Merci de vérifier le fichier conflit !</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 ne peut pas être synchronisé en raison d'erreurs. Consultez les logs pour les détails.</numerusform><numerusform>%1 et %n autres fichiers n'ont pas pu être synchronisés en raison d'erreurs. Consultez les logs pour les détails.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 n'a pu être synchronisé pour cause d'erreur. Consultez les logs pour les détails.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Activité de synchronisation</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Impossible de lire le fichier d'exclusion du système</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Un nouveau dossier de taille supérieure à %1 Mo a été ajouté : %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Un nouveau dossier localisé sur un stockage externe a été ajouté. @@ -839,22 +934,22 @@ </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Merci d'aller dans les Paramètres pour indiquer si vous souhaitez le télécharger.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Le dossier %1 a été créé mais il était exclu de la synchronisation auparavant. Les données qu'il contient ne seront pas synchronisées.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Le fichier %1 a été créé mais il était exclu de la synchronisation auparavant. Il ne sera pas synchronisé.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -868,7 +963,7 @@ Cela signifie que le client de synchronisation peut ne pas télécharger immédi </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -879,22 +974,22 @@ Si vous décidez de garder ces fichiers, ils seront resynchronisés avec le serv Si vous décidez de supprimer ces fichiers, ils ne vous seront plus accessibles à moins que vous n'en soyez le propriétaire.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Recevoir les nouveaux fichiers ?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Recevoir les nouveaux fichiers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Conserver les fichiers locaux</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -903,7 +998,7 @@ If this was an accident and you decide to keep your files, they will be re-synce S'il s'agissait d'un accident et que vous choisissiez de conserver vos fichiers, ils seront synchronisés à nouveau depuis le serveur.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -912,17 +1007,17 @@ Cela peut être dû à une copie de sauvegarde restaurée sur le serveur. Continuer la synchronisation comme d'habitude fera en sorte que tous les fichiers soient remplacés par des fichiers plus vieux d'un état précédent. Voulez-vous conserver les versions les plus récentes de vos fichiers en tant que fichiers conflictuels ?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Sauvegarde détectée</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Synchronisation normale</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Conserver les fichiers locaux comme Conflits</translation> </message> @@ -1038,12 +1133,12 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi <translation>Ajouter une synchronisation de dossier</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Synchronisé avec le dossier local</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>Synchronisé avec le dossier local (%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Fichier</translation> </message> @@ -1073,7 +1168,7 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi <translation>Une erreur est survenue lors du chargement de la liste des dossiers depuis le serveur.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Session fermée</translation> </message> @@ -1088,107 +1183,107 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi <translation>Il y a des conflits non résolus. Cliquez pour plus de détails.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Rapprochement des modifications</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronisation de %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>réception %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>envoi %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Vérification des modification dans '%1' distant</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Vérification des modification dans '%1' local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 sur %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restants, %1 sur %2, fichier %3 sur %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 sur %2, fichier %3 sur %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>fichier %1 sur %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>En attente ...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>En attente de %n autre(s) dossier(s)</numerusform><numerusform>En attente de %n autre(s) dossier(s)</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Préparation à la synchronisation</translation> </message> @@ -1319,11 +1414,6 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Notice légale</translation> @@ -1474,83 +1564,79 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi <translation>Fichiers exclus sur motif de nom</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Ajouter</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Cette entrée est fournie par le système dans '%1' et ne peut être modifiée dans cette vue.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Supprimer tout</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Motif de nom</translation> + <translation>Motif</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Autoriser suppression</translation> + <translation>Autoriser la suppression</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>Ajouter</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation>Supprimer tout</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>Les fichiers ou dossiers dont les noms correspondent à un motif seront exclus de la synchronisation. - -L'option "Autoriser suppression" permet de ne pas bloquer la suppression d'un dossier. C'est utile pour les fichiers de méta-données.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation>Impossible d'ouvrir le fichier</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> <translation>Impossible d'écrire les modifications sur '%1'.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation>Ajouter un motif d'exclusion</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Ajoutez un nouveau motif d'exclusion :</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Cette entrée est fournie par le système dans '%1' et ne peut être modifiée dans cette vue.</translation> + <translation>Ajouter un nouveau motif d'exclusion :</translation> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialogue</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Notice légale</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>Étiquette de texte</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Fermer</translation> @@ -1682,11 +1768,6 @@ Les journaux seront écrits dans %1.</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Paramètres de serveur proxy</translation> @@ -1792,7 +1873,7 @@ Les journaux seront écrits dans %1.</translation> <message> <location filename="../src/gui/creds/oauth.cpp" line="112"/> <source>Error returned from the server: <em>%1</em></source> - <translation>Erreur retournée par le serveur: <em>%1</em></translation> + <translation>Erreur renvoyée par le serveur: <em>%1</em></translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="115"/> @@ -1802,12 +1883,12 @@ Les journaux seront écrits dans %1.</translation> <message> <location filename="../src/gui/creds/oauth.cpp" line="118"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Impossible d'analyser le fichier JSON récupéré sur le serveur : <br><em>%1</em></translation> + <translation>Impossible d'analyser le JSON renvoyé par le serveur : <br><em>%1</em></translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="121"/> <source>The reply from the server did not contain all expected fields</source> - <translation>La réponse provenant du serveur ne contienne pas tous les champs attendus</translation> + <translation>La réponse du serveur ne contient pas tous les champs attendus</translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="125"/> @@ -1997,11 +2078,6 @@ L'assistant de mise à jour peut vous demandez des autorisations supplémen <source>Login in your browser</source> <translation>Connectez vous sur votre navigateur</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Copier le lien vers le presse-papier</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2053,12 +2129,12 @@ Il est déconseillé de l'utiliser.</translation> <translation>&Suivant ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>URL invalide</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Impossible de charger le certificat. Vérifiez le mot de passe saisi.</translation> </message> @@ -2136,79 +2212,79 @@ Il est déconseillé de l'utiliser.</translation> <translation>Impossible de créer le dossier local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Aucun dossier distant spécifié !</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Erreur : %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>Création du dossier sur Nextcloud : %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Le dossier distant %1 a été créé avec succès.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Le dossier distant %1 existe déjà. Connexion.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La création du dossier a généré le code d'erreur HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>La création du dossier distant a échoué car les identifiants de connexion sont erronés !<br/>Veuillez revenir en arrière et vérifier ces derniers.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La création du dossier distant a échoué, probablement parce que les informations d'identification fournies sont fausses.</font><br/>Veuillez revenir en arrière et les vérifier.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La création du dossier distant "%1" a échouée avec l'erreur <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Une synchronisation entre le dossier local %1 et le dossier distant %2 a été configurée.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Connecté avec succès à %1 !</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>La connexion à %1 n'a pu être établie. Veuillez réessayer.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Echec du renommage du dossier</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Impossible de supprimer et de sauvegarder le dossier parce que ce dossier ou un de ses fichiers est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et ré-essayer, ou annuler l'installation.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Dossier de synchronisation local %1 créé avec succès !</b></font></translation> </message> @@ -2216,12 +2292,12 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>Assistant de Connexion %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Ignorer la configuration des dossiers</translation> </message> @@ -2255,7 +2331,7 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> @@ -2283,32 +2359,32 @@ Il est déconseillé de l'utiliser.</translation> <translation>Il y a moins de %1 d'espace libre sur le disque</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Le fichier a été supprimé du serveur</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Le fichier n'a pas pu être téléchargé intégralement.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>Le fichier reçu est vide bien que le serveur indique que sa taille devrait être de %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Le fichier %1 n'a pas pu être sauvegardé en raison d'un conflit sur le nom du fichier local !</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Le fichier a changé depuis sa découverte</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> @@ -2321,7 +2397,7 @@ Il est déconseillé de l'utiliser.</translation> <translation>; Échec de la restauration : %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un fichier ou un dossier a été supprimé d'un partage en lecture seule, mais la restauration a échoué : %1</translation> </message> @@ -2453,27 +2529,27 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Fichier local supprimé pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Le serveur a retourné un code inattendu (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>L'identifiant de fichier est manquant sur le serveur</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>L'information Etag de modification de fichier est manquante sur le serveur</translation> </message> @@ -2682,22 +2758,22 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Lien de partage</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Mot de passe :</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Date d'expiration :</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -2771,22 +2847,22 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Partager avec des utilisateurs ou groupes...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Copier le lien</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Aucun résultat pour '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>J'ai partagé quelque chose avec vous</translation> </message> @@ -2804,22 +2880,27 @@ Il est déconseillé de l'utiliser.</translation> <translation>peut modifier</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Peut repartager</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Ne plus partager</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Peut créer</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Peut modifier</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Peut supprimer</translation> </message> @@ -2846,8 +2927,8 @@ Il est déconseillé de l'utiliser.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vue de débug Chipher SSL</translation> + <source>SSL Cipher Debug View</source> + <translation>Vue de débogage du chiffrement SSL</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3032,11 +3113,6 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Faire confiance à ce certificat malgré tout</translation> @@ -3065,44 +3141,49 @@ Il est déconseillé de l'utiliser.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organisation : %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unité : %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Pays : %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Empreinte (MD5) : <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Empreinte (SHA1) : <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Empreinte (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>Empreinte (SHA-512): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Date de début de validité : %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Date d'expiration : %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Émetteur : %1</translation> </message> @@ -3393,11 +3474,11 @@ Il est déconseillé de l'utiliser.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Version %1. Pour plus d'information, visitez <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Version %1. Pour plus d’informations, veuillez cliquer <a href='%2'>ici</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation>Cette version a été fournie par %1</translation> </message> @@ -3405,25 +3486,25 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Certificat invalide</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>L’hôte "%1" utilise un certificat invalide. Continuer ?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Vous avez été déconnecté de %1 en tant qu'utilisateur %2. Veuillez vous reconnecter</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Veuillez vous connecter avec l’utilisateur : %1</translation> </message> @@ -3491,11 +3572,6 @@ Il est déconseillé de l'utiliser.</translation> <translation>Paramètres...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Toutes les modifications...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Aide...</translation> @@ -3607,6 +3683,11 @@ Il est déconseillé de l'utiliser.</translation> <translation>Nouveau compte…</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Afficher plus d'activité…</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> @@ -3666,23 +3747,6 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Serveur</translation> @@ -3724,11 +3788,6 @@ Il est déconseillé de l'utiliser.</translation> <translation>&Dossier local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Conserver les données locales</translation> @@ -3747,11 +3806,6 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nom d'utilisateur</translation> @@ -3765,11 +3819,6 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Merci de basculer vers votre navigateur pour terminer.</translation> @@ -3784,21 +3833,15 @@ Il est déconseillé de l'utiliser.</translation> <source>Re-open Browser</source> <translation>Redémarrez votre navigateur</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copier le lien</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Zone de texte</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Hébergez votre propre serveur</span></a></translation> @@ -3832,26 +3875,10 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Nom du libellé</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Votre compte est intégralement synchronisé avec le dossier local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3906,7 +3933,7 @@ Il est déconseillé de l'utiliser.</translation> <translation>Il y a quelque temps</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1 : %2</translation> @@ -3989,14 +4016,6 @@ Il est déconseillé de l'utiliser.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 042d7f879..068ac16f3 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialogo</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etiqueta</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> <translation>Formulario</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Cambie para o seu navegador para proseguir.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Produciuse un erro ao conectarse. Ténteo de novo.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Volver abrir o navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar a ligazón</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Cambie para o seu navegador para proseguir.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Produciuse un erro ao conectarse. Ténteo de novo.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Volver abrir o navegador</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Copiar a ligazón</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Escolla un cartafol local no seu computador para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Seleccione o cartafol remoto de destino</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Mnemónico do cifrado de extremo a extremo</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Para protexer a súa identidade criptográfica, cifrámola cun mnemónico de 12 palabras do diccionario. Anóteas e manteñas en lugar seguro. Estas palabras serán necesarias para engadir outros dispositivos á súa cuenta (como un teléfono móvil ou un portátil). </translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espazo de almacenamento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Os cartafoles non seleccionados van seren <b>eliminados</b> do seu sistema de ficheiros local e non volverán sincronizarse con este computador</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Non sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar cambios manuais</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Non hai contas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Engadir novo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Esta conta admite o cifrado de extremo a extremo</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Activar o cifrado</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Amosar o mnemónico E2E</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Cifrar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Editar ficheiros ignorados</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Escolla que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forzar a sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar a sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Retirar a conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Non foi posíbel crear o cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Non foi posíbel crear o cartafol local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar a retirada da conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Retirar a conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronización en proceso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Estase a realizar a sincronización.<br/>Quere interrompela e rematala?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Este servidor da versión %1 é vello e non ten soporte! Vostede verá o que fai.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>O servidor %1 non está dispoñíbel temporalmente.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>O servidor %1 neste momento está en modo de mantemento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Desconectado de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obtendo autorización dende o navegador. <a href='%1'>Prema aquí</a> para volver abrir o navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando con %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Non hai conexión con %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Acceder</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hai cartafoles que non se sincronizaron por ser demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hai cartafoles que non se sincronizaron porque son almacenamentos externos:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hai cartafoles que non se sincronizaron porque son demasiado grandes ou almacenamentos externos:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirme a retirada da conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>De verdade quere retirar a conexión a conta <i>%1</i>?</p><p><b>Aviso:</b> Isto <b>non</b> eliminará ningún ficheiro.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Retirar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir o cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Saír</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Continuar coa sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Por en pausa a sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Quere realmente deixar de sincronizar o cartafol <i>%1</i>?</p><p><b>Aviso:</b> Isto <b>non</b> eliminará ningún ficheiro.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algúns cartafoles, incluíndo os compartidos e os montados en rede, poderían ter diferentes límites.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Non se configurou a conexión %1.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Etiqueta de texto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Aceptar</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Sincronizado</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Tentar de novo todos os envíos</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>A conta %1 non ten activadas as actividades.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Introduza a súa frase de paso de cifrado de extremo a extremo: <br><br>Usuario: %2<br>Conta: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Introduza a frase de paso E2E</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Erro devolto dende o servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Produciuse un erro ao acceder ao punto final da «marca»: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Non foi posíbel analizar o JSON devolto dende o servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>A resposta do servidor non contiña todos os campos agardados</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Conectar con %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Acceda no seu navegador (Fluxo de acceso 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>Non foi posíbel abrir o navegador, copie a ligazón ao seu navegador.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>Non foi posíbel abrir o navegador, copie a ligazón ao seu navegador.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 non é lexíbel.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 foi retirado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 foi descargado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 foi enviado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 foi renomeado a %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 foi movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 e outro ficheiro foi retirado.</numerusform><numerusform>%1 e outros %n ficheiros foron retirados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 e outro ficheiro foi descargado.</numerusform><numerusform>%1 e outros %n ficheiros foron descargados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 e outro ficheiro foi actualizado.</numerusform><numerusform>%1 e outros %n ficheiros foron actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 foi renomeado a %2 e outro ficheiro tamén foi renomeado.</numerusform><numerusform>%1 foi renomeado a %2 e outros %n ficheiros tamén foron renomeados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 foi movido a %2 e outro ficheiro tamén foi movido.</numerusform><numerusform>%1 foi movido a %2 e outros %n ficheiros tamén foron movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 e outro ficheiro tiveron conflitos ao sincronizar.</numerusform><numerusform>%1 e outros %n ficheiros tiveron conflitos ao sincronizar.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>Produciuse un conflito ao sincronizar %1. Comprobe o ficheiro!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>Non foi posíbel sincronizar %1 e outro ficheiro por mor de erros. Vexa os detalles no rexistro.</numerusform><numerusform>Non foi posíbel sincronizar %1 e outros %n ficheiros por mor de erros. Vexa os detalles no rexistro.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>Non foi posíbel sincronizar %1 por mor dun erro. Vexa os detalles no rexistro.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Actividade de sincronización</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Non foi posíbel ler o ficheiro de exclusión do sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Foi engadido un cartafol maior de %1 MB: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Foi engadido un cartafol de almacenamento externo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Vaia a axustes a seleccionalo se quere descargar isto.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Creouse o cartafol %1 mais foi excluído da sincronización con anterioridade. Os datos no seu interior non se sincronizarán.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Creouse o ficheiro %1 mais foi excluído da sincronización con anterioridade. Non se sincronizará.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,7 +961,7 @@ Isto significa que o cliente de sincronización podería non enviar os cambios i %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -877,22 +972,22 @@ Se decide manter os ficheiros, resincronizaranse co servidor se ten dereitos par Se decide eliminar os ficheiros, non poderá dispor deles a non ser que sexa o propietario.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Descargar os ficheiros novos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Descargar os ficheiros novos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Manter os ficheiros locais</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -902,7 +997,7 @@ Confirma que quere sincronizar estas accións co servidor? Se fose un accidente e decide manter os seus ficheiros, volverán ser sincronizados dende o servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -911,17 +1006,17 @@ Isto podería ser porque se restaurou unha copia de seguranza no servidor. Continuando a sincronización como normal fará que todos os seus ficheiros sexan substituídos por unha versión anterior. Quere manter os seus ficheiros máis recentes locais como ficheiros en conflito?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Detectouse unha copia de seguranza</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronización normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantener os ficheiros locais en caso de conflito</translation> </message> @@ -1037,12 +1132,12 @@ Continuando a sincronización como normal fará que todos os seus ficheiros sexa <translation>Engadir a conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Sincronizado co cartafol local</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>Sincronizado co cartafol local (%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Ficheiro</translation> </message> @@ -1072,7 +1167,7 @@ Continuando a sincronización como normal fará que todos os seus ficheiros sexa <translation>Produciuse un erro ao cargar a lista de cartafoles dende o servidor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Desconectado</translation> </message> @@ -1087,107 +1182,107 @@ Continuando a sincronización como normal fará que todos os seus ficheiros sexa <translation>Hai conflitos sen resolver. Prema para obter máis detalles.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando os cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>«%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>enviar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Comprobando os cambios no cartafol remoto «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Comprobando os cambios no cartafol local «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Restan %5, %1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>ficheiro %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Agardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Agardando por outro cartafol…</numerusform><numerusform>Agardando por outros %n cartafoles…</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar…</translation> </message> @@ -1318,11 +1413,6 @@ Continuando a sincronización como normal fará que todos os seus ficheiros sexa <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Aviso legal</translation> @@ -1465,7 +1555,7 @@ Continuando a sincronización como normal fará que todos os seus ficheiros sexa <message> <location filename="../src/gui/ignorelisteditor.ui" line="26"/> <source>Sync hidden files</source> - <translation>Sincronizar os ficheiros agachados</translation> + <translation>Sincronizar os ficheiros agochados</translation> </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="36"/> @@ -1473,32 +1563,45 @@ Continuando a sincronización como normal fará que todos os seus ficheiros sexa <translation>Ficheiros ignorados por patróns</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Engadir</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entrada é fornecida polo sistema en «%1» e non pode ser modificado nesta vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Retirar todo</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation>IgnorarListaTáboaTrebello</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Patrón</translation> + <translation>Modelo</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation>Permitir a eliminación</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>Engadir</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation>Retirar todo</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> @@ -1507,49 +1610,34 @@ Items where deletion is allowed will be deleted if they prevent a directory from Os elementos onde se permite a eliminación eliminaranse se impiden que se elimine un directorio. Isto é útil para os metadatos.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation>Non foi posíbel abrir o ficheiro</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> <translation>Non é posíbel escribir os cambios en «%1».</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation>Engadir o patrón a ignorar</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> <translation>Engadir un novo patrón a ignorar:</translation> </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entrada é fornecida polo sistema en «%1» e non pode ser modificado nesta vista.</translation> - </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialogo</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Aviso legal</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Pechar</translation> @@ -1681,14 +1769,9 @@ Os rexistros escribiranse en %1</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> - <translation>Configuración do proxy</translation> + <translation>Axustes do proxy</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="29"/> @@ -1996,11 +2079,6 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl <source>Login in your browser</source> <translation>Acceda no seu navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Copiar a ligazón no portapapeis</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2052,12 +2130,12 @@ Recomendámoslle que non o use.</translation> <translation>&Seguinte ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>URL incorrecto</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Non foi posíbel cargar o certificado. Quizais o contrasinal é incorrecto?</translation> </message> @@ -2135,79 +2213,79 @@ Recomendámoslle que non o use.</translation> <translation>Non foi posíbel crear o cartafol local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Non se especificou o cartafol remoto!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>creando un cartafol no Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>O cartafol remoto %1 creouse correctamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>O cartafol remoto %1 xa existe. Conectándoo para a sincronización.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A creación do cartafol resultou nun código de erro HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>A creación do cartafol remoto fracasou por mor de seren incorrectas as credenciais!<br/>Volva atrás e comprobe as súas credenciais.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">A creación do cartafol remoto fallou probabelmente debido a que as credenciais que se deron non foran as correctas.</font><br/>Volva atrás e comprobe as súas credenciais.</p> </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Produciuse un fallo ao crear o cartafol remoto %1 e dou o erro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Estabeleceuse a conexión de sincronización de %1 ao directorio remoto %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Conectou satisfactoriamente con %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Non foi posíbel estabelecer a conexión con %1. Compróbeo de novo.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Non foi posíbel renomear o cartafol</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Non é posíbel retirar e facer unha copia de seguranza do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e ténteo de novo, ou cancele a acción.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>O cartafol local de sincronización %1 creouse correctamente!</b></font></translation> </message> @@ -2215,12 +2293,12 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>Asistente de conexión %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Omitir a configuración dos cartafoles</translation> </message> @@ -2254,7 +2332,7 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> </message> @@ -2282,32 +2360,32 @@ Recomendámoslle que non o use.</translation> <translation>O espazo libre no disco é inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>O ficheiro vai ser eliminado do servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Non foi posíbel descargar completamente o ficheiro.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>O ficheiro descargado está baleiro, aínda que o servidor dí que o seu tamaño debe ser de %1. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>O ficheiro cambiou após ser atopado</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> </message> @@ -2320,7 +2398,7 @@ Recomendámoslle que non o use.</translation> <translation>; Produciuse un fallo na restauración: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un ficheiro ou cartafol foi eliminado dun recurso compartido só de lectura, pero fallou a restauración: %1</translation> </message> @@ -2452,27 +2530,27 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>O ficheiro local retirarase durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>O ficheiro local cambiou durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>O servidor devolveu un código non agardado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Falta o ID do ficheiro do servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Falta ETag do servidor</translation> </message> @@ -2681,22 +2759,22 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>Ligazón &compartida</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Contrasinal:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Data de caducidade:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>Etiqueta de texto</translation> </message> @@ -2769,22 +2847,22 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartir con usuarios ou grupos...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Copiar a ligazón</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Non hai resultados para «%1»</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Compartín algo con vostede</translation> </message> @@ -2802,22 +2880,27 @@ Recomendámoslle que non o use.</translation> <translation>pode editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Pode volver compartir</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Deixar de compartir </translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Pode crear</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Pode cambiar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Pode eliminar</translation> </message> @@ -2844,7 +2927,7 @@ Recomendámoslle que non o use.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation>Vista de depuración do cifrado SSL</translation> </message> <message> @@ -3030,11 +3113,6 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar igualmente neste certificado</translation> @@ -3063,44 +3141,49 @@ Recomendámoslle que non o use.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organización: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidade: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Pegada dixital (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Pegada dixital (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Pegada dixital (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>Pegada dixital (SHA-512): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Data de aplicación: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Data de caducidade: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emisor: %1</translation> </message> @@ -3145,7 +3228,7 @@ Recomendámoslle que non o use.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="516"/> <source>File/Folder is ignored because it's hidden.</source> - <translation>O ficheiro/cartafol ignórase por estar agachado.</translation> + <translation>O ficheiro/cartafol ignórase por estar agochado.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="519"/> @@ -3391,11 +3474,11 @@ Recomendámoslle que non o use.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versión %1. Para obter máis información visite <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Versión %1. Para obter máis información prema <a href='%2'>aquí</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Esta versión foi fornecida por %1</p></translation> </message> @@ -3403,25 +3486,25 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Detectouse un certificado non válido</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>O servidor «%1» forneceu un certificado non válido. Continuar?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Foi desconectado de %1 como o usuario %2. Volva acceder de novo</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Acceda co usuario: %1</translation> </message> @@ -3489,11 +3572,6 @@ Recomendámoslle que non o use.</translation> <translation>Axustes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalles...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Axuda</translation> @@ -3605,6 +3683,11 @@ Recomendámoslle que non o use.</translation> <translation>Nova conta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Ver máis actividades…</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> @@ -3664,23 +3747,6 @@ Recomendámoslle que non o use.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>Etiqueta de texto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3722,11 +3788,6 @@ Recomendámoslle que non o use.</translation> <translation>Cartafol &local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Conservar os datos locais</translation> @@ -3745,11 +3806,6 @@ Recomendámoslle que non o use.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>Nome do &usuario</translation> @@ -3763,11 +3819,6 @@ Recomendámoslle que non o use.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Cambie para o seu navegador para proseguir.</translation> @@ -3782,21 +3833,15 @@ Recomendámoslle que non o use.</translation> <source>Re-open Browser</source> <translation>Volver abrir o navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar a ligazón</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Etiqueta de texto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Hospede o seu propio servidor</span></a></translation> @@ -3830,26 +3875,10 @@ Recomendámoslle que non o use.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Etiqueta de texto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Toda a súa conta está sincronizada co cartafol local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3904,7 +3933,7 @@ Recomendámoslle que non o use.</translation> <translation>Hai algún tempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3987,14 +4016,6 @@ Recomendámoslle que non o use.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Formulario</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_he.ts b/translations/client_he.ts index 0ddd90b04..486b764a6 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -35,7 +35,7 @@ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation type="unfinished"/> + <translation>לא השתנו קבצים לאחרונה</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> @@ -50,47 +50,42 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>לפתוח את האתר</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>השתנה לאחרונה</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>השהיית הסנכרון</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>עזרה</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>הגדרות</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>יציאה</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> <source>Quit sync client</source> - <translation type="unfinished"/> + <translation>יצירה מלקוח הסנכרון</translation> </message> </context> <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>תיבת דו-שיח</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>תוית</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>טופס</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>נא לבחור תיקייה מקומית על המחשב שלך לסנכרון</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>טופס</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>נא לבחור תיקיית יעד מרוחקת</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>תיבת זיכרון להצפנה מקצה לקצה.</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>להגנה על מזהה ההצפנה שלך, אנו מצפינים באמצעות תיבת זיכרון של 12 מילים. מומלץ לרשום אותן בצד ולשמור עליהן באיזור מוגן. ע"י המילים הללו נוכל להוסיף מכשירים נוספים לחשבונך (כגון טלפון חכם או מחשב נייד).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>טופס</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>…</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>מקום אחסון: …</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>לסנכרן הכול</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>לא לסנכרן כלום</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>להחיל שינויים ידניים</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>החלה</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>ביטול</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>מחובר באמצעות <server> כ <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>לא הוגדר חשבון.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>הוספת חדש</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>הסרה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>חשבון</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>הראה תיבת זיכרון ל הצפנה מקצה לקצה </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>הצפן</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>לבחור מה לסנכרן</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>לאלץ סנכרון כעת</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>להפעיל את הסנכרון מחדש</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>הסרת חיבור סנכרון לתיקייה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>יצירת התיקייה נכשלה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>לא ניתן ליצור את התיקייה המקומית <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>אשר הסרת חיבור ל סנכרון תיקיות</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>הסר חיבור ל סנכרון תיקיות</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>סנכרון מופעל</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <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="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 בשימוש</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> - <translation>%1 כ <i>%2</i></translation> + <translation>%1 בתור <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> - <translation>גרסת השרת %1 היא ישנה ואינה נתמכת! המשך עבודה בגרסה זו תחת אחריותך.</translation> + <translation>גרסת השרת %1 ישנה ואינה נתמכת! המשך עבודה בגרסה זו תחת אחריותך.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> - <translation>מחובר ל %1.</translation> + <translation>בוצע חיבור אל %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>השרת %1 אינו זמין כרגע.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>השרת %1 כרגע במצב תחזוקה.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> - <translation>התנתקת מ %1.</translation> + <translation>יצאת מהשירות %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> - <translation>מבקש אימות מהדפדפן. <a href='%1'>הקלק כאן</a> לפתיחה מחדש של הדפדפן.</translation> + <translation>מתבצעת בקשת אימות מהדפדפן. נא <a href='%1'>ללחוץ כאן</a> לפתיחה מחדש של הדפדפן.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> - <translation>מתחבר ל %1...</translation> + <translation>בהתחברות אל %1…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> - <translation>אין חיבור ל %1 ב %2.</translation> + <translation>אין חיבור אל %1 ב־%2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>כניסה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> - <translation>לא סונכרנו בשל בעיות גודל התיקיות הבאות: </translation> + <translation>ישנן תיקיות שלא סונכרנו מפאת גודלן הרב:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> - <translation>לא סונכרנו בשל היותן על אחסון חיצוני התיקיות הבאות :</translation> + <translation>ישנן תיקיות שלא סונכרנו כיוון שהן נמצאות על אמצעי אחסון חיצוניים:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> - <translation>לא סונכרנו בשל היותן על אחסון חיצוני או בשל בעיות גודל התיקיות הבאות :</translation> + <translation>ישנן תיקיות שלא סונכרנו כיוון שהן גדולות מדי או באחסון חיצוני:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> - <translation>אשר הסרת חשבון</translation> + <translation>אישור הסרת חשבון</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>הסרת חיבור</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>פתיחת תיקייה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>יציאה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>להמשיך בסנכרון</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>השהיית סנכרון</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <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="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 מתוך %2 בשימוש</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>ברגע זה אין כל מידע זמין על השימוש באחסון.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>אין הגדרה לחיבור %1</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>טופס</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>תוית טקסט</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>אשר</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>סונכרן</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>נסה מחדש את כל ההעלאות</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation>חשבון %1 לא איפשר את מצב הפעילויות.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>איראה שגיאה בעת כתיבת metadata ל מסד הנתונים</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>נא להקליד את הססמא להצפנה מקצה לקצה:<br><br>משתמש: %2<br>חשבון: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>נא להקליד ססמת הצפנה קצה לקצה</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 אינה ניתנת לקריאה.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 הוסרה.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 התקבלה.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 עודכנה.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>השם של %1 הוחלף בשם %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 הועברה אל %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>פעילות סנכרון</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>לא ניתן לקרוא את קובץ ההחרגה של המערכת.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>נוספה תיקייה שגודלה הוא מעבר ל־%1 מ״ב: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>נוספה תיקייה ממקור חיצוני. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <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="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <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="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,46 +965,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>להוריד קבצים חדשים?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>להוריד קבצים חדשים</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>להשאיר את הקבצים המקומיים</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>התגלה גיבוי</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>סנכרון רגיל</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>להשאיר את הקבצים המקומיים כסותרים</translation> </message> @@ -1025,12 +1120,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>הוספת קישור לסנכרון תיקיות</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>מסונכרן עם תיקייה מקומית</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>קובץ</translation> </message> @@ -1060,7 +1155,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>שגיאה בעת טעינת רשימת התיקיות מהשרת.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>יצאת</translation> </message> @@ -1075,107 +1170,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>יש סתירות שלא נפתרו. נא ללחוץ לקבלת פרטים.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>%1 מסונכרן</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1 לשנייה</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1 לשנייה</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>בהמתנה…</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>בהכנה לסנכרון…</translation> </message> @@ -1306,11 +1401,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>טופס</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>הצהרה משפטית</translation> @@ -1451,7 +1541,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/ignorelisteditor.ui" line="26"/> <source>Sync hidden files</source> - <translation type="unfinished"/> + <translation>סנכרון קבצים נסתרים</translation> </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="36"/> @@ -1459,89 +1549,87 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>הוספה</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation type="unfinished"/> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>להסיר הכול</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>תבנית</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>לאפשר מחיקה</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>הסרה</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>לא ניתן לפתוח קובץ</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> + <translation>הצהרה משפטית</translation> </message> <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> - <translation type="unfinished"/> + <translation>סגירה</translation> </message> <message> <location filename="../src/gui/legalnotice.cpp" line="27"/> <source><p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></source> - <translation type="unfinished"/> + <translation><p>כל הזכויות שמורות 2017-2018 ל־Nextcloud GmbH<br />כל הזכויות שמורות 2012-2018 ל־ownCloud GmbH</p></translation> </message> <message> <location filename="../src/gui/legalnotice.cpp" line="30"/> @@ -1559,12 +1647,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/logbrowser.cpp" line="70"/> <source>&Search:</source> - <translation type="unfinished"/> + <translation>&חיפוש:</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="78"/> <source>&Find</source> - <translation type="unfinished"/> + <translation>&איתור:</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="89"/> @@ -1596,27 +1684,27 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/logbrowser.cpp" line="122"/> <source>S&ave</source> - <translation type="unfinished"/> + <translation>&שמירה</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="123"/> <source>Save the log file to a file on disk for debugging.</source> - <translation type="unfinished"/> + <translation>שמירת קובץ היומן לקובץ בכונן לצורכי ניפוי שגיאות.</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="212"/> <source>Save log file</source> - <translation type="unfinished"/> + <translation>שמירת קובץ יומן</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="222"/> <source>Error</source> - <translation type="unfinished"/> + <translation>שגיאה</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="222"/> <source>Could not write to log file %1</source> - <translation type="unfinished"/> + <translation>לא ניתן לכתוב לקובץ היומן %1</translation> </message> </context> <context> @@ -1624,7 +1712,7 @@ Logs will be written to %1</source> <message> <location filename="../src/libsync/logger.cpp" line="162"/> <source>Error</source> - <translation type="unfinished"/> + <translation>שגיאה</translation> </message> <message> <location filename="../src/libsync/logger.cpp" line="163"/> @@ -1647,50 +1735,45 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="352"/> <source>Skip this version</source> - <translation type="unfinished"/> + <translation>לדלג על הגרסה הזו</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="353"/> <source>Skip this time</source> - <translation type="unfinished"/> + <translation>לדלג הפעם</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="354"/> <source>Get update</source> - <translation type="unfinished"/> + <translation>לקבל עדכון</translation> </message> </context> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> - <translation type="unfinished"/> + <translation>הגדרות מתווך</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="29"/> <source>No Proxy</source> - <translation type="unfinished"/> + <translation>אין מתווך</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="42"/> <source>Use system proxy</source> - <translation type="unfinished"/> + <translation>להשתמש במתווך המערכת</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="52"/> <source>Specify proxy manually as</source> - <translation type="unfinished"/> + <translation>לציין מתווך ידנית בתור</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="80"/> <source>Host</source> - <translation type="unfinished"/> + <translation>מארח</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="100"/> @@ -1700,30 +1783,30 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/networksettings.ui" line="131"/> <source>Proxy server requires authentication</source> - <translation type="unfinished"/> + <translation>השרת המתווך דורש אימות</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="190"/> <source>Download Bandwidth</source> - <translation type="unfinished"/> + <translation>רוחב פס הורדה</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="196"/> <location filename="../src/gui/networksettings.ui" line="275"/> <source>Limit to</source> - <translation type="unfinished"/> + <translation>להגביל לכדי</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="241"/> <location filename="../src/gui/networksettings.ui" line="320"/> <source>KBytes/s</source> - <translation type="unfinished"/> + <translation>ק״ב/ש׳</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="203"/> <location filename="../src/gui/networksettings.ui" line="292"/> <source>No limit</source> - <translation type="unfinished"/> + <translation>ללא הגבלה</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="250"/> @@ -1895,23 +1978,23 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/> <source>Free space: %1</source> - <translation type="unfinished"/> + <translation>מקום פנוי: %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> <source>Local Sync Folder</source> - <translation type="unfinished"/> + <translation>תיקיית סנכרון מקומית</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="340"/> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="370"/> <source>(%1)</source> - <translation type="unfinished"/> + <translation>(%1)</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> <source>There isn't enough free space in the local folder!</source> - <translation type="unfinished"/> + <translation>אין מספיק שטח פנוי בתיקייה המקומית!</translation> </message> </context> <context> @@ -1919,7 +2002,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> <source>Connection failed</source> - <translation type="unfinished"/> + <translation>החיבור נכשל</translation> </message> <message> <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="43"/> @@ -1929,7 +2012,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> <source>Select a different URL</source> - <translation type="unfinished"/> + <translation>נא לבחור בכתובת אחרת</translation> </message> <message> <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="62"/> @@ -1952,17 +2035,17 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> <source>&Email</source> - <translation type="unfinished"/> + <translation>&דוא״ל</translation> </message> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="59"/> <source>Connect to %1</source> - <translation type="unfinished"/> + <translation>להתחבר אל %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/> <source>Enter user credentials</source> - <translation type="unfinished"/> + <translation>להכניס פרטי משתמש</translation> </message> </context> <context> @@ -1970,17 +2053,12 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> <source>Connect to %1</source> - <translation type="unfinished"/> + <translation>להתחבר אל %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> <source>Login in your browser</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> + <translation>כניסה בדפדפן שלך</translation> </message> </context> <context> @@ -1988,12 +2066,12 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Connect to %1</source> - <translation type="unfinished"/> + <translation>להתחבר אל %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="55"/> <source>Setup %1 server</source> - <translation type="unfinished"/> + <translation>הקמת שרת %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="83"/> @@ -2032,12 +2110,12 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> - <translation type="unfinished"/> + <translation>כתובת שגויה</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2115,79 +2193,79 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> - <translation type="unfinished"/> + <translation>שגיאה: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation type="unfinished"/> </message> @@ -2195,14 +2273,14 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> - <translation type="unfinished"/> + <translation>אשף החיבור אל %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> - <translation type="unfinished"/> + <translation>דילוג על הגדרות תיקיות</translation> </message> </context> <context> @@ -2210,17 +2288,17 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="36"/> <source>Everything set up!</source> - <translation type="unfinished"/> + <translation>הכול הוגדר!</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="40"/> <source>Open Local Folder</source> - <translation type="unfinished"/> + <translation>פתיחת תיקייה מקומית</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="48"/> <source>Open %1 in Browser</source> - <translation type="unfinished"/> + <translation>לפתוח את %1 בדפדפן</translation> </message> </context> <context> @@ -2228,15 +2306,15 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/propagateupload.cpp" line="140"/> <source>Invalid JSON reply from the poll URL</source> - <translation type="unfinished"/> + <translation>תגובת JSON שגויה מכתובת התשאול</translation> </message> </context> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> - <translation type="unfinished"/> + <translation>שגיאה בכתיבת נתוני העל למסד הנתונים</translation> </message> </context> <context> @@ -2262,32 +2340,32 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> - <translation type="unfinished"/> + <translation>הקובץ נמחק מהשרת</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> - <translation type="unfinished"/> + <translation>לא ניתן להוריד את הקובץ במלואו.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -2300,7 +2378,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -2310,22 +2388,22 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="170"/> <source>could not delete file %1, error: %2</source> - <translation type="unfinished"/> + <translation>לא ניתן למחוק את הקובץ %1, שגיאה: %2</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="185"/> <source>Attention, possible case sensitivity clash with %1</source> - <translation type="unfinished"/> + <translation>לתשומת לבך, כנראה שיש סתירה של אותיות רישיות עם %1</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="191"/> <source>could not create folder %1</source> - <translation type="unfinished"/> + <translation>לא ניתן ליצור את התיקייה %1</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="203"/> <source>Error writing metadata to the database</source> - <translation type="unfinished"/> + <translation>שגיאה בכתיבת נתוני העל למסד הנתונים</translation> </message> </context> <context> @@ -2333,17 +2411,17 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="77"/> <source>Error removing '%1': %2;</source> - <translation type="unfinished"/> + <translation>שגיאה בהסרת ‚%1’: %2;</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="102"/> <source>Could not remove folder '%1'</source> - <translation type="unfinished"/> + <translation>לא ניתן להסיר את התיקייה ‚%1’</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="123"/> <source>Could not remove %1 because of a local file name clash</source> - <translation type="unfinished"/> + <translation>לא ניתן להסיר את %1 עקב סתירה עם שם קובץ מקומי</translation> </message> </context> <context> @@ -2351,13 +2429,13 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="241"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> - <translation type="unfinished"/> + <translation>לא ניתן לשנות את השם של %1 לשם %2 עקב סתירה עם שם קובץ מקומי</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <location filename="../src/libsync/propagatorjobs.cpp" line="277"/> <source>Error writing metadata to the database</source> - <translation type="unfinished"/> + <translation>שגיאה בכתיבת נתוני העל למסד הנתונים</translation> </message> </context> <context> @@ -2432,29 +2510,29 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> - <translation type="unfinished"/> + <translation>מזהה הקובץ חסר בשרת</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> - <translation type="unfinished"/> + <translation>ETag חסר בשרת</translation> </message> </context> <context> @@ -2462,22 +2540,22 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/propagateuploadv1.cpp" line="213"/> <source>Poll URL missing</source> - <translation type="unfinished"/> + <translation>חסרה כתובת הסקר</translation> </message> <message> <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> <source>The local file was removed during sync.</source> - <translation type="unfinished"/> + <translation>הקובץ המקומי הוסר במהלך הסנכרון.</translation> </message> <message> <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> <source>Local file changed during sync.</source> - <translation type="unfinished"/> + <translation>הקובץ המקומי השתנה במהלך הסנכרון.</translation> </message> <message> <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> - <translation type="unfinished"/> + <translation>השרת לא הכיר בחלק האחרון. (לא היה e-tag)</translation> </message> </context> <context> @@ -2485,27 +2563,27 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/proxyauthdialog.ui" line="20"/> <source>Proxy authentication required</source> - <translation type="unfinished"/> + <translation>נדרש אימות מול המתווך</translation> </message> <message> <location filename="../src/gui/proxyauthdialog.ui" line="26"/> <source>Username:</source> - <translation type="unfinished"/> + <translation>שם משתמש:</translation> </message> <message> <location filename="../src/gui/proxyauthdialog.ui" line="36"/> <source>Proxy:</source> - <translation type="unfinished"/> + <translation>מתווך:</translation> </message> <message> <location filename="../src/gui/proxyauthdialog.ui" line="43"/> <source>The proxy server needs a username and password.</source> - <translation type="unfinished"/> + <translation>לשרת המתווך נדרשים שם משתמש וססמה.</translation> </message> <message> <location filename="../src/gui/proxyauthdialog.ui" line="50"/> <source>Password:</source> - <translation type="unfinished"/> + <translation>ססמה:</translation> </message> <message> <location filename="../src/gui/proxyauthdialog.ui" line="74"/> @@ -2518,7 +2596,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> <source>Choose What to Sync</source> - <translation type="unfinished"/> + <translation>נא לבחור מה לסנכרן</translation> </message> </context> <context> @@ -2526,33 +2604,33 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/> <source>Loading ...</source> - <translation type="unfinished"/> + <translation>בטעינה…</translation> </message> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="79"/> <source>Deselect remote folders you do not wish to synchronize.</source> - <translation type="unfinished"/> + <translation>יש לבטל את בחירת התיקיות המרוחקות אם אין ברצונך לסנכרן.</translation> </message> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="95"/> <source>Name</source> - <translation type="unfinished"/> + <translation>שם</translation> </message> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="96"/> <source>Size</source> - <translation type="unfinished"/> + <translation>גודל</translation> </message> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> <source>No subfolders currently on the server.</source> - <translation type="unfinished"/> + <translation>אין כרגע תת־תיקיות בשרת.</translation> </message> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> <source>An error occurred while loading the list of sub folders.</source> - <translation type="unfinished"/> + <translation>אירעה שגיאה בעת טעינת רשימת תת־התיקיות.</translation> </message> </context> <context> @@ -2560,7 +2638,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/servernotificationhandler.cpp" line="153"/> <source>Dismiss</source> - <translation type="unfinished"/> + <translation>התעלמות</translation> </message> </context> <context> @@ -2568,27 +2646,27 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/settingsdialog.ui" line="14"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>הגדרות</translation> </message> <message> <location filename="../src/gui/settingsdialog.cpp" line="211"/> <source>Activity</source> - <translation type="unfinished"/> + <translation>פעילות</translation> </message> <message> <location filename="../src/gui/settingsdialog.cpp" line="105"/> <source>General</source> - <translation type="unfinished"/> + <translation>כללי</translation> </message> <message> <location filename="../src/gui/settingsdialog.cpp" line="111"/> <source>Network</source> - <translation type="unfinished"/> + <translation>רשת</translation> </message> <message> <location filename="../src/gui/settingsdialog.cpp" line="234"/> <source>Account</source> - <translation type="unfinished"/> + <translation>חשבון</translation> </message> </context> <context> @@ -2596,28 +2674,28 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/settingsdialogmac.cpp" line="92"/> <source>%1</source> - <translation type="unfinished"/> + <translation>%1</translation> </message> <message> <location filename="../src/gui/settingsdialogmac.cpp" line="155"/> <source>Activity</source> - <translation type="unfinished"/> + <translation>פעילות</translation> </message> <message> <location filename="../src/gui/settingsdialogmac.cpp" line="106"/> <source>General</source> - <translation type="unfinished"/> + <translation>כללי</translation> </message> <message> <location filename="../src/gui/settingsdialogmac.cpp" line="110"/> <source>Network</source> - <translation type="unfinished"/> + <translation>רשת</translation> </message> <message> <location filename="../src/gui/settingsdialogmac.cpp" line="138"/> <location filename="../src/gui/settingsdialogmac.cpp" line="231"/> <source>Account</source> - <translation type="unfinished"/> + <translation>חשבון</translation> </message> </context> <context> @@ -2630,12 +2708,12 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharedialog.ui" line="67"/> <source>ownCloud Path:</source> - <translation type="unfinished"/> + <translation>נתיב ownCloud:</translation> </message> <message> <location filename="../src/gui/sharedialog.ui" line="123"/> <source>Icon</source> - <translation type="unfinished"/> + <translation>סמל</translation> </message> <message> <location filename="../src/gui/sharedialog.cpp" line="104"/> @@ -2650,85 +2728,85 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharedialog.cpp" line="101"/> <source>Folder: %2</source> - <translation type="unfinished"/> + <translation>תיקייה: %2</translation> </message> <message> <location filename="../src/gui/sharedialog.cpp" line="272"/> <source>The file can not be shared because it was shared without sharing permission.</source> - <translation type="unfinished"/> + <translation>לא ניתן לשתף את הקובץ כיוון שהוא שותף ללא הרשאות שיתוף.</translation> </message> </context> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> - <translation type="unfinished"/> + <translation>ססמה:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> - <translation type="unfinished"/> + <translation>מועד תפוגת תוקף:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="409"/> <source>Delete</source> - <translation type="unfinished"/> + <translation>מחיקה</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="149"/> <source>Allow Editing</source> - <translation type="unfinished"/> + <translation>לאפשר עריכה</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="155"/> <source>Read only</source> - <translation type="unfinished"/> + <translation>קריאה בלבד</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Allow Upload && Editing</source> - <translation type="unfinished"/> + <translation>לאפשר העלאה ועריכה</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> <source>File Drop (Upload Only)</source> - <translation type="unfinished"/> + <translation>גרירת קבצים (העלאה בלבד)</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="183"/> <source>Password Protect</source> - <translation type="unfinished"/> + <translation>הגנה בססמה</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="200"/> <source>Expiration Date</source> - <translation type="unfinished"/> + <translation>מועד תפוגת תוקף</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="219"/> <source>Unshare</source> - <translation type="unfinished"/> + <translation>ביטול שיתוף</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="224"/> <source>Add another link</source> - <translation type="unfinished"/> + <translation>הוספת קישור נוסף</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="402"/> <source>Confirm Link Share Deletion</source> - <translation type="unfinished"/> + <translation>אישור מחיקת קישור לשיתוף</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="403"/> @@ -2738,35 +2816,35 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="410"/> <source>Cancel</source> - <translation type="unfinished"/> + <translation>ביטול</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="428"/> <source>Public link</source> - <translation type="unfinished"/> + <translation>קישור ציבורי</translation> </message> </context> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> - <translation type="unfinished"/> + <translation>שיתוף עם משתמשים או קבוצות…</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> - <translation type="unfinished"/> + <translation>העתקת קישור</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> - <translation type="unfinished"/> + <translation>אין תוצאות לחיפוש אחר ‚%1’</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> - <translation type="unfinished"/> + <translation>שיתפת אתך משהו</translation> </message> </context> <context> @@ -2774,32 +2852,37 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/shareuserline.ui" line="66"/> <source>User name</source> - <translation type="unfinished"/> + <translation>שם משתמש</translation> </message> <message> <location filename="../src/gui/shareuserline.ui" line="82"/> <source>can edit</source> - <translation type="unfinished"/> + <translation>הרשאה לעריכה</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> + <translation>הרשאה לשיתוף מחדש</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> - <translation type="unfinished"/> + <translation>הרשאה ליצירה</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> - <translation type="unfinished"/> + <translation>הרשאה לעריכה</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> - <translation type="unfinished"/> + <translation>הרשאה למחיקה</translation> </message> </context> <context> @@ -2807,12 +2890,12 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/> <source>Login Error</source> - <translation type="unfinished"/> + <translation>שגיאת כניסה</translation> </message> <message> <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/> <source>You must sign in as user %1</source> - <translation type="unfinished"/> + <translation>עליך להיכנס בתור המשתמש %1</translation> </message> </context> <context> @@ -2820,22 +2903,22 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="83"/> <source>%1 - Authenticate</source> - <translation type="unfinished"/> + <translation>%1 - אימות</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> <source>Reauthentication required</source> - <translation type="unfinished"/> + <translation>נדרשת אימות חוזר</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> - <translation type="unfinished"/> + <translation>ההפעלה שלך פגה. עליך להיכנס מחדש כדי להמשיך להשתמש בתכנית הלקוח.</translation> </message> </context> <context> @@ -2844,50 +2927,50 @@ It is not advisable to use it.</source> <location filename="../src/gui/socketapi.cpp" line="457"/> <source>Share with %1</source> <comment>parameter is Nextcloud</comment> - <translation type="unfinished"/> + <translation>שיתוף עם %1</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="491"/> <source>Context menu share</source> - <translation type="unfinished"/> + <translation>שיתוף מתפריט הקשר</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="612"/> <source>I shared something with you</source> - <translation type="unfinished"/> + <translation>שיתפתי אתך משהו</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="625"/> <location filename="../src/gui/socketapi.cpp" line="655"/> <source>Share...</source> - <translation type="unfinished"/> + <translation>שיתוף…</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="627"/> <location filename="../src/gui/socketapi.cpp" line="672"/> <source>Copy private link to clipboard</source> - <translation type="unfinished"/> + <translation>העתקת שיעור פרטי ללוח הגזירים</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="628"/> <source>Send private link by email...</source> - <translation type="unfinished"/> + <translation>שליחת קישור פרטי בדוא״ל…</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="653"/> <source>Resharing this file is not allowed</source> - <translation type="unfinished"/> + <translation>אסור לשתף קובץ זה מחדש</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="666"/> <location filename="../src/gui/socketapi.cpp" line="668"/> <source>Copy public link to clipboard</source> - <translation type="unfinished"/> + <translation>העתקת קישור ציבורי ללוח הגזירים</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="722"/> <source>Open in browser</source> - <translation type="unfinished"/> + <translation>פתיחה בדפדפן</translation> </message> </context> <context> @@ -2895,7 +2978,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sslbutton.cpp" line="87"/> <source><h3>Certificate Details</h3></source> - <translation type="unfinished"/> + <translation><h3>פרטי האישור</h3></translation> </message> <message> <location filename="../src/gui/sslbutton.cpp" line="90"/> @@ -2960,12 +3043,12 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>SHA-256:</source> - <translation type="unfinished"/> + <translation>SHA-256:</translation> </message> <message> <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>SHA-1:</source> - <translation type="unfinished"/> + <translation>SHA-1:</translation> </message> <message> <location filename="../src/gui/sslbutton.cpp" line="116"/> @@ -3008,11 +3091,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation type="unfinished"/> @@ -3041,44 +3119,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> + <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> - <source>Fingerprint (SHA1): <tt>%1</tt></source> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation type="unfinished"/> </message> @@ -3184,17 +3267,17 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/syncengine.cpp" line="129"/> <source>Discovery step failed.</source> - <translation type="unfinished"/> + <translation>שלב בגילוי נכשל</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="138"/> <source>Permission denied.</source> - <translation type="unfinished"/> + <translation>ההרשאה נדחתה.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="141"/> <source>File or directory not found:</source> - <translation type="unfinished"/> + <translation>קובץ או תיקייה לא נמצאו:</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="144"/> @@ -3209,12 +3292,12 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/syncengine.cpp" line="156"/> <source>The service is temporarily unavailable</source> - <translation type="unfinished"/> + <translation>השירות אינו זמין באופן זמני</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="162"/> <source>Access is forbidden</source> - <translation type="unfinished"/> + <translation>הגישה אסורה</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="173"/> @@ -3254,17 +3337,17 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/syncengine.cpp" line="513"/> <source>Filename is too long.</source> - <translation type="unfinished"/> + <translation>שם הקובץ ארוך מדי</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="522"/> <source>The filename cannot be encoded on your file system.</source> - <translation type="unfinished"/> + <translation>לא ניתן להצפין את שם הקובץ במערכת הקבצים שלך.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="531"/> <source>Unresolved conflict.</source> - <translation type="unfinished"/> + <translation>סתירה בלתי פתורה.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="539"/> @@ -3341,12 +3424,12 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/syncengine.cpp" line="1496"/> <source>the destination</source> - <translation type="unfinished"/> + <translation>היעד</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="1496"/> <source>the source</source> - <translation type="unfinished"/> + <translation>המקור</translation> </message> </context> <context> @@ -3354,7 +3437,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/synclogdialog.ui" line="14"/> <source>Synchronisation Log</source> - <translation type="unfinished"/> + <translation>יומן סנכרון</translation> </message> </context> <context> @@ -3369,11 +3452,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3381,27 +3464,27 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> - <translation type="unfinished"/> + <translation>נא להיכנס עם המשתמש: %1</translation> </message> </context> <context> @@ -3409,87 +3492,82 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="302"/> <source>Please sign in</source> - <translation type="unfinished"/> + <translation>נא להיכנס</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Folder %1: %2</source> - <translation type="unfinished"/> + <translation>תיקייה %1: %2</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="366"/> <source>There are no sync folders configured.</source> - <translation type="unfinished"/> + <translation>לא מוגדרות תיקיות לסנכרון</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Open in browser</source> - <translation type="unfinished"/> + <translation>פתיחה בדפדפן</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="424"/> <source>Log in...</source> - <translation type="unfinished"/> + <translation>כניסה…</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="428"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>יציאה</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="523"/> <source>Recent Changes</source> - <translation type="unfinished"/> + <translation>שינויים אחרונים</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="402"/> <source>Managed Folders:</source> - <translation type="unfinished"/> + <translation>תיקיות מנוהלות:</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="405"/> <source>Open folder '%1'</source> - <translation type="unfinished"/> + <translation>פתיחת התיקייה ‚%1’</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="377"/> <source>Open %1 in browser</source> - <translation type="unfinished"/> + <translation>פתיחת %1 בדפדפן</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="778"/> <source>Unknown status</source> - <translation type="unfinished"/> + <translation>מצב לא ידוע</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="780"/> <source>Settings...</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation type="unfinished"/> + <translation>הגדרות…</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> - <translation type="unfinished"/> + <translation>עזרה</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="790"/> <source>Quit %1</source> - <translation type="unfinished"/> + <translation>יציאה מ־%1</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="283"/> <source>Disconnected from %1</source> - <translation type="unfinished"/> + <translation>ניתוק מ־%1</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="233"/> <source>Unsupported Server Version</source> - <translation type="unfinished"/> + <translation>גרסת השרת אינה נתמכת</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="234"/> @@ -3514,72 +3592,77 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="288"/> <source>Account %1: %2</source> - <translation type="unfinished"/> + <translation>חשבון %1: %2</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Signed out</source> - <translation type="unfinished"/> + <translation>יצאת</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="307"/> <source>Account synchronization is disabled</source> - <translation type="unfinished"/> + <translation>סנכרון החשבון מושבת</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="308"/> <location filename="../src/gui/owncloudgui.cpp" line="361"/> <source>Synchronization is paused</source> - <translation type="unfinished"/> + <translation>הסנכרון מושהה</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="356"/> <source>Unresolved conflicts</source> - <translation type="unfinished"/> + <translation>סתירות בלתי פתורות</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="363"/> <source>Error during synchronization</source> - <translation type="unfinished"/> + <translation>שגיאה במהלך הסנכרון</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="367"/> <source>No sync folders configured</source> - <translation type="unfinished"/> + <translation>לא הוגדרו תיקיות סנכרון</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="413"/> <source>Resume all folders</source> - <translation type="unfinished"/> + <translation>להמשיך עם כל התיקיות</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="418"/> <source>Pause all folders</source> - <translation type="unfinished"/> + <translation>להשהות את כל התיקיות</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="694"/> <source>Resume all synchronization</source> - <translation type="unfinished"/> + <translation>להמשיך את כל הסנכרונים</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="696"/> <source>Resume synchronization</source> - <translation type="unfinished"/> + <translation>להמשיך סנכרון</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="704"/> <source>Pause all synchronization</source> - <translation type="unfinished"/> + <translation>להשהות את כל הסנכרונים</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="706"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <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 type="unfinished"/> </message> <message> @@ -3636,32 +3719,15 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="358"/> <source>Up to date</source> - <translation type="unfinished"/> + <translation>עדכני</translation> </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> - <translation type="unfinished"/> + <translation>שרת</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="354"/> @@ -3682,7 +3748,7 @@ It is not advisable to use it.</source> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="165"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> - <translation type="unfinished"/> + <translation>מ״ב</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="174"/> @@ -3697,102 +3763,81 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="251"/> <source>&Local Folder</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation type="unfinished"/> + <translation>&תיקייה מקומית</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> - <translation type="unfinished"/> + <translation>לה&שאיר את הנתונים המקומיים</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/> <source>S&ync everything from server</source> - <translation type="unfinished"/> + <translation>ל&סנכרן הכול מהשרת</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/> <source>Status message</source> - <translation type="unfinished"/> + <translation>הודעת מצב</translation> </message> </context> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> - <translation type="unfinished"/> + <translation>&שם משתמש</translation> </message> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="83"/> <source>&Password</source> - <translation type="unfinished"/> + <translation>&ססמה</translation> </message> </context> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> - <translation type="unfinished"/> + <translation>נא להחליף לדפדפן שלך כדי להמשיך.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> <source>An error occurred while connecting. Please try again.</source> - <translation type="unfinished"/> + <translation>אירעה שגיאה בזמן החיבור. נא לנסות שוב.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> <source>Re-open Browser</source> + <translation>נא לפתוח את הדפדפן מחדש</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> <translation type="unfinished"/> </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">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:#0000ff;">אירוח שרת משלך</span></a></translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="143"/> <source>Register with a provider</source> - <translation type="unfinished"/> + <translation>הרשמה אצל ספק</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="165"/> <source>Log in</source> - <translation type="unfinished"/> + <translation>כניסה</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="288"/> <source>Server Address</source> - <translation type="unfinished"/> + <translation>כתובת השרת</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="304"/> @@ -3802,31 +3847,15 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="339"/> <source>Error Label</source> - <translation type="unfinished"/> + <translation>תווית שגיאה</translation> </message> </context> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation type="unfinished"/> + <translation>כל החשבון שלך מסונכרן לתיקייה הנוכחית</translation> </message> </context> <context> @@ -3834,55 +3863,55 @@ It is not advisable to use it.</source> <message> <location filename="../src/common/utility.cpp" line="443"/> <source>in the future</source> - <translation type="unfinished"/> + <translation>בעתיד</translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="437"/> <source>%n day ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>אתמול</numerusform><numerusform>שלשום</numerusform><numerusform>לפני %n ימים</numerusform><numerusform>לפני %n ימים</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="439"/> <source>%n days ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>אתמול</numerusform><numerusform>שלשום</numerusform><numerusform>לפני %n ימים</numerusform><numerusform>לפני %n ימים</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="449"/> <source>%n hour ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>לפני שעה</numerusform><numerusform>לפני שעתיים</numerusform><numerusform>לפני %n שעות</numerusform><numerusform>לפני %n שעות</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="451"/> <source>%n hours ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>לפני שעה</numerusform><numerusform>לפני שעתיים</numerusform><numerusform>לפני %n שעות</numerusform><numerusform>לפני %n שעות</numerusform></translation> </message> <message> <location filename="../src/common/utility.cpp" line="458"/> <source>now</source> - <translation type="unfinished"/> + <translation>עכשיו</translation> </message> <message> <location filename="../src/common/utility.cpp" line="460"/> <source>Less than a minute ago</source> - <translation type="unfinished"/> + <translation>לפני פחות מדקה</translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="464"/> <source>%n minute ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>לפני דקה</numerusform><numerusform>לפני %n דקות</numerusform><numerusform>לפני %n דקות</numerusform><numerusform>לפני %n דקות</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="466"/> <source>%n minutes ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>לפני דקה</numerusform><numerusform>לפני %n דקות</numerusform><numerusform>לפני %n דקות</numerusform><numerusform>לפני %n דקות</numerusform></translation> </message> <message> <location filename="../src/common/utility.cpp" line="470"/> <source>Some time ago</source> - <translation type="unfinished"/> + <translation>ממש לא מזמן</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation type="unfinished"/> @@ -3893,57 +3922,57 @@ It is not advisable to use it.</source> <message> <location filename="../src/common/utility.cpp" line="130"/> <source>%L1 GB</source> - <translation type="unfinished"/> + <translation>%L1 ג״ב</translation> </message> <message> <location filename="../src/common/utility.cpp" line="134"/> <source>%L1 MB</source> - <translation type="unfinished"/> + <translation>%L1 מ״ב</translation> </message> <message> <location filename="../src/common/utility.cpp" line="138"/> <source>%L1 KB</source> - <translation type="unfinished"/> + <translation>%L1 ק״ב</translation> </message> <message> <location filename="../src/common/utility.cpp" line="141"/> <source>%L1 B</source> - <translation type="unfinished"/> + <translation>%L1 ב׳</translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="310"/> <source>%n year(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>שנה</numerusform><numerusform>שנתיים</numerusform><numerusform>%n שנים</numerusform><numerusform>%n שנים</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="311"/> <source>%n month(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>חודש</numerusform><numerusform>חודשיים</numerusform><numerusform>%n חודשים</numerusform><numerusform>%n חודשים</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="312"/> <source>%n day(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>יום</numerusform><numerusform>יומיים</numerusform><numerusform>%n ימים</numerusform><numerusform>%n ימים</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="313"/> <source>%n hour(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>שעה</numerusform><numerusform>שעתיים</numerusform><numerusform>%n שעות</numerusform><numerusform>%n שעות</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="314"/> <source>%n minute(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>דקה</numerusform><numerusform>%n דקות</numerusform><numerusform>%n דקות</numerusform><numerusform>%n דקות</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="315"/> <source>%n second(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>שנייה</numerusform><numerusform>%n שניות</numerusform><numerusform>%n שניות</numerusform><numerusform>%n שניות</numerusform></translation> </message> <message> <location filename="../src/common/utility.cpp" line="339"/> <source>%1 %2</source> - <translation type="unfinished"/> + <translation>%1 %2</translation> </message> </context> <context> @@ -3951,7 +3980,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/common/checksums.cpp" line="233"/> <source>The checksum header is malformed.</source> - <translation type="unfinished"/> + <translation>כותרת הבדיקה פגומה.</translation> </message> <message> <location filename="../src/common/checksums.cpp" line="248"/> @@ -3965,19 +3994,11 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> <source>System Tray not available</source> - <translation type="unfinished"/> + <translation>מגש המערכת אינו זמין</translation> </message> <message> <location filename="../src/gui/main.cpp" line="40"/> @@ -3990,7 +4011,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/theme.cpp" line="328"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> - <translation type="unfinished"/> + <translation><p><small>נבנה מהמהדורה <a href="%1">%2</a> ב־Git ב־%3, %4 באמצעות Qt %5, %6</small></p></translation> </message> </context> <context> @@ -4018,7 +4039,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> <source>Moved to %1</source> - <translation type="unfinished"/> + <translation>הועבר אל %1</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> @@ -4028,23 +4049,23 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> <source>Filesystem access error</source> - <translation type="unfinished"/> + <translation>שגיאת גישה למערכת הקבצים</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="48"/> <source>Error</source> - <translation type="unfinished"/> + <translation>שגיאה</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> <source>Updated local metadata</source> - <translation type="unfinished"/> + <translation>נתוני העל המקומיים עודכנו</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> <location filename="../src/libsync/progressdispatcher.cpp" line="55"/> <source>Unknown</source> - <translation type="unfinished"/> + <translation>לא ידוע</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> @@ -4075,12 +4096,12 @@ It is not advisable to use it.</source> <location filename="../src/libsync/progressdispatcher.cpp" line="77"/> <location filename="../src/libsync/progressdispatcher.cpp" line="79"/> <source>error</source> - <translation type="unfinished"/> + <translation>שגיאה</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="81"/> <source>updating local metadata</source> - <translation type="unfinished"/> + <translation>נתוני העל המקומיים מתעדכנים</translation> </message> </context> <context> @@ -4088,42 +4109,42 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/theme.cpp" line="62"/> <source>Status undefined</source> - <translation type="unfinished"/> + <translation>המצב לא מוגדר</translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="65"/> <source>Waiting to start sync</source> - <translation type="unfinished"/> + <translation>בהמתנה להתחלת סנכרון</translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="68"/> <source>Sync is running</source> - <translation type="unfinished"/> + <translation>הסנכרון פעיל</translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="71"/> <source>Sync Success</source> - <translation type="unfinished"/> + <translation>הסנכרון הצליח</translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="74"/> <source>Sync Success, some files were ignored.</source> - <translation type="unfinished"/> + <translation>הסנכרון הצליח תוך התעלמות ממספר קבצים.</translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="77"/> <source>Sync Error</source> - <translation type="unfinished"/> + <translation>שגיאת סנכרון</translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="80"/> <source>Setup Error</source> - <translation type="unfinished"/> + <translation>שגיאת התקנה</translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="83"/> <source>Preparing to sync</source> - <translation type="unfinished"/> + <translation>בהכנה לסנכרון</translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="86"/> @@ -4133,7 +4154,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/theme.cpp" line="89"/> <source>Sync is paused</source> - <translation type="unfinished"/> + <translation>הסנכרון מושהה</translation> </message> </context> <context> @@ -4141,7 +4162,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/guiutility.cpp" line="34"/> <source>Could not open browser</source> - <translation type="unfinished"/> + <translation>לא ניתן לפתוח דפדפן</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="35"/> @@ -4151,12 +4172,12 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/guiutility.cpp" line="58"/> <source>Could not open email client</source> - <translation type="unfinished"/> + <translation>לא ניתן לפתוח לקוח דוא״ל</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="59"/> <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source> - <translation type="unfinished"/> + <translation>אירעה שגיאה בעת הפעלת לקוח הדוא״ל לצורך כתיבת הודעה חדשה. אולי לא מוגדר לקוח דוא״ל כבררת מחדל?</translation> </message> </context> </TS>
\ No newline at end of file diff --git a/translations/client_hr.ts b/translations/client_hr.ts new file mode 100644 index 000000000..3fed3e7fa --- /dev/null +++ b/translations/client_hr.ts @@ -0,0 +1,4202 @@ +<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr" version="2.1"> +<context> + <name>CloudProviderWrapper</name> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="107"/> + <source>%1 (%2, %3)</source> + <translation>%1 (%2, %3)</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/> + <source>Checking for changes in '%1'</source> + <translation>Provjera izmjena u '%1'</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/> + <source>Syncing %1 of %2 (%3 left)</source> + <translation>Sinkronizacija %1 od %2 (preostalo %3)</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/> + <source>Syncing %1 of %2</source> + <translation>Sinkronizacija %1 od %2</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/> + <source>Syncing %1 (%2 left)</source> + <translation>Sinkronizacija %1 (preostalo %2)</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/> + <source>Syncing %1</source> + <translation>Sinkronizacija %1</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> + <source>No recently changed files</source> + <translation>Nema nedavno promijenjenih datoteka</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> + <source>Sync paused</source> + <translation>Sinkronizacija je pauzirana</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="184"/> + <source>Syncing</source> + <translation>Sinkronizacija</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> + <source>Open website</source> + <translation>Otvori web-mjesto</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> + <source>Recently changed</source> + <translation>Nedavno promijenjeno</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> + <source>Pause synchronization</source> + <translation>Pauziraj sinkronizaciju</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> + <source>Help</source> + <translation>Pomoć</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> + <source>Settings</source> + <translation>Postavke</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> + <source>Log out</source> + <translation>Odjava</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> + <source>Quit sync client</source> + <translation>Zatvori klijent za sinkronizaciju</translation> + </message> +</context> +<context> + <name>Dialog</name> + <message> + <location filename="../src/gui/mnemonicdialog.ui" line="58"/> + <source>Label</source> + <translation>Oznaka</translation> + </message> +</context> +<context> + <name>FileSystem</name> + <message> + <location filename="../src/common/filesystembase.cpp" line="445"/> + <source>Could not make directories in trash</source> + <translation>Neuspješna izrada direktorija u košu za smeće</translation> + </message> + <message> + <location filename="../src/common/filesystembase.cpp" line="459"/> + <location filename="../src/common/filesystembase.cpp" line="465"/> + <source>Could not move '%1' to '%2'</source> + <translation>Nije moguće premjestiti '%1' u '%2'</translation> + </message> + <message> + <location filename="../src/common/filesystembase.cpp" line="502"/> + <source>Moving to the trash is not implemented on this platform</source> + <translation>Premještanje u koš za smeće nije implementirano na ovoj platformi</translation> + </message> +</context> +<context> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation>Obrazac</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Za nastavak prijeđite na preglednik.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Došlo je do pogreške tijekom povezivanja. Pokušajte ponovno.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation>Obrazac</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Za nastavak prijeđite na preglednik.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Došlo je do pogreške tijekom povezivanja. Pokušajte ponovno.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> + <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation>Odaberite lokalnu mapu na računalu koju želite sinkronizirati</translation> + </message> + <message> + <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/> + <source>&Choose...</source> + <translation>&Odaberite...</translation> + </message> +</context> +<context> + <name>FolderWizardTargetPage</name> + <message> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> + <source>Select a remote destination folder</source> + <translation>Odaberi udaljenu odredišnu mapu</translation> + </message> + <message> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> + <source>Create Folder</source> + <translation>Stvori mapu</translation> + </message> + <message> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> + <source>Refresh</source> + <translation>Osvježi</translation> + </message> + <message> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> + <source>Folders</source> + <translation>Mape</translation> + </message> + <message> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> + <source>TextLabel</source> + <translation>TextLabel</translation> + </message> +</context> +<context> + <name>OCC::AbstractNetworkJob</name> + <message> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="249"/> + <source>Connection timed out</source> + <translation>Vrijeme sesije je isteklo</translation> + </message> + <message> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="251"/> + <source>Unknown error: network reply was deleted</source> + <translation>Nepoznata pogreška: odgovor mreže je izbrisan</translation> + </message> + <message> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="403"/> + <source>Server replied "%1 %2" to "%3 %4"</source> + <translation>Poslužitelj je odgovorio „%1 %2” na „%3 %4”</translation> + </message> +</context> +<context> + <name>OCC::AccountManager</name> + <message> + <location filename="../src/gui/accountmanager.cpp" line="353"/> + <source>End to end encryption mnemonic</source> + <translation>Mnemonika cjelovitog šifriranja</translation> + </message> + <message> + <location filename="../src/gui/accountmanager.cpp" line="354"/> + <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> + <translation>Kako bismo zaštitili vaš kriptografski identitet, šifriramo ga s pomoću mnemonika od 12 riječi iz rječnika. Zapamtite ih i čuvajte na sigurnom. Bit će vam potrebni za dodavanje drugih uređaja na vaš račun (poput mobilnog telefona ili prijenosnog računala).</translation> + </message> +</context> +<context> + <name>OCC::AccountSettings</name> + <message> + <location filename="../src/gui/accountsettings.ui" line="190"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="211"/> + <source>Storage space: ...</source> + <translation>Prostor za pohranu:...</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>Neoznačene mape bit će <b>uklonjene</b> iz vašeg lokalnog datotečnog sustava i više se neće sinkronizirati s ovim računalom</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="77"/> + <source>Synchronize all</source> + <translation>Sinkroniziraj sve</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="84"/> + <source>Synchronize none</source> + <translation>Sinkroniziraj ništa</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="91"/> + <source>Apply manual changes</source> + <translation>Primijeni ručne promjene</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="139"/> + <source>Apply</source> + <translation>Potvrdi</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> + <source>Cancel</source> + <translation>Odustani</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="174"/> + <source>Connected with <server> as <user></source> + <translation>Povezan s <poslužitelj> kao <korisnik></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="188"/> + <source>No account configured.</source> + <translation>Račun nije konfiguriran.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="216"/> + <source>Add new</source> + <translation>Dodaj novi</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="224"/> + <source>Remove</source> + <translation>Ukloni</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="228"/> + <source>Account</source> + <translation>Račun</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Ovaj račun podržava cjelovito šifriranje</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Omogući šifriranje</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> + <source>Show E2E mnemonic</source> + <translation>Pokaži E2E mnemoničku oznaku</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="610"/> + <source>Encrypt</source> + <translation>Šifriraj</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> + <source>Choose what to sync</source> + <translation>Odaberite što sinkronizirati</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="664"/> + <source>Force sync now</source> + <translation>Sinkroniziraj sada</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="666"/> + <source>Restart sync</source> + <translation>Ponovno pokreni sinkronizaciju</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="675"/> + <source>Remove folder sync connection</source> + <translation>Uklonite poveznicu za sinkronizaciju mape</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="746"/> + <source>Folder creation failed</source> + <translation>Neuspješna izrada mape</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="747"/> + <source><p>Could not create local folder <i>%1</i>.</source> + <translation><p>Nije moguće stvoriti lokalnu mapu <i>%1</i>.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="800"/> + <source>Confirm Folder Sync Connection Removal</source> + <translation>Potvrdi uklanjanje poveznice za sinkronizaciju mape</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="807"/> + <source>Remove Folder Sync Connection</source> + <translation>Uklonite poveznicu za sinkronizaciju mape</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="889"/> + <source>Sync Running</source> + <translation>Sinkronizacija u tijeku</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="890"/> + <source>The syncing operation is running.<br/>Do you want to terminate it?</source> + <translation>Sinkronizacija je pokrenuta.<br/>Želite li je prekinuti?</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="979"/> + <source>%1 in use</source> + <translation>%1 u upotrebi</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> + <source>%1 as <i>%2</i></source> + <translation>%1 kao <i>%2</i></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> + <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> + <translation>Inačica poslužitelja %1 je stara i nepodržana! Nastavite na vlastitu odgovornost.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> + <source>Connected to %1.</source> + <translation>Povezano s %1.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> + <source>Server %1 is temporarily unavailable.</source> + <translation>Poslužitelj %1 privremeno nije dostupan.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> + <source>Server %1 is currently in maintenance mode.</source> + <translation>Poslužitelj %1 trenutno je u načinu održavanja.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> + <source>Signed out from %1.</source> + <translation>Odjavili ste se iz %1.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> + <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> + <translation>Dobivanje autorizacije od preglednika. <a href='%1'>Kliknite ovdje</a> za ponovno otvaranje preglednika.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> + <source>Connecting to %1...</source> + <translation>Povezivanje s %1...</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> + <source>No connection to %1 at %2.</source> + <translation>Ne postoji veza s %1 na %2.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> + <source>Log in</source> + <translation>Prijava</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> + <source>There are folders that were not synchronized because they are too big: </source> + <translation>Ove mape nisu sinkronizirane jer su prevelike:</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> + <source>There are folders that were not synchronized because they are external storages: </source> + <translation>Ove mape nisu sinkronizirane jer su vanjski prostori za pohranu: </translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> + <source>There are folders that were not synchronized because they are too big or external storages: </source> + <translation>Ove mape nisu sinkronizirane jer su prevelike ili su vanjski prostori za pohranu: </translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> + <source>Confirm Account Removal</source> + <translation>Potvrdi brisanje računa</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> + <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>Želite li zaista ukloniti vezu s računom <i>%1</i>?</p><p><b>Napomena:</b> time <b>nećete</b> izbrisati datoteke.</p></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> + <source>Remove connection</source> + <translation>Ukloni vezu</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> + <source>Open folder</source> + <translation>Otvori mapu</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> + <source>Log out</source> + <translation>Odjava</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="672"/> + <source>Resume sync</source> + <translation>Nastavi sinkronizaciju</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="672"/> + <source>Pause sync</source> + <translation>Pauziraj sinkronizaciju</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="801"/> + <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>Želite li zaista prekinuti sinkronizaciju mape <i>%1</i>?</p><p><b>Napomena:</b> time <b>nećete</b> izbrisati datoteke.</p></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="966"/> + <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> + <translation>%1 (%3%) od %2 u upotrebi. Neke mape, uključujući mrežne ili dijeljene mape, mogu imati različita ograničenja.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="967"/> + <source>%1 of %2 in use</source> + <translation>%1 od %2 u upotrebi</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="976"/> + <source>Currently there is no storage usage information available.</source> + <translation>Trenutno nema dostupnih podataka o uporabi pohrane.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> + <source>No %1 connection configured.</source> + <translation>Nije konfigurirana veza %1.</translation> + </message> +</context> +<context> + <name>OCC::AccountState</name> + <message> + <location filename="../src/gui/accountstate.cpp" line="120"/> + <source>Signed out</source> + <translation>Odjavljen</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="122"/> + <source>Disconnected</source> + <translation>Odspojen</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="124"/> + <source>Connected</source> + <translation>Povezan</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="126"/> + <source>Service unavailable</source> + <translation>Usluga nedostupna</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="128"/> + <source>Maintenance mode</source> + <translation>Način održavanja</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="130"/> + <source>Network error</source> + <translation>Pogreška mreže</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="132"/> + <source>Configuration error</source> + <translation>Pogreška konfiguracije</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="134"/> + <source>Asking Credentials</source> + <translation>Traženje vjerodajnica</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="136"/> + <source>Unknown account state</source> + <translation>Nepoznato stanje računa</translation> + </message> +</context> +<context> + <name>OCC::ActivityItemDelegate</name> + <message> + <location filename="../src/gui/activityitemdelegate.cpp" line="131"/> + <source>%1</source> + <translation>%1</translation> + </message> + <message> + <location filename="../src/gui/activityitemdelegate.cpp" line="179"/> + <source>More information</source> + <translation>Više informacija</translation> + </message> + <message> + <location filename="../src/gui/activityitemdelegate.cpp" line="180"/> + <source>Accept</source> + <translation>Prihvati</translation> + </message> + <message> + <location filename="../src/gui/activityitemdelegate.cpp" line="181"/> + <source>Join</source> + <translation>Pridruži se</translation> + </message> + <message> + <location filename="../src/gui/activityitemdelegate.cpp" line="198"/> + <source>Open Browser</source> + <translation>Otvori preglednik</translation> + </message> +</context> +<context> + <name>OCC::ActivityWidget</name> + <message> + <location filename="../src/gui/activitywidget.cpp" line="56"/> + <source>Accept</source> + <translation>Prihvati</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="188"/> + <source>Synced</source> + <translation>Sinkronizirano</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="223"/> + <source>Retry all uploads</source> + <translation>Ponovno pokreni sve otpreme</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="338"/> + <source><br/>Account %1 does not have activities enabled.</source> + <translation><br/>Račun %1 nema omogućenih aktivnosti.</translation> + </message> +</context> +<context> + <name>OCC::AddCertificateDialog</name> + <message> + <location filename="../src/gui/addcertificatedialog.ui" line="17"/> + <source>SSL client certificate authentication</source> + <translation>Autentifikacija SSL vjerodajnice klijenta</translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.ui" line="23"/> + <source>This server probably requires a SSL client certificate.</source> + <translation>Ovaj poslužitelj vjerojatno zahtijeva SSL vjerodajnicu klijenta.</translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.ui" line="35"/> + <source>Certificate & Key (pkcs12) :</source> + <translation>Vjerodajnica i ključ (pkcs12):</translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.ui" line="51"/> + <source>Browse...</source> + <translation>Pretraži...</translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.ui" line="60"/> + <source>Certificate password :</source> + <translation>Zaporka vjerodajnice:</translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.cpp" line="38"/> + <source>Select a certificate</source> + <translation>Odaberi vjerodajnicu</translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.cpp" line="38"/> + <source>Certificate files (*.p12 *.pfx)</source> + <translation>Datoteke vjerodajnica (*.p12 *.pfx)</translation> + </message> +</context> +<context> + <name>OCC::Application</name> + <message> + <location filename="../src/gui/application.cpp" line="192"/> + <source>Error accessing the configuration file</source> + <translation>Pogreška pri pristupanju konfiguracijskoj datoteci</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="193"/> + <source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source> + <translation>Došlo je do pogreške prilikom pristupanja konfiguracijskoj datoteci na %1. Provjerite može li korisnik pristupiti datoteci.</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="196"/> + <source>Quit %1</source> + <translation>Zatvori %1</translation> + </message> +</context> +<context> + <name>OCC::AuthenticationDialog</name> + <message> + <location filename="../src/gui/authenticationdialog.cpp" line="30"/> + <source>Authentication Required</source> + <translation>Potrebna autentifikacija</translation> + </message> + <message> + <location filename="../src/gui/authenticationdialog.cpp" line="32"/> + <source>Enter username and password for '%1' at %2.</source> + <translation>Unesite korisničko ime i zaporku za ‘%1’ na %2.</translation> + </message> + <message> + <location filename="../src/gui/authenticationdialog.cpp" line="37"/> + <source>&User:</source> + <translation>&Korisnik:</translation> + </message> + <message> + <location filename="../src/gui/authenticationdialog.cpp" line="38"/> + <source>&Password:</source> + <translation>&Zaporka:</translation> + </message> +</context> +<context> + <name>OCC::CleanupPollsJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> + <source>Error writing metadata to the database</source> + <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> + </message> +</context> +<context> + <name>OCC::ClientSideEncryption</name> + <message> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> + <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> + <translation>Unesite zaporku za cjelovito šifriranje: <br><br>Korisnik: %2<br>Račun: %3<br></translation> + </message> + <message> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> + <source>Enter E2E passphrase</source> + <translation>Unesite zaporku za E2E</translation> + </message> +</context> +<context> + <name>OCC::ConnectionValidator</name> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="47"/> + <source>No ownCloud account configured</source> + <translation>Nije konfiguriran račun za ownCloud</translation> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <source>The configured server for this client is too old</source> + <translation>Konfigurirani poslužitelj za ovog klijenta je prestar</translation> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="283"/> + <source>Please update to the latest server and restart the client.</source> + <translation>Ažurirajte na najnoviji poslužitelj i ponovno pokrenite klijenta.</translation> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation>Pogrešna autentifikacija: pogrešno korisničko ime ili zaporka.</translation> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="156"/> + <source>timeout</source> + <translation>istek vremena</translation> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> + <source>The provided credentials are not correct</source> + <translation>Navedene vjerodajnice nisu točne</translation> + </message> +</context> +<context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="631"/> + <source>Aborted by the user</source> + <translation>Prekinuo korisnik</translation> + </message> +</context> +<context> + <name>OCC::DiscoverySingleDirectoryJob</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="392"/> + <source>The server file discovery reply is missing data.</source> + <translation>Nedostaju podaci u odgovoru datoteke poslužitelja.</translation> + </message> +</context> +<context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Poslužitelj je vratio pogrešku: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Došlo je do pogreške prilikom pristupanja krajnjoj točki ‘token’: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Nije moguće parsirati JSON koji je vratio poslužitelj: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Odgovor poslužitelja ne sadrži sva očekivana polja</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Poveži s %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Prijavi se u svoj preglednik (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>Nije moguće otvoriti preglednik, kopirajte poveznicu u svoj preglednik.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>Nije moguće otvoriti preglednik, kopirajte poveznicu u svoj preglednik.</translation> + </message> +</context> +<context> + <name>OCC::Folder</name> + <message> + <location filename="../src/gui/folder.cpp" line="141"/> + <source>Local folder %1 does not exist.</source> + <translation>Lokalna mapa %1 ne postoji.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="144"/> + <source>%1 should be a folder but is not.</source> + <translation>%1 bi trebao biti mapa, ali nije.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="147"/> + <source>%1 is not readable.</source> + <translation>%1 nije čitljiva.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="375"/> + <source>%1 has been removed.</source> + <comment>%1 names a file.</comment> + <translation>%1 je uklonjena.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="382"/> + <source>%1 has been downloaded.</source> + <comment>%1 names a file.</comment> + <translation>%1 je preuzeta.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="389"/> + <source>%1 has been updated.</source> + <comment>%1 names a file.</comment> + <translation>%1 je ažurirana.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="396"/> + <source>%1 has been renamed to %2.</source> + <comment>%1 and %2 name files.</comment> + <translation>%1 je preimenovana u %2.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="403"/> + <source>%1 has been moved to %2.</source> + <translation>%1 je premještena u %2.</translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="373"/> + <source>%1 and %n other file(s) have been removed.</source> + <translation><numerusform>%1 i %n drugih datoteka su uklonjene.</numerusform><numerusform>%1 i %n drugih datoteka su uklonjene.</numerusform><numerusform>%1 i %n drugih datoteka su uklonjene.</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="380"/> + <source>%1 and %n other file(s) have been downloaded.</source> + <translation><numerusform>%1 i %n drugih datoteka su preuzete.</numerusform><numerusform>%1 i %n drugih datoteka su preuzete.</numerusform><numerusform>%1 i %n drugih datoteka su preuzete.</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="387"/> + <source>%1 and %n other file(s) have been updated.</source> + <translation><numerusform>%1 i %n drugih datoteka su ažurirane.</numerusform><numerusform>%1 i %n drugih datoteka su ažurirane.</numerusform><numerusform>%1 i %n drugih datoteka su ažurirane.</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="394"/> + <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> + <translation><numerusform>%1 je preimenovana u %2 i %n drugih datoteka je preimenovano.</numerusform><numerusform>%1 je preimenovana u %2 i %n drugih datoteka je preimenovano.</numerusform><numerusform>%1 je preimenovana u %2 i %n drugih datoteka je preimenovano.</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="401"/> + <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> + <translation><numerusform>%1 je premještena u %2 i %n drugih datoteka je premješteno.</numerusform><numerusform>%1 je premještena u %2 i %n drugih datoteka je premješteno.</numerusform><numerusform>%1 je premještena u %2 i %n drugih datoteka je premješteno.</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="408"/> + <source>%1 has and %n other file(s) have sync conflicts.</source> + <translation><numerusform>Postoji nepodudaranje u sinkronizaciji za %1 i %n drugih datoteka.</numerusform><numerusform>Postoji nepodudaranje u sinkronizaciji za %1 i %n drugih datoteka.</numerusform><numerusform>Postoji nepodudaranje u sinkronizaciji za %1 i %n drugih datoteka.</numerusform></translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="410"/> + <source>%1 has a sync conflict. Please check the conflict file!</source> + <translation>Postoji nepodudaranje u sinkronizaciji za %1. Provjerite datoteku nepodudaranja!</translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="415"/> + <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> + <translation><numerusform>%1 i %n drugih datoteka nije moguće sinkronizirati zbog pogrešaka. Pojedinosti potražite u zapisu pogreške.</numerusform><numerusform>%1 i %n drugih datoteka nije moguće sinkronizirati zbog pogrešaka. Pojedinosti potražite u zapisu pogreške.</numerusform><numerusform>%1 i %n drugih datoteka nije moguće sinkronizirati zbog pogrešaka. Pojedinosti potražite u zapisu pogreške.</numerusform></translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="417"/> + <source>%1 could not be synced due to an error. See the log for details.</source> + <translation>%1 nije moguće sinkronizirati zbog pogreške. Pojedinosti potražite u zapisu pogreške.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="425"/> + <source>Sync Activity</source> + <translation>Aktivnost sinkronizacije</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="636"/> + <source>Could not read system exclude file</source> + <translation>Nije moguće pročitati datoteku izuzetka iz sustava</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="957"/> + <source>A new folder larger than %1 MB has been added: %2. +</source> + <translation>Dodana je nova mapa veća od %1 MB: %2. +</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="960"/> + <source>A folder from an external storage has been added. +</source> + <translation>Dodana je mapa iz vanjskog prostora za pohranu. +</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="961"/> + <source>Please go in the settings to select it if you wish to download it.</source> + <translation>Idite u postavke kako biste je odabrali ako je želite preuzeti.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1016"/> + <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> + <translation>Mapa %1 je stvorena, ali je prethodno isključena iz sinkronizacije. Podaci unutar nje neće se sinkronizirati.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1019"/> + <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> + <translation>Datoteka %1 je stvorena, ali je prethodno isključena iz sinkronizacije. Neće se sinkronizirati.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1030"/> + <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). + +%1</source> + <translation>Promjene u sinkroniziranim mapama nije moguće pouzdano pratiti. + +To znači da klijent za sinkronizaciju možda neće odmah otpremiti lokalne promjene i umjesto toga će skenirati u potrazi za lokalnim promjenama i povremeno ih otpremati (svaka dva sata prema zadanim postavkama). + +%1</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1075"/> + <source>All files in the sync folder '%1' folder 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 keep 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>Sve datoteke u mapi za sinkronizaciju '%1' izbrisane su sa poslužitelja. +Ta će se brisanja sinkronizirati s lokalnom mapom za sinkronizaciju, što znači da će takve datoteke biti nedostupne ako nemate ovlasti za vraćanje. +Ako odlučite zadržati datoteke, ponovno će se sinkronizirati s poslužiteljem ako imate potrebne ovlasti. +Ako odlučite izbrisati datoteke, one će vam biti nedostupne ako niste njihov vlasnik.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1084"/> + <source>Download new files?</source> + <translation>Preuzmi nove datoteke?</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1087"/> + <source>Download new files</source> + <translation>Preuzmi nove datoteke</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1088"/> + <source>Keep local files</source> + <translation>Zadrži lokalne datoteke</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1080"/> + <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. +Are you sure you want to sync those actions with the server? +If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> + <translation>Sve datoteke u vašoj lokalnoj mapi za sinkronizaciju '%1' su izbrisane. Ova će se brisanja sinkronizirati s vašim poslužiteljem, što znači da će te datoteke biti nedostupne ako ih ne vratite. +Jeste li sigurni da želite sinkronizirati te radnje s poslužiteljem? +Ako ste slučajno odabrali ovu radnju i želite zadržati svoje datoteke, ponovno će se sinkronizirati s poslužitelja.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1105"/> + <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> + <translation>Ova sinkronizacija vratit će ranije inačice datoteka u mapu za sinkronizaciju '%1'. +To može biti zbog vraćanja sigurnosne kopije na poslužitelj. +Nastavljanje sinkronizacije uzrokovat će zamjenu svih vaših datoteka starijim inačicama istih datoteka. Želite li zadržati najnovije lokalne datoteke kao datoteke nepodudaranja?</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1110"/> + <source>Backup detected</source> + <translation>Otkrivena je sigurnosna kopija</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1113"/> + <source>Normal Synchronisation</source> + <translation>Normalna sinkronizacija</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1114"/> + <source>Keep Local Files as Conflict</source> + <translation>Zadrži lokalne datoteke kao datoteke nepodudaranja</translation> + </message> +</context> +<context> + <name>OCC::FolderMan</name> + <message> + <location filename="../src/gui/folderman.cpp" line="274"/> + <source>Could not reset folder state</source> + <translation>Stanje mape nije moguće vratiti</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="275"/> + <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> + <translation>Pronađen je stari sinkronizacijski dnevnik ‘%1’ ali ga nije moguće ukloniti. Provjerite koristi li ga trenutno neka druga aplikacija.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1023"/> + <source> (backup)</source> + <translation> (sigurnosna kopija)</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1028"/> + <source> (backup %1)</source> + <translation> (sigurnosna kopija %1)</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1206"/> + <source>Undefined State.</source> + <translation>Nedefinirano stanje.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1209"/> + <source>Waiting to start syncing.</source> + <translation>Čeka se početak sinkronizacije.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1212"/> + <source>Preparing for sync.</source> + <translation>Priprema za sinkronizaciju.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1215"/> + <source>Sync is running.</source> + <translation>Sinkronizacija je pokrenuta.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1220"/> + <source>Sync was successful, unresolved conflicts.</source> + <translation>Sinkronizacija je bila uspješna, postoje neriješena nepodudaranja.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1222"/> + <source>Last Sync was successful.</source> + <translation>Zadnja sinkronizacija bila je uspješna.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1228"/> + <source>Setup Error.</source> + <translation>Pogreška pri postavljanju.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1231"/> + <source>User Abort.</source> + <translation>Prekinuo korisnik.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1234"/> + <source>Sync is paused.</source> + <translation>Sinkronizacija je pauzirana.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1240"/> + <source>%1 (Sync is paused)</source> + <translation>%1 (Sinkronizacija je pauzirana)</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1248"/> + <source>No valid folder selected!</source> + <translation>Nije odabrana nijedna valjana mapa!</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1258"/> + <source>The selected path is not a folder!</source> + <translation>Odabran put nije mapa!</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1262"/> + <source>You have no permission to write to the selected folder!</source> + <translation>Nemate dopuštenje za pisanje u odabranu mapu!</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1318"/> + <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> + <translation>Već postoji sinkronizacija između poslužitelja i te lokalne mape. Odaberite drugu lokalnu mapu!</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1298"/> + <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> + <translation>Lokalna mapa %1 već sadrži mapu koja se upotrebljava u poveznici za sinkronizaciju mape. Odaberite drugu mapu!</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1304"/> + <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> + <translation>Lokalna mapa %1 već je sadržana u mapi koja se upotrebljava u poveznici za sinkronizaciju mape. Odaberite drugu mapu!</translation> + </message> +</context> +<context> + <name>OCC::FolderStatusDelegate</name> + <message> + <location filename="../src/gui/folderstatusdelegate.cpp" line="48"/> + <source>Add Folder Sync Connection</source> + <translation>Dodaj poveznicu za sinkronizaciju mape</translation> + </message> + <message> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> + <source>File</source> + <translation>Datoteka</translation> + </message> +</context> +<context> + <name>OCC::FolderStatusModel</name> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> + <source>You need to be connected to add a folder</source> + <translation>Morate biti povezani kako biste dodali mapu</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="146"/> + <source>Click this button to add a folder to synchronize.</source> + <translation>Kliknite ovaj gumb kako biste dodali mapu za sinkronizaciju.</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="157"/> + <source>%1 (%2)</source> + <extracomment>Example text: "File.txt (23KB)"</extracomment> + <translation>%1 (%2)</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="186"/> + <source>Error while loading the list of folders from the server.</source> + <translation>Pogreška prilikom učitavanja popisa mapa s poslužitelja.</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> + <source>Signed out</source> + <translation>Odjavljen</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="189"/> + <source>Fetching folder list from server...</source> + <translation>Dohvaćanje popisa mapa s poslužitelja...</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <source>There are unresolved conflicts. Click for details.</source> + <translation>Postoje neriješena nepodudaranja. Kliknite za pojedinosti.</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> + <source>Reconciling changes</source> + <translation>Usklađivanje promjena</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> + <source>, '%1'</source> + <extracomment>Build a list of file names</extracomment> + <translation>, '%1'</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> + <source>'%1'</source> + <extracomment>Argument is a file name</extracomment> + <translation>'%1'</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <source>Syncing %1</source> + <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> + <translation>Sinkronizacija %1</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> + <source>, </source> + <translation>, </translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <source>download %1/s</source> + <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> + <translation>preuzimanje %1/s</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <source>upload %1/s</source> + <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> + <translation>otpremanje %1/s</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> + <source>Checking for changes in remote '%1'</source> + <translation>Provjera za promjene u udaljenom ‘%1’</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> + <source>Checking for changes in local '%1'</source> + <translation>Provjera za promjene u lokalnom ‘%1’</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> + <source>↓ %1/s</source> + <translation>↓ %1/s</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> + <source>↑ %1/s</source> + <translation>↑ %1/s</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> + <source>%1 %2 (%3 of %4)</source> + <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> + <translation>%1 %2 (%3 od %4)</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> + <source>%1 %2</source> + <extracomment>Example text: "uploading foobar.png"</extracomment> + <translation>%1 %2</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> + <source>%5 left, %1 of %2, file %3 of %4</source> + <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> + <translation>%5 preostalo, %1 od %2, datoteka %3 od %4</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> + <source>%1 of %2, file %3 of %4</source> + <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> + <translation>%1 od %2, datoteka %3 od %4</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> + <source>file %1 of %2</source> + <translation>datoteka %1 od %2</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <source>Waiting...</source> + <translation>Čekanje...</translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> + <source>Waiting for %n other folder(s)...</source> + <translation><numerusform>Čeka se %n drugih mapa...</numerusform><numerusform>Čeka se %n drugih mapa...</numerusform><numerusform>Čeka se %n drugih mapa...</numerusform></translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> + <source>Preparing to sync...</source> + <translation>Priprema za sinkronizaciju...</translation> + </message> +</context> +<context> + <name>OCC::FolderWatcherPrivate</name> + <message> + <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> + <translation>Taj se problem obično javlja kada su potrošeni inotify watches. Pojedinosti potražite među najčešće postavljenim pitanjima.</translation> + </message> +</context> +<context> + <name>OCC::FolderWizard</name> + <message> + <location filename="../src/gui/folderwizard.cpp" line="550"/> + <source>Add Folder Sync Connection</source> + <translation>Dodaj poveznicu za sinkronizaciju mape</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="552"/> + <source>Add Sync Connection</source> + <translation>Dodaj poveznicu za sinkronizaciju</translation> + </message> +</context> +<context> + <name>OCC::FolderWizardLocalPath</name> + <message> + <location filename="../src/gui/folderwizard.cpp" line="67"/> + <source>Click to select a local folder to sync.</source> + <translation>Kliknite za odabir lokalne mape za sinkronizaciju.</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="74"/> + <source>Enter the path to the local folder.</source> + <translation>Unesite put do lokalne mape.</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="135"/> + <source>Select the source folder</source> + <translation>Odaberi izvornu mapu</translation> + </message> +</context> +<context> + <name>OCC::FolderWizardRemotePath</name> + <message> + <location filename="../src/gui/folderwizard.cpp" line="183"/> + <source>Create Remote Folder</source> + <translation>Stvori udaljenu mapu</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="184"/> + <source>Enter the name of the new folder to be created below '%1':</source> + <translation>Unesite naziv nove mape koja će se stvoriti ispod '%1':</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="214"/> + <source>Folder was successfully created on %1.</source> + <translation>Mapa je uspješno stvorena na %1.</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="225"/> + <source>Authentication failed accessing %1</source> + <translation>Neuspješna autentifikacija za pristup %1</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="227"/> + <source>Failed to create the folder on %1. Please check manually.</source> + <translation>Neuspješno stvaranje mape na %1. Provjerite ručno.</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="236"/> + <source>Failed to list a folder. Error: %1</source> + <translation>Neuspješno popisivanje mape. Pogreška: %1</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="317"/> + <source>Choose this to sync the entire account</source> + <translation>Odaberite ovu opciju za sinkronizaciju cijelog računa</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="447"/> + <source>This folder is already being synced.</source> + <translation>Ova se mapa već sinkronizira.</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> + <translation>Već sinkronizirate <i>%1</i>, nadređenu mapu od <i>%2</i>.</translation> + </message> +</context> +<context> + <name>OCC::FormatWarningsWizardPage</name> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b> %1</source> + <translation><b>Upozorenje:</b> %1</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Warning:</b></source> + <translation><b>Upozorenje:</ b></translation> + </message> +</context> +<context> + <name>OCC::GETFileJob</name> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="186"/> + <source>No E-Tag received from server, check Proxy/Gateway</source> + <translation>Nijedna E-oznaka nije primljena s poslužitelja, označite proxy/pristupno računalo</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="193"/> + <source>We received a different E-Tag for resuming. Retrying next time.</source> + <translation>Primljena je drugačija E-oznaka za nastavak. Ponovni pokušaj sljedeći put.</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="220"/> + <source>Server returned wrong content-range</source> + <translation>Poslužitelj je vratio pogrešan raspon sadržaja</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="332"/> + <source>Connection Timeout</source> + <translation>Istek veze</translation> + </message> +</context> +<context> + <name>OCC::GeneralSettings</name> + <message> + <location filename="../src/gui/generalsettings.ui" line="41"/> + <source>Legal notice</source> + <translation>Pravna obavijest</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="66"/> + <source>General Settings</source> + <translation>Opće postavke</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="72"/> + <source>For System Tray</source> + <translation>Za ladicu sustava</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="89"/> + <source>Show Server &Notifications</source> + <translation>Prikaži poslužitelj i obavijesti</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="163"/> + <source>Advanced</source> + <translation>Napredno</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="195"/> + <source>Ask for confirmation before synchronizing folders larger than</source> + <translation>Zatraži potvrdu prije sinkronizacije mapa većih od</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="215"/> + <source>MB</source> + <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> + <translation>MB</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="239"/> + <source>Ask for confirmation before synchronizing external storages</source> + <translation>Zatraži potvrdu prije sinkronizacije vanjskih prostora za pohranu</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="82"/> + <source>&Launch on System Startup</source> + <translation>Pokreni pri pokretanju sustava</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="75"/> + <source>Use &Monochrome Icons</source> + <translation>Koristi jednobojne ikone</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="171"/> + <source>Edit &Ignored Files</source> + <translation>Uredi zanemarene datoteke</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="250"/> + <source>Show sync folders in &Explorer's Navigation Pane</source> + <translation>Prikaži mape za sinkronizaciju u navigacijskom oknu preglednika datoteka</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="267"/> + <source>S&how crash reporter</source> + <translation>Prikaži alat za izvješćivanje o padu sustava</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="20"/> + <location filename="../src/gui/generalsettings.ui" line="32"/> + <source>About</source> + <translation>Informacije</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="99"/> + <source>Updates</source> + <translation>Ažuriranja</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="124"/> + <source>&Restart && Update</source> + <translation>Ponovno pokreni i ažuriraj</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="49"/> + <source>Server notifications that require attention.</source> + <translation>Obavijesti poslužitelja koje zahtijevaju pažnju.</translation> + </message> +</context> +<context> + <name>OCC::GetOrCreatePublicLinkShare</name> + <message> + <location filename="../src/gui/socketapi.cpp" line="520"/> + <source>Sharing error</source> + <translation>Pogreška dijeljenja</translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="521"/> + <source>Could not retrieve or create the public link share. Error: + +%1</source> + <translation>Nije moguće dohvatiti ili stvoriti poveznicu za javno dijeljenje. Pogreška: + +%1</translation> + </message> +</context> +<context> + <name>OCC::HttpCredentialsGui</name> + <message> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="100"/> + <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> + <translation>Unesite zaporku %1:<br><br>Korisnik: %2<br>Račun: %3<br></translation> + </message> + <message> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="114"/> + <source>Reading from keychain failed with error: '%1'</source> + <translation>Čitanje s privjeska nije uspjelo, pogreška: '%1'</translation> + </message> + <message> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="120"/> + <source>Enter Password</source> + <translation>Unesi zaporku</translation> + </message> + <message> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="156"/> + <source><a href="%1">Click here</a> to request an app password from the web interface.</source> + <translation><a href="%1">Kliknite ovdje</a> kako biste zatražili zaporku za aplikaciju putem web-sučelja.</translation> + </message> +</context> +<context> + <name>OCC::IgnoreListEditor</name> + <message> + <location filename="../src/gui/ignorelisteditor.ui" line="14"/> + <source>Ignored Files Editor</source> + <translation>Uređivač zanemarenih datoteka</translation> + </message> + <message> + <location filename="../src/gui/ignorelisteditor.ui" line="20"/> + <source>Global Ignore Settings</source> + <translation>Globalne postavke zanemarivanja</translation> + </message> + <message> + <location filename="../src/gui/ignorelisteditor.ui" line="26"/> + <source>Sync hidden files</source> + <translation>Sinkroniziraj skrivene datoteke</translation> + </message> + <message> + <location filename="../src/gui/ignorelisteditor.ui" line="36"/> + <source>Files Ignored by Patterns</source> + <translation>Datoteke koje zanemaruju obrasci</translation> + </message> + <message> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Ovaj unos osigurava sustav na '%1' i ne može se mijenjati u ovom prikazu.</translation> + </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> + <source>Pattern</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> + <source>Allow Deletion</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> + <source>Could not open file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> + <source>Cannot write changes to '%1'.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> + <source>Add Ignore Pattern</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> + <source>Add a new ignore pattern:</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::LegalNotice</name> + <message> + <location filename="../src/gui/legalnotice.ui" line="26"/> + <source>Legal notice</source> + <translation>Pravna obavijest</translation> + </message> + <message> + <location filename="../src/gui/legalnotice.ui" line="58"/> + <source>Close</source> + <translation>Zatvori</translation> + </message> + <message> + <location filename="../src/gui/legalnotice.cpp" line="27"/> + <source><p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></source> + <translation><p>Autorska prava 2017. – 2018. Nextcloud GmbH<br />Autorska prava 2012. – 2018. ownCloud GmbH</p></translation> + </message> + <message> + <location filename="../src/gui/legalnotice.cpp" line="30"/> + <source><p>Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.</p></source> + <translation><p>Licencirano pod Općom javnom licencom za GNU (GPL), verzijom 2.0 ili novijom.</p></translation> + </message> +</context> +<context> + <name>OCC::LogBrowser</name> + <message> + <location filename="../src/gui/logbrowser.cpp" line="58"/> + <source>Log Output</source> + <translation>Izlaz zapisa</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="70"/> + <source>&Search:</source> + <translation>&Traži:</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="78"/> + <source>&Find</source> + <translation>&Pronađi</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="89"/> + <source>&Capture debug messages</source> + <translation>&Snimi poruke za otklanjanje pogrešaka</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="101"/> + <source>Permanently save logs</source> + <translation>Trajno spremi zapise</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="103"/> + <source>When this option is enabled and no other logging is configured, logs will be written to a temporary folder and expire after a few hours. This setting persists across client restarts. + +Logs will be written to %1</source> + <translation>Kada je ova opcija omogućena i nijedna druga evidencija zapisa nije konfigurirana, zapisi će se spremati u privremenu mapu i brisati nakon nekoliko sati. Ova postavka ostaje aktivna nakon ponovnog pokretanja klijenta. + +Zapisi se zapisuju u %1</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="115"/> + <source>Clear</source> + <translation>Izbriši</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="116"/> + <source>Clear the log display.</source> + <translation>Izbriši prikaz zapisa.</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="122"/> + <source>S&ave</source> + <translation>Spremi</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="123"/> + <source>Save the log file to a file on disk for debugging.</source> + <translation>Spremite datoteku zapisa u datoteku na disku radi otklanjanja pogrešaka.</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="212"/> + <source>Save log file</source> + <translation>Spremi datoteku zapisa</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="222"/> + <source>Error</source> + <translation>Pogreška</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="222"/> + <source>Could not write to log file %1</source> + <translation>Nije moguće pisati u datoteku zapisa %1</translation> + </message> +</context> +<context> + <name>OCC::Logger</name> + <message> + <location filename="../src/libsync/logger.cpp" line="162"/> + <source>Error</source> + <translation>Pogreška</translation> + </message> + <message> + <location filename="../src/libsync/logger.cpp" line="163"/> + <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> + <translation><nobr>Datoteka ‘%1’<br/>se ne može otvoriti radi zapisivanja.<br/><br/>Izlaz zapisa <b>ne može</b> se spremiti!</nobr></translation> + </message> +</context> +<context> + <name>OCC::NSISUpdater</name> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="332"/> + <source>New Version Available</source> + <translation>Dostupna je nova inačica</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="338"/> + <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> + <translation><p>Dostupna je nova inačica klijenta %1.</p><p><b>%2</b> je dostupan za preuzimanje. Instalirana je inačica %3.</p></translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="352"/> + <source>Skip this version</source> + <translation>Preskoči ovu inačicu</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="353"/> + <source>Skip this time</source> + <translation>Preskoči ovaj put</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="354"/> + <source>Get update</source> + <translation>Dohvati ažuriranje</translation> + </message> +</context> +<context> + <name>OCC::NetworkSettings</name> + <message> + <location filename="../src/gui/networksettings.ui" line="23"/> + <source>Proxy Settings</source> + <translation>Postavke proxyja</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="29"/> + <source>No Proxy</source> + <translation>Nema proxyja</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="42"/> + <source>Use system proxy</source> + <translation>Koristi proxy sustava</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="52"/> + <source>Specify proxy manually as</source> + <translation>Ručno odredi proxy kao</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="80"/> + <source>Host</source> + <translation>Glavno računalo</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="100"/> + <source>:</source> + <translation>:</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="131"/> + <source>Proxy server requires authentication</source> + <translation>Proxy poslužitelj zahtijeva autentifikaciju</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="190"/> + <source>Download Bandwidth</source> + <translation>Propusnost za preuzimanja</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="196"/> + <location filename="../src/gui/networksettings.ui" line="275"/> + <source>Limit to</source> + <translation>Ograniči na</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="241"/> + <location filename="../src/gui/networksettings.ui" line="320"/> + <source>KBytes/s</source> + <translation>KB/s</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="203"/> + <location filename="../src/gui/networksettings.ui" line="292"/> + <source>No limit</source> + <translation>Nema ograničenja</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="250"/> + <location filename="../src/gui/networksettings.ui" line="282"/> + <source>Limit to 3/4 of estimated bandwidth</source> + <translation>Ograniči na 3/4 procijenjene propusnosti</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="269"/> + <source>Upload Bandwidth</source> + <translation>Propusnost za otpremanja</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="253"/> + <location filename="../src/gui/networksettings.ui" line="285"/> + <source>Limit automatically</source> + <translation>Ograni automatski</translation> + </message> + <message> + <location filename="../src/gui/networksettings.cpp" line="37"/> + <source>Hostname of proxy server</source> + <translation>Naziv računala proxy poslužitelja</translation> + </message> + <message> + <location filename="../src/gui/networksettings.cpp" line="38"/> + <source>Username for proxy server</source> + <translation>Korisničko ime za proxy poslužitelj</translation> + </message> + <message> + <location filename="../src/gui/networksettings.cpp" line="39"/> + <source>Password for proxy server</source> + <translation>Zaporka za proxy poslužitelj</translation> + </message> + <message> + <location filename="../src/gui/networksettings.cpp" line="41"/> + <source>HTTP(S) proxy</source> + <translation>HTTP(S) proxy</translation> + </message> + <message> + <location filename="../src/gui/networksettings.cpp" line="42"/> + <source>SOCKS5 proxy</source> + <translation>SOCKS5 proxy</translation> + </message> +</context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="112"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Poslužitelj je vratio pogrešku: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Došlo je do pogreške prilikom pristupanja krajnjoj točki ‘token’: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Nije moguće parsirati JSON koji je vratio poslužitelj: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="121"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Odgovor poslužitelja ne sadrži sva očekivana polja</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="125"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Pogreška pri prijavi</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="131"/> + <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> + <translation><h1>Pogrešan korisnik</h1><p>Prijavili ste se kao korisnik <em>%1</em>, ali morate se prijaviti kao korisnik <em>%2</em>.<br>Odjavite se iz %3 u drugoj kartici, a zatim <a href=’%4’>kliknite ovdje</a> i prijavite se kao korisnik %2</p></translation> + </message> +</context> +<context> + <name>OCC::OCUpdater</name> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="103"/> + <source>New %1 Update Ready</source> + <translation>Novo %1 ažuriranje je spremno</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="104"/> + <source>A new update for %1 is about to be installed. The updater may ask +for additional privileges during the process.</source> + <translation>Sada će se instalirati novo ažuriranje za %1. Alat za ažuriranje može tražiti +dodatne ovlasti tijekom postupka.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="143"/> + <source>Downloading version %1. Please wait...</source> + <translation>Preuzimanje inačice %1. Pričekajte...</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="147"/> + <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> + <translation>Nije moguće preuzeti ažuriranje. Kliknite <a href='%1'>ovdje</a> kako biste ručno preuzeli ažuriranje.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="149"/> + <source>Could not check for new updates.</source> + <translation>Nije moguće provjeriti ima li novih ažuriranja.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="145"/> + <source>%1 version %2 available. Restart application to start the update.</source> + <translation>%1 inačica %2 je dostupna. Ponovno pokrenite aplikaciju kako biste pokrenuli ažuriranje.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="151"/> + <source>New %1 version %2 available. Please use the system's update tool to install it.</source> + <translation>Dostupna je %1 inačica %2. Instalirajte je s pomoću alata za ažuriranje sustava.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="153"/> + <source>Checking update server...</source> + <translation>Provjera poslužitelja za ažuriranje...</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="155"/> + <source>Update status is unknown: Did not check for new updates.</source> + <translation>Status ažuriranja je nepoznat: provjera ažuriranja nije izvršena.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="159"/> + <source>No updates available. Your installation is at the latest version.</source> + <translation>Nema dostupnih ažuriranja. Instalirana je najnovija inačica.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="178"/> + <source>Update Check</source> + <translation>Provjera ažuriranja</translation> + </message> +</context> +<context> + <name>OCC::OwncloudAdvancedSetupPage</name> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="49"/> + <source>Connect to %1</source> + <translation>Poveži s %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/> + <source>Setup local folder options</source> + <translation>Mogućnosti postavljanja lokalne mape</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="59"/> + <source>Connect...</source> + <translation>Povezivanje...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="157"/> + <source>%1 folder '%2' is synced to local folder '%3'</source> + <translation>%1 mapa '%2' sinkronizirana je s lokalnom mapom '%3'</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="160"/> + <source>Sync the folder '%1'</source> + <translation>Sinkroniziraj mapu '%1'</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="165"/> + <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> + <translation><p><small><strong>Upozorenje:</strong> lokalna mapa nije prazna. Odaberite razlučivost!</small></p></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/> + <source>Free space: %1</source> + <translation>Slobodan prostor: %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> + <source>Local Sync Folder</source> + <translation>Mapa za lokalnu sinkronizaciju</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="340"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="370"/> + <source>(%1)</source> + <translation>(%1)</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> + <source>There isn't enough free space in the local folder!</source> + <translation>Nema dovoljno slobodnog prostora u lokalnoj mapi!</translation> + </message> +</context> +<context> + <name>OCC::OwncloudConnectionMethodDialog</name> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> + <source>Connection failed</source> + <translation>Veza nije uspjela</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="43"/> + <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> + <translation><html><head/><body><p>Povezivanje s navedenom adresom sigurnog poslužitelja nije uspjelo. Kako želite nastaviti?</p></body></html></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> + <source>Select a different URL</source> + <translation>Odaberi drugi URL</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="62"/> + <source>Retry unencrypted over HTTP (insecure)</source> + <translation>Pokušaj ponovo nešifrirano putem HTTP-a (nesigurno)</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="69"/> + <source>Configure client-side TLS certificate</source> + <translation>Konfiguriraj TLS vjerodajnicu na strani klijenta</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> + <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> + <translation><html><head/><body><p>Povezivanje s adresom sigurnog poslužitelja <em>%1</em> nije uspjelo. Kako želite nastaviti?</p></body></html></translation> + </message> +</context> +<context> + <name>OCC::OwncloudHttpCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> + <source>&Email</source> + <translation>&E-pošta</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="59"/> + <source>Connect to %1</source> + <translation>Poveži s %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/> + <source>Enter user credentials</source> + <translation>Unesi korisničke vjerodajnice</translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Poveži s %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Prijavi se u svoj preglednik</translation> + </message> +</context> +<context> + <name>OCC::OwncloudSetupPage</name> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> + <source>Connect to %1</source> + <translation>Poveži s %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="55"/> + <source>Setup %1 server</source> + <translation>Postavi poslužitelj %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="83"/> + <source>Keep your data secure and under your control</source> + <translation>Čuvajte svoje podatke sigurnim i pod kontrolom</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/> + <source>Secure collaboration & file exchange</source> + <translation>Sigurna suradnja i razmjena datoteka</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/> + <source>Easy-to-use web mail, calendaring & contacts</source> + <translation>Jednostavna web-pošta, upravljanje kalendarom i kontaktima</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/> + <source>Screensharing, online meetings & web conferences</source> + <translation>Dijeljenje zaslona, sastanci na mreži i web konferencije</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="180"/> + <source>This url is NOT secure as it is not encrypted. +It is not advisable to use it.</source> + <translation>Ovaj URL NIJE siguran jer nije šifriran. +Nije preporučljivo koristiti ga.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="184"/> + <source>This url is secure. You can use it.</source> + <translation>Ovaj je URL siguran. Možete ga koristiti.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="223"/> + <source>&Next ></source> + <translation>&Sljedeće ></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> + <source>Invalid URL</source> + <translation>Neispravan URL</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> + <source>Could not load certificate. Maybe wrong password?</source> + <translation>Nije moguće učitati vjerodajnicu. Možda je pogrešna zaporka?</translation> + </message> +</context> +<context> + <name>OCC::OwncloudSetupWizard</name> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> + <translation><font color="green">Uspješno povezivanje s %1: %2 inačicom %3 (%4)</font><br/><br/></translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/> + <source>Failed to connect to %1 at %2:<br/>%3</source> + <translation>Neuspješno povezivanje s %1 na %2:<br/>%3</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="315"/> + <source>Timeout while trying to connect to %1 at %2.</source> + <translation>Istek vremena tijekom povezivanja s %1 na %2.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="334"/> + <source>Trying to connect to %1 at %2...</source> + <translation>Pokušaj povezivanja s %1 na %2...</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="385"/> + <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> + <translation>Autorizirani zahtjev poslužitelju preusmjeren je na '%1'. URL je neispravan, poslužitelj je pogrešno konfiguriran.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation>Došlo je do nevažećeg odgovora na autorizirani zahtjev za webdav</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> + <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> + <translation>Poslužitelj je zabranio pristup. Kako biste provjerili imate li ispravan pristup, <a href="%1">kliknite ovdje</a> kako biste pristupili servisu putem preglednika.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="278"/> + <source>Invalid URL</source> + <translation>Neispravan URL</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> + <source>The server reported the following error:</source> + <translation>Poslužitelj je prijavio sljedeću pogrešku:</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/> + <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> + <translation>Mapa za lokalnu sinkronizaciju %1 već postoji, postavljanje za sinkronizaciju.<br/><br/></translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/> + <source>Creating local sync folder %1...</source> + <translation>Stvaranje mape za lokalnu sinkronizaciju %1...</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="459"/> + <source>ok</source> + <translation>uspješno</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <source>failed.</source> + <translation>neuspješno.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="463"/> + <source>Could not create local folder %1</source> + <translation>Nije moguće stvoriti lokalnu mapu %1</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> + <source>No remote folder specified!</source> + <translation>Nije navedena nijedna udaljena mapa!</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> + <source>Error: %1</source> + <translation>Pogreška: %1</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <source>creating folder on Nextcloud: %1</source> + <translation>stvaranje mape na Nextcloudu: %1</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <source>Remote folder %1 created successfully.</source> + <translation>Uspješno je stvorena udaljena mapa %1.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> + <source>The remote folder %1 already exists. Connecting it for syncing.</source> + <translation>Udaljena mapa %1 već postoji. Povezivanje radi sinkronizacije.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <source>The folder creation resulted in HTTP error code %1</source> + <translation>Stvaranje mape rezultiralo je HTTP šifrom pogreške %1</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> + <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> + <translation>Stvaranje udaljene mape nije uspjelo jer su navedene vjerodajnice pogrešne!<br/>Vratite se i provjerite svoje vjerodajnice.</p></translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> + <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“>Stvaranje udaljene mape nije uspjelo vjerojatno zbog pogrešnih unesenih vjerodajnica.</font><br/>Vratite se i provjerite vjerodajnice.</p></translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> + <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> + <translation>Stvaranje udaljene mape %1 nije uspjelo, pogreška: <tt>%2</tt>.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> + <source>A sync connection from %1 to remote directory %2 was set up.</source> + <translation>Postavljena je sinkronizacijska veza od %1 do udaljenog direktorija %2.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> + <source>Successfully connected to %1!</source> + <translation>Uspješno povezivanje s %1!</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> + <source>Connection to %1 could not be established. Please check again.</source> + <translation>Veza s %1 nije uspostavljena. Provjerite opet.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> + <source>Folder rename failed</source> + <translation>Preimenovanje mape nije uspjelo</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> + <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>Nije moguće ukloniti i izraditi sigurnosnu kopiju mape jer je mapa ili datoteka u njoj otvorena u drugom programu. Zatvorite mapu ili datoteku i pritisnite Pokušaj ponovo ili otkažite postavljanje.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> + <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> + <translation><font color=“green“><b>Mapa za lokalnu sinkronizaciju %1 uspješno je stvorena!</b></font></translation> + </message> +</context> +<context> + <name>OCC::OwncloudWizard</name> + <message> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> + <source>%1 Connection Wizard</source> + <translation>%1 Čarobnjak za povezivanje</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> + <source>Skip folders configuration</source> + <translation>Preskoči konfiguraciju mapa</translation> + </message> +</context> +<context> + <name>OCC::OwncloudWizardResultPage</name> + <message> + <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="36"/> + <source>Everything set up!</source> + <translation>Sve je postavljeno!</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="40"/> + <source>Open Local Folder</source> + <translation>Otvori lokalnu mapu</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="48"/> + <source>Open %1 in Browser</source> + <translation>Otvori %1 u pregledniku</translation> + </message> +</context> +<context> + <name>OCC::PollJob</name> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="140"/> + <source>Invalid JSON reply from the poll URL</source> + <translation>Neispravan JSON odgovor iz URL-a ankete</translation> + </message> +</context> +<context> + <name>OCC::PropagateDirectory</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> + <source>Error writing metadata to the database</source> + <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> + </message> +</context> +<context> + <name>OCC::PropagateDownloadFile</name> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <source>File %1 can not be downloaded because encryption information is missing.</source> + <translation>Datoteka %1 ne može se preuzeti jer nedostaju informacije o šifriranju.</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="434"/> + <source>File %1 can not be downloaded because of a local file name clash!</source> + <translation>Datoteka %1 ne može se preuzeti zbog nepodudaranja naziva lokalne datoteke!</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="484"/> + <source>The download would reduce free local disk space below the limit</source> + <translation>Preuzimanje bi smanjilo slobodni prostor na lokalnom disku ispod granice</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="488"/> + <source>Free space on disk is less than %1</source> + <translation>Slobodan prostor na disku manji je od %1</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> + <source>File was deleted from server</source> + <translation>Datoteka je izbrisana s poslužitelja</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> + <source>The file could not be downloaded completely.</source> + <translation>Datoteku nije moguće u potpunosti preuzeti.</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> + <source>The downloaded file is empty despite that the server announced it should have been %1.</source> + <translation>Preuzeta datoteka je prazna, unatoč tome što je poslužitelj javio da treba iznositi %1.</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> + <source>File %1 cannot be saved because of a local file name clash!</source> + <translation>Datoteka %1 ne može se spremiti zbog nepodudaranja naziva lokalne datoteke!</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> + <source>File has changed since discovery</source> + <translation>Datoteka se promijenila od njenog otkrića</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> + <source>Error writing metadata to the database</source> + <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> + </message> +</context> +<context> + <name>OCC::PropagateItemJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="234"/> + <source>; Restoration Failed: %1</source> + <translation>; Vraćanje nije uspjelo: %1</translation> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> + <source>A file or folder was removed from a read only share, but restoring failed: %1</source> + <translation>Datoteka ili mapa uklonjena je iz dijeljenja koje je samo za čitanje, ali vraćanje nije uspjelo: %1</translation> + </message> +</context> +<context> + <name>OCC::PropagateLocalMkdir</name> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="170"/> + <source>could not delete file %1, error: %2</source> + <translation>nije moguće izbrisati datoteku %1, pogreška: %2</translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="185"/> + <source>Attention, possible case sensitivity clash with %1</source> + <translation>Pažnja, moguće nepodudaranje velikih i malih slova s %1</translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="191"/> + <source>could not create folder %1</source> + <translation>nije moguće stvoriti mapu %1</translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="203"/> + <source>Error writing metadata to the database</source> + <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> + </message> +</context> +<context> + <name>OCC::PropagateLocalRemove</name> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="77"/> + <source>Error removing '%1': %2;</source> + <translation>Pogreška pri uklanjanju ‘%1’: %2;</translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="102"/> + <source>Could not remove folder '%1'</source> + <translation>Nije moguće ukloniti mapu '%1'</translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="123"/> + <source>Could not remove %1 because of a local file name clash</source> + <translation>Nije moguće ukloniti %1 zbog nepodudaranja naziva lokalne datoteke</translation> + </message> +</context> +<context> + <name>OCC::PropagateLocalRename</name> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="241"/> + <source>File %1 can not be renamed to %2 because of a local file name clash</source> + <translation>Datoteka %1 ne može se preimenovati u %2 zbog nepodudaranja naziva lokalne datoteke</translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="277"/> + <source>Error writing metadata to the database</source> + <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> + </message> +</context> +<context> + <name>OCC::PropagateRemoteDelete</name> + <message> + <location filename="../src/libsync/propagateremotedelete.cpp" line="130"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation>Poslužitelj je vratio pogrešnu HTTP šifru. Očekivana je 204, ali je primljena „%1 %2”.</translation> + </message> +</context> +<context> + <name>OCC::PropagateRemoteMkdir</name> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="99"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation>Poslužitelj je vratio pogrešnu HTTP šifru. Očekivana je 201, ali je primljena „%1 %2”.</translation> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/> + <source>Error writing metadata to the database</source> + <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> + </message> +</context> +<context> + <name>OCC::PropagateRemoteMove</name> + <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="134"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation>Poslužitelj je vratio pogrešnu HTTP šifru. Očekivana je 201, ali je primljena „%1 %2”.</translation> + </message> + <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="166"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="172"/> + <source>Error writing metadata to the database</source> + <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> + </message> +</context> +<context> + <name>OCC::PropagateUploadFileCommon</name> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="214"/> + <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> + <translation>Datoteka %1 ne može se otpremiti jer postoji druga datoteka s istim nazivom koja se razlikuje samo po velikom/malom slovu</translation> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="348"/> + <source>Local file changed during syncing. It will be resumed.</source> + <translation>Lokalna datoteka je izmijenjena tijekom sinkronizacije. Sinkroniziranje će se nastaviti.</translation> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="362"/> + <source>Local file changed during sync.</source> + <translation>Lokalna datoteka je izmijenjena tijekom sinkronizacije.</translation> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> + <location filename="../src/libsync/propagateupload.cpp" line="602"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>Otpremanje %1 premašuje kvotu za mapu</translation> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="334"/> + <source>File Removed (start upload) %1</source> + <translation>Datoteka je uklonjena (početak otpremanja) %1</translation> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="684"/> + <source>Error writing metadata to the database</source> + <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> + </message> +</context> +<context> + <name>OCC::PropagateUploadFileNG</name> + <message> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> + <source>The local file was removed during sync.</source> + <translation>Lokalna datoteka je uklonjena tijekom sinkronizacije.</translation> + </message> + <message> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> + <source>Local file changed during sync.</source> + <translation>Lokalna datoteka je izmijenjena tijekom sinkronizacije.</translation> + </message> + <message> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> + <source>Unexpected return code from server (%1)</source> + <translation>Neočekivana povratna šifra s poslužitelja (%1)</translation> + </message> + <message> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> + <source>Missing File ID from server</source> + <translation>Nedostaje ID datoteke s poslužitelja</translation> + </message> + <message> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> + <source>Missing ETag from server</source> + <translation>Nedostaje E-oznaka s poslužitelja</translation> + </message> +</context> +<context> + <name>OCC::PropagateUploadFileV1</name> + <message> + <location filename="../src/libsync/propagateuploadv1.cpp" line="213"/> + <source>Poll URL missing</source> + <translation>Nedostaje URL ankete</translation> + </message> + <message> + <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <source>The local file was removed during sync.</source> + <translation>Lokalna datoteka je uklonjena tijekom sinkronizacije.</translation> + </message> + <message> + <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <source>Local file changed during sync.</source> + <translation>Lokalna datoteka je izmijenjena tijekom sinkronizacije.</translation> + </message> + <message> + <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> + <translation>Poslužitelj nije potvrdio posljednji komad. (E-oznaka nije bila prisutna)</translation> + </message> +</context> +<context> + <name>OCC::ProxyAuthDialog</name> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="20"/> + <source>Proxy authentication required</source> + <translation>Potrebna je autentifikacija proxy poslužitelja</translation> + </message> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="26"/> + <source>Username:</source> + <translation>Korisničko ime:</translation> + </message> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="36"/> + <source>Proxy:</source> + <translation>Proxy:</translation> + </message> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="43"/> + <source>The proxy server needs a username and password.</source> + <translation>Proxy poslužitelj treba korisničko ime i zaporku.</translation> + </message> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="50"/> + <source>Password:</source> + <translation>Zaporka:</translation> + </message> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="74"/> + <source>TextLabel</source> + <translation>TextLabel</translation> + </message> +</context> +<context> + <name>OCC::SelectiveSyncDialog</name> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <source>Choose What to Sync</source> + <translation>Odaberite što sinkronizirati</translation> + </message> +</context> +<context> + <name>OCC::SelectiveSyncWidget</name> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/> + <source>Loading ...</source> + <translation>Učitavanje...</translation> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="79"/> + <source>Deselect remote folders you do not wish to synchronize.</source> + <translation>Poništite odabir udaljenih mapa koje ne želite sinkronizirati.</translation> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="95"/> + <source>Name</source> + <translation>Naziv</translation> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="96"/> + <source>Size</source> + <translation>Veličina</translation> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <source>No subfolders currently on the server.</source> + <translation>Trenutno na poslužitelju nema podmapa.</translation> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <source>An error occurred while loading the list of sub folders.</source> + <translation>Došlo je do pogreške prilikom učitavanja popisa podmapa.</translation> + </message> +</context> +<context> + <name>OCC::ServerNotificationHandler</name> + <message> + <location filename="../src/gui/servernotificationhandler.cpp" line="153"/> + <source>Dismiss</source> + <translation>Zanemari</translation> + </message> +</context> +<context> + <name>OCC::SettingsDialog</name> + <message> + <location filename="../src/gui/settingsdialog.ui" line="14"/> + <source>Settings</source> + <translation>Postavke</translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <source>Activity</source> + <translation>Aktivnost</translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="105"/> + <source>General</source> + <translation>Općenito</translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="111"/> + <source>Network</source> + <translation>Mreža</translation> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="234"/> + <source>Account</source> + <translation>Račun</translation> + </message> +</context> +<context> + <name>OCC::SettingsDialogMac</name> + <message> + <location filename="../src/gui/settingsdialogmac.cpp" line="92"/> + <source>%1</source> + <translation>%1</translation> + </message> + <message> + <location filename="../src/gui/settingsdialogmac.cpp" line="155"/> + <source>Activity</source> + <translation>Aktivnost</translation> + </message> + <message> + <location filename="../src/gui/settingsdialogmac.cpp" line="106"/> + <source>General</source> + <translation>Općenito</translation> + </message> + <message> + <location filename="../src/gui/settingsdialogmac.cpp" line="110"/> + <source>Network</source> + <translation>Mreža</translation> + </message> + <message> + <location filename="../src/gui/settingsdialogmac.cpp" line="138"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="231"/> + <source>Account</source> + <translation>Račun</translation> + </message> +</context> +<context> + <name>OCC::ShareDialog</name> + <message> + <location filename="../src/gui/sharedialog.ui" line="92"/> + <source>share label</source> + <translation>oznaka za dijeljenje</translation> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="67"/> + <source>ownCloud Path:</source> + <translation>Put ownCloud:</translation> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="123"/> + <source>Icon</source> + <translation>Ikona</translation> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="104"/> + <source>%1 Sharing</source> + <translation>%1 Dijeljenje</translation> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="80"/> + <source>%1</source> + <translation>%1</translation> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="101"/> + <source>Folder: %2</source> + <translation>Mapa: %2</translation> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="272"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation>Datoteku nije moguće dijeliti jer je dijeljena bez dopuštenja.</translation> + </message> +</context> +<context> + <name>OCC::ShareLinkWidget</name> + <message> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> + <source>&Share link</source> + <translation>&Dijeli poveznicu</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> + <source>Password:</source> + <translation>Zaporka:</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> + <source>Expiration date:</source> + <translation>Datum isteka:</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> + <source>TextLabel</source> + <translation>TextLabel</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="409"/> + <source>Delete</source> + <translation>Izbriši</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="149"/> + <source>Allow Editing</source> + <translation>Dopusti uređivanje</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="155"/> + <source>Read only</source> + <translation>Samo za čitanje</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> + <source>Allow Upload && Editing</source> + <translation>Dopusti otpremanje i uređivanje</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <source>File Drop (Upload Only)</source> + <translation>Povlačenje datoteke (samo za otpremanje)</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="183"/> + <source>Password Protect</source> + <translation>Zaštita zaporkom</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="200"/> + <source>Expiration Date</source> + <translation>Datum isteka</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="219"/> + <source>Unshare</source> + <translation>Prestani dijeliti</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="224"/> + <source>Add another link</source> + <translation>Dodaj drugu poveznicu</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="402"/> + <source>Confirm Link Share Deletion</source> + <translation>Potvrdi brisanje dijeljenja poveznicom</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="403"/> + <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>Želite li zaista izbrisati dijeljenje javnom poveznicom <i>%1</i>?</p><p>Napomena: ovu radnju ne možete poništiti.</p></translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="410"/> + <source>Cancel</source> + <translation>Odustani</translation> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="428"/> + <source>Public link</source> + <translation>Javna poveznica</translation> + </message> +</context> +<context> + <name>OCC::ShareUserGroupWidget</name> + <message> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> + <source>Share with users or groups ...</source> + <translation>Dijelite s korisnicima ili grupama...</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> + <source>Copy link</source> + <translation>Kopiraj poveznicu</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> + <source>No results for '%1'</source> + <translation>Nema rezultata za ‘%1’</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> + <source>I shared something with you</source> + <translation>Dijelim nešto s vama</translation> + </message> +</context> +<context> + <name>OCC::ShareUserLine</name> + <message> + <location filename="../src/gui/shareuserline.ui" line="66"/> + <source>User name</source> + <translation>Korisničko ime</translation> + </message> + <message> + <location filename="../src/gui/shareuserline.ui" line="82"/> + <source>can edit</source> + <translation>uređivanje moguće</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> + <source>Can reshare</source> + <translation>Ponovno dijeljenje moguće</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Prestani dijeliti</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> + <source>Can create</source> + <translation>Stvaranje moguće</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> + <source>Can change</source> + <translation>Mijenjanje moguće</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> + <source>Can delete</source> + <translation>Brisanje moguće</translation> + </message> +</context> +<context> + <name>OCC::ShibbolethCredentials</name> + <message> + <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/> + <source>Login Error</source> + <translation>Pogreška pri prijavi</translation> + </message> + <message> + <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/> + <source>You must sign in as user %1</source> + <translation>Morate se prijaviti kao korisnik %1</translation> + </message> +</context> +<context> + <name>OCC::ShibbolethWebView</name> + <message> + <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="83"/> + <source>%1 - Authenticate</source> + <translation>%1 - Autentificiraj</translation> + </message> + <message> + <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> + <source>SSL Cipher Debug View</source> + <translation>Prikaz za otklanjanje pogrešaka SSL Cipher</translation> + </message> + <message> + <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> + <source>Reauthentication required</source> + <translation>Potrebna je ponovna autentifikacija</translation> + </message> + <message> + <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> + <source>Your session has expired. You need to re-login to continue to use the client.</source> + <translation>Vaša je sesija istekla. Morate se ponovno prijaviti kako biste nastavili upotrebljavati klijent.</translation> + </message> +</context> +<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>Dijeli s %1</translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="491"/> + <source>Context menu share</source> + <translation>Dijeljenje kontekstnog izbornika</translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="612"/> + <source>I shared something with you</source> + <translation>Dijelim nešto s vama</translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="625"/> + <location filename="../src/gui/socketapi.cpp" line="655"/> + <source>Share...</source> + <translation>Dijeli...</translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="627"/> + <location filename="../src/gui/socketapi.cpp" line="672"/> + <source>Copy private link to clipboard</source> + <translation>Kopiraj privatnu poveznicu u međuspremnik</translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="628"/> + <source>Send private link by email...</source> + <translation>Pošalji privatnu poveznicu e-poštom...</translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="653"/> + <source>Resharing this file is not allowed</source> + <translation>Dijeljenje ove datoteke nije dopušteno</translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="666"/> + <location filename="../src/gui/socketapi.cpp" line="668"/> + <source>Copy public link to clipboard</source> + <translation>Kopiraj javnu poveznicu u međuspremnik</translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="722"/> + <source>Open in browser</source> + <translation>Otvori u pregledniku</translation> + </message> +</context> +<context> + <name>OCC::SslButton</name> + <message> + <location filename="../src/gui/sslbutton.cpp" line="87"/> + <source><h3>Certificate Details</h3></source> + <translation><h3>Pojedinosti o vjerodajnici</h3></translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="90"/> + <source>Common Name (CN):</source> + <translation>Uobičajeno ime (CN):</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="91"/> + <source>Subject Alternative Names:</source> + <translation>Alternativna imena subjekta:</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="92"/> + <source>Organization (O):</source> + <translation>Organizacija (O):</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="93"/> + <source>Organizational Unit (OU):</source> + <translation>Organizacijska jedinica (OU):</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="94"/> + <source>State/Province:</source> + <translation>Država/regija:</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="95"/> + <source>Country:</source> + <translation>Država:</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="96"/> + <source>Serial:</source> + <translation>Serijski:</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="99"/> + <source><h3>Issuer</h3></source> + <translation><H3>Izdavatelj</ h3></translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="102"/> + <source>Issuer:</source> + <translation>Izdavatelj:</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="103"/> + <source>Issued on:</source> + <translation>Izdano:</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="104"/> + <source>Expires on:</source> + <translation>Datum isteka:</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="107"/> + <source><h3>Fingerprints</h3></source> + <translation><H3>Otisci prstiju</ h3></translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="111"/> + <source>SHA-256:</source> + <translation>SHA-256:</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="112"/> + <source>SHA-1:</source> + <translation>SHA-1:</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="116"/> + <source><p><b>Note:</b> This certificate was manually approved</p></source> + <translation><p><b>Napomena:</b> Ova vjerodajnica je ručno odobrena</p></translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="136"/> + <source>%1 (self-signed)</source> + <translation>%1 (samostalno potpisano)</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="138"/> + <source>%1</source> + <translation>%1</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="173"/> + <source>This connection is encrypted using %1 bit %2. +</source> + <translation>Ova veza je šifrirana s pomoću %1 bit %2. +</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="204"/> + <source>No support for SSL session tickets/identifiers</source> + <translation>Nema podrške za SSL tickete/identifikatore sesije</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="214"/> + <source>Certificate information:</source> + <translation>Informacije o vjerodajnici:</translation> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="177"/> + <source>This connection is NOT secure as it is not encrypted. +</source> + <translation>Ova veza NIJE sigurna jer nije šifrirana. +</translation> + </message> +</context> +<context> + <name>OCC::SslErrorDialog</name> + <message> + <location filename="../src/gui/sslerrordialog.ui" line="25"/> + <source>Trust this certificate anyway</source> + <translation>Svejedno vjeruj ovoj vjerodajnici</translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <source>Untrusted Certificate</source> + <translation>Nepouzdana vjerodajnica</translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="132"/> + <source>Cannot connect securely to <i>%1</i>:</source> + <translation>Nije moguće sigurno se povezati s <i>%1</i>:</translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="166"/> + <source>with Certificate %1</source> + <translation>s vjerodajnicom %1</translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="175"/> + <location filename="../src/gui/sslerrordialog.cpp" line="177"/> + <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <source>&lt;not specified&gt;</source> + <translation>&lt;nije navedeno&gt;</translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> + <source>Organization: %1</source> + <translation>Organizacija: %1</translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> + <source>Unit: %1</source> + <translation>Jedinica: %1</translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> + <source>Country: %1</source> + <translation>Država: %1</translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <source>Fingerprint (SHA1): <tt>%1</tt></source> + <translation>Otisak prsta (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"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <source>Effective Date: %1</source> + <translation>Datum stupanja na snagu: %1</translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> + <source>Expiration Date: %1</source> + <translation>Datum isteka: %1</translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <source>Issuer: %1</source> + <translation>Izdavatelj: %1</translation> + </message> +</context> +<context> + <name>OCC::SyncEngine</name> + <message> + <location filename="../src/libsync/syncengine.cpp" line="122"/> + <source>Success.</source> + <translation>Uspjeh.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="132"/> + <source>A network connection timeout happened.</source> + <translation>Došlo je do isteka mrežne veze.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="135"/> + <source>A HTTP transmission error happened.</source> + <translation>Došlo je do pogreške HTTP prijenosa.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="159"/> + <source>The mounted folder is temporarily not available on the server</source> + <translation>Postavljena mapa privremeno nije dostupna na poslužitelju</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="165"/> + <source>An error occurred while opening a folder</source> + <translation>Došlo je do pogreške prilikom otvaranja mape</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="168"/> + <source>Error while reading folder.</source> + <translation>Pogreška tijekom čitanja mape.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="244"/> + <source>%1 (skipped due to earlier error, trying again in %2)</source> + <translation>%1 (preskočeno zbog prethodne pogreške, pokušajte ponovno za %2)</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="516"/> + <source>File/Folder is ignored because it's hidden.</source> + <translation>Datoteka/mapa se zanemaruje jer je skrivena.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="519"/> + <source>Folder hierarchy is too deep</source> + <translation>Hijerarhija mapa je previše duboka</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="535"/> + <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> + <translation>Nepodudaranje: preuzeta inačica poslužitelja, lokalna kopija preimenovana i nije otpremljena.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="801"/> + <source>Only %1 are available, need at least %2 to start</source> + <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> + <translation>Dostupno je samo %1, za pokretanje je potrebno najmanje %2</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="836"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation>Nije moguće otvoriti ili stvoriti lokalnu sinkronizacijsku bazu podataka. Provjerite imate li pristup pisanju u mapi za sinkronizaciju.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1350"/> + <source>Not allowed because you don't have permission to add parent folder</source> + <translation>Nije dopušteno jer nemate dopuštenje za dodavanje nadređene mape</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1357"/> + <source>Not allowed because you don't have permission to add files in that folder</source> + <translation>Nije dopušteno jer nemate dopuštenje za dodavanje datoteka u tu mapu</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1690"/> + <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> + <translation>Premalo prostora na disku: preskočena su preuzimanja koja bi smanjila slobodni prostor ispod %1.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1697"/> + <source>There is insufficient space available on the server for some uploads.</source> + <translation>Na nekim poslužiteljima nema dovoljno slobodnog prostora za određene otpreme.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="150"/> + <source>CSync unspecified error.</source> + <translation>Pogreška u CSyncu.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="153"/> + <source>Aborted by the user</source> + <translation>Prekinuo korisnik</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="125"/> + <source>Failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source> + <translation>Nije moguće učitati ili stvoriti lokalnu datoteku dnevnika. Provjerite imate li ovlasti za čitanje i pisanje u mapi za lokalnu sinkronizaciju.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="129"/> + <source>Discovery step failed.</source> + <translation>Korak otkrivanja nije uspio.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="138"/> + <source>Permission denied.</source> + <translation>Dopuštenje je odbijeno.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="141"/> + <source>File or directory not found:</source> + <translation>Datoteka ili direktorij nisu pronađeni:</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="144"/> + <source>Tried to create a folder that already exists.</source> + <translation>Pokušali ste stvoriti mapu koja već postoji.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="147"/> + <source>No space on %1 server available.</source> + <translation>Nema dostupnog prostora na poslužitelju %1.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="156"/> + <source>The service is temporarily unavailable</source> + <translation>Servis je privremeno nedostupan</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="162"/> + <source>Access is forbidden</source> + <translation>Pristup je zabranjen</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="173"/> + <source>An internal error number %1 occurred.</source> + <translation>Došlo je do pogreške pod internim brojem %1.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="485"/> + <source>Symbolic links are not supported in syncing.</source> + <translation>Simboličke poveznice nisu podržane u sinkronizaciji.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="488"/> + <source>File is listed on the ignore list.</source> + <translation>Datoteka je navedena na popisu za zanemarivanje.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="492"/> + <source>File names ending with a period are not supported on this file system.</source> + <translation>Nazivi datoteka koji završavaju točkom nisu podržani u ovom datotečnom sustavu.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="502"/> + <source>File names containing the character '%1' are not supported on this file system.</source> + <translation>Nazivi datoteka koji sadrže znak ‘%1’ nisu podržani u ovom datotečnom sustavu.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="505"/> + <source>The file name is a reserved name on this file system.</source> + <translation>Naziv datoteke je rezervirani naziv u ovom datotečnom sustavu.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="510"/> + <source>Filename contains trailing spaces.</source> + <translation>Naziv datoteke sadrži završne praznine.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="513"/> + <source>Filename is too long.</source> + <translation>Naziv datoteke je predugačak.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="522"/> + <source>The filename cannot be encoded on your file system.</source> + <translation>Naziv datoteke ne može se kodirati u vašem datotečnom sustavu.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="531"/> + <source>Unresolved conflict.</source> + <translation>Neriješeno nepodudaranje.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="539"/> + <source>Stat failed.</source> + <translation>Stat nije uspio.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="566"/> + <source>Filename encoding is not valid</source> + <translation>Nevažeće kodiranje naziva datoteke</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="731"/> + <source>Invalid characters, please rename "%1"</source> + <translation>Nevažeći znakovi, preimenujte „%1”</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="864"/> + <source>Unable to read the blacklist from the local database</source> + <translation>Nije moguće pročitati crnu listu iz lokalne baze podataka</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="905"/> + <source>Unable to read from the sync journal.</source> + <translation>Nije moguće čitati iz sinkronizacijskog dnevnika.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="968"/> + <source>Cannot open the sync journal</source> + <translation>Nije moguće otvoriti sinkronizacijski dnevnik</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1034"/> + <source>File name contains at least one invalid character</source> + <translation>Naziv datoteke sadrži barem jedan nevažeći znak</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1276"/> + <location filename="../src/libsync/syncengine.cpp" line="1316"/> + <source>Ignored because of the "choose what to sync" blacklist</source> + <translation>Zanemareno zbog crne liste „odaberi što će se sinkronizirati”</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1335"/> + <source>Not allowed because you don't have permission to add subfolders to that folder</source> + <translation>Nije dopušteno jer nemate dopuštenje za dodavanje podmapa u tu mapu</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1382"/> + <source>Not allowed to upload this file because it is read-only on the server, restoring</source> + <translation>Nije dopušteno otpremiti ovu datoteku jer je dostupna samo za čitanje na poslužitelju, vraćanje</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1398"/> + <location filename="../src/libsync/syncengine.cpp" line="1417"/> + <source>Not allowed to remove, restoring</source> + <translation>Nije dopušteno uklanjanje, vraćanje</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1431"/> + <source>Local files and share folder removed.</source> + <translation>Uklonjene su lokalne datoteke i mapa za dijeljenje.</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1485"/> + <source>Move not allowed, item restored</source> + <translation>Premještanje nije dopušteno, stavka je vraćena</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1496"/> + <source>Move not allowed because %1 is read-only</source> + <translation>Premještanje nije dopušteno jer je %1 samo za čitanje</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1496"/> + <source>the destination</source> + <translation>odredište</translation> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1496"/> + <source>the source</source> + <translation>izvor</translation> + </message> +</context> +<context> + <name>OCC::SyncLogDialog</name> + <message> + <location filename="../src/gui/synclogdialog.ui" line="14"/> + <source>Synchronisation Log</source> + <translation>Zapis sinkronizacije</translation> + </message> +</context> +<context> + <name>OCC::Systray</name> + <message> + <location filename="../src/gui/systray.cpp" line="54"/> + <source>%1: %2</source> + <translation>%1: %2</translation> + </message> +</context> +<context> + <name>OCC::Theme</name> + <message> + <location filename="../src/libsync/theme.cpp" line="344"/> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Inačica %1. Za više informacija, kliknite <a href='%2'>ovdje</a>.</p></translation> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="348"/> + <source><p>This release was supplied by %1</p></source> + <translation><p>Ovo izdanje isporučuje %1</p></translation> + </message> +</context> +<context> + <name>OCC::WebEnginePage</name> + <message> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> + <source>Invalid certificate detected</source> + <translation>Otkrivena je nevažeća vjerodajnica</translation> + </message> + <message> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation>Računalo „%1” isporučilo je nevažeću vjerodajnicu. Nastaviti?</translation> + </message> +</context> +<context> + <name>OCC::WebFlowCredentials</name> + <message> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> + <source>You have been logged out of %1 as user %2. Please login again</source> + <translation>Odjavljeni ste iz %1 kao korisnik %2. Prijavite se ponovno</translation> + </message> + <message> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> + <source>Please login with the user: %1</source> + <translation>Prijavite se kao korisnik: %1</translation> + </message> +</context> +<context> + <name>OCC::ownCloudGui</name> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="302"/> + <source>Please sign in</source> + <translation>Prijavite se</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> + <source>Folder %1: %2</source> + <translation>Mapa %1: %2</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="366"/> + <source>There are no sync folders configured.</source> + <translation>Nema konfiguriranih mapa za sinkronizaciju.</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <source>Open in browser</source> + <translation>Otvori u pregledniku</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="424"/> + <source>Log in...</source> + <translation>Prijava...</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="428"/> + <source>Log out</source> + <translation>Odjava</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="523"/> + <source>Recent Changes</source> + <translation>Nedavne promjene</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="402"/> + <source>Managed Folders:</source> + <translation>Upravljane mape:</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="405"/> + <source>Open folder '%1'</source> + <translation>Otvori mapu '%1'</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="377"/> + <source>Open %1 in browser</source> + <translation>Otvori %1 u pregledniku</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <source>Unknown status</source> + <translation>Nepoznati status</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="780"/> + <source>Settings...</source> + <translation>Postavke...</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <source>Help</source> + <translation>Pomoć</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <source>Quit %1</source> + <translation>Zatvori %1</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="283"/> + <source>Disconnected from %1</source> + <translation>Odspojen od %1</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="233"/> + <source>Unsupported Server Version</source> + <translation>Nepodržana inačica poslužitelja</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> + <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>Poslužitelj na računu %1 koristi se starom i nepodržanom inačicom %2. Upotreba ovog klijenta s nepodržanim inačicama poslužitelja nije testirana i potencijalno je opasna. Nastavite na vlastitu odgovornost.</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <source>Disconnected</source> + <translation>Odspojen</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <source>Disconnected from some accounts</source> + <translation>Odspojen od nekih računa</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="286"/> + <source>Disconnected from accounts:</source> + <translation>Odspojen od računa:</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="288"/> + <source>Account %1: %2</source> + <translation>Račun %1: %2</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> + <source>Signed out</source> + <translation>Odjavljen</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="307"/> + <source>Account synchronization is disabled</source> + <translation>Sinkronizacija računa je onemogućena</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> + <location filename="../src/gui/owncloudgui.cpp" line="361"/> + <source>Synchronization is paused</source> + <translation>Sinkronizacija je pauzirana</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="356"/> + <source>Unresolved conflicts</source> + <translation>Neriješena nepodudaranja</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="363"/> + <source>Error during synchronization</source> + <translation>Pogreška tijekom sinkronizacije</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <source>No sync folders configured</source> + <translation>Nije konfigurirana nijedna mapa za sinkronizaciju</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="413"/> + <source>Resume all folders</source> + <translation>Nastavi sve mape</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="418"/> + <source>Pause all folders</source> + <translation>Pauziraj sve mape</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <source>Resume all synchronization</source> + <translation>Nastavi sve sinkronizacije</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="696"/> + <source>Resume synchronization</source> + <translation>Nastavi sinkronizaciju</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="704"/> + <source>Pause all synchronization</source> + <translation>Zaustavi sve sinkronizacije</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <source>Pause synchronization</source> + <translation>Pauziraj sinkronizaciju</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="781"/> + <source>New account...</source> + <translation>Novi račun...</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Prikaži više aktivnosti...</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>Sruši se</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <source>Apps</source> + <translation>Aplikacije</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="898"/> + <source>No items synced recently</source> + <translation>Nije sinkronizirana nijedna stavka nedavno</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="920"/> + <source>Checking for changes in remote '%1'</source> + <translation>Provjera za promjene u udaljenom ‘%1’</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="923"/> + <source>Checking for changes in local '%1'</source> + <translation>Provjera za promjene u lokalnom ‘%1’</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="938"/> + <source>Syncing %1 of %2 (%3 left)</source> + <translation>Sinkronizacija %1 od %2 (preostalo %3)</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="943"/> + <source>Syncing %1 of %2</source> + <translation>Sinkronizacija %1 od %2</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="952"/> + <source>Syncing %1 (%2 left)</source> + <translation>Sinkronizacija %1 (preostalo %2)</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="955"/> + <source>Syncing %1</source> + <translation>Sinkronizacija %1</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="973"/> + <source>%1 (%2, %3)</source> + <translation>%1 (%2, %3)</translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="358"/> + <source>Up to date</source> + <translation>Ažurno</translation> + </message> +</context> +<context> + <name>OwncloudAdvancedSetupPage</name> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> + <source>Server</source> + <translation>Poslužitelj</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="354"/> + <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> + <translation><html><head/><body><p>Ako je ovaj okvir označen, postojeći sadržaj u lokalnoj mapi bit će izbrisan kako bi se pokrenula nova sinkronizacija s poslužitelja.</p><p>Nemojte označavati okvir ako lokalni sadržaj treba otpremiti u mapu poslužitelja.</p></body></html></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="357"/> + <source>Start a &clean sync (Erases the local folder!)</source> + <translation>Pokreni novu sinkronizaciju (briše lokalnu mapu!)</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="148"/> + <source>Ask for confirmation before synchroni&zing folders larger than</source> + <translation>Zatraži potvrdu prije sinkronizacije mapa većih od</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="165"/> + <source>MB</source> + <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> + <translation>MB</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="174"/> + <source>Ask for confirmation before synchronizing e&xternal storages</source> + <translation>Zatraži potvrdu prije sinkronizacije vanjskih prostora za pohranu</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="198"/> + <source>Choose what to sync</source> + <translation>Odaberite što sinkronizirati</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="251"/> + <source>&Local Folder</source> + <translation>&Lokalna mapa</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> + <source>&Keep local data</source> + <translation>&Zadrži lokalne podatke</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/> + <source>S&ync everything from server</source> + <translation>Sinkroniziraj sve s poslužitelja</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/> + <source>Status message</source> + <translation>Poruka statusa</translation> + </message> +</context> +<context> + <name>OwncloudHttpCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> + <source>&Username</source> + <translation>&Korisničko ime</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="83"/> + <source>&Password</source> + <translation>&Zaporka</translation> + </message> +</context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Za nastavak prijeđite na preglednik.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Došlo je do pogreške tijekom povezivanja. Pokušajte ponovno.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Ponovno otvori preglednik</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OwncloudSetupPage</name> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> + <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> + <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;“>Postavite vlastiti poslužitelj</span></a></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="143"/> + <source>Register with a provider</source> + <translation>Registriraj se kod davatelja usluga</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="165"/> + <source>Log in</source> + <translation>Prijava</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="288"/> + <source>Server Address</source> + <translation>Adresa poslužitelja</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="304"/> + <source>https://...</source> + <translation>https://...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="339"/> + <source>Error Label</source> + <translation>Oznaka pogreške</translation> + </message> +</context> +<context> + <name>OwncloudWizardResultPage</name> + <message> + <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> + <source>Your entire account is synced to the local folder </source> + <translation>Cijeli se račun sinkronizira s lokalnom mapom </translation> + </message> +</context> +<context> + <name>QObject</name> + <message> + <location filename="../src/common/utility.cpp" line="443"/> + <source>in the future</source> + <translation>u budućnosti</translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="437"/> + <source>%n day ago</source> + <translation><numerusform>Prije %n dana</numerusform><numerusform>Prije %n dana</numerusform><numerusform>Prije %n dana</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="439"/> + <source>%n days ago</source> + <translation><numerusform>Prije %n dana</numerusform><numerusform>Prije %n dana</numerusform><numerusform>Prije %n dana</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="449"/> + <source>%n hour ago</source> + <translation><numerusform>Prije %n sata</numerusform><numerusform>Prije %n sata</numerusform><numerusform>Prije %n sata</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="451"/> + <source>%n hours ago</source> + <translation><numerusform>Prije %n sati</numerusform><numerusform>Prije %n sati</numerusform><numerusform>Prije %n sati</numerusform></translation> + </message> + <message> + <location filename="../src/common/utility.cpp" line="458"/> + <source>now</source> + <translation>sada</translation> + </message> + <message> + <location filename="../src/common/utility.cpp" line="460"/> + <source>Less than a minute ago</source> + <translation>Prije manje od minute</translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="464"/> + <source>%n minute ago</source> + <translation><numerusform>Prije %n minute</numerusform><numerusform>Prije %n minute</numerusform><numerusform>Prije %n minute</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="466"/> + <source>%n minutes ago</source> + <translation><numerusform>Prije %n minuta</numerusform><numerusform>Prije %n minuta</numerusform><numerusform>Prije %n minuta</numerusform></translation> + </message> + <message> + <location filename="../src/common/utility.cpp" line="470"/> + <source>Some time ago</source> + <translation>Prije nekog vremena</translation> + </message> + <message> + <location filename="../src/libsync/syncresult.cpp" line="153"/> + <source>%1: %2</source> + <extracomment>this displays an error string (%2) for a file %1</extracomment> + <translation>%1: %2</translation> + </message> +</context> +<context> + <name>Utility</name> + <message> + <location filename="../src/common/utility.cpp" line="130"/> + <source>%L1 GB</source> + <translation>%L1 GB</translation> + </message> + <message> + <location filename="../src/common/utility.cpp" line="134"/> + <source>%L1 MB</source> + <translation>%L1 MB</translation> + </message> + <message> + <location filename="../src/common/utility.cpp" line="138"/> + <source>%L1 KB</source> + <translation>%L1 KB</translation> + </message> + <message> + <location filename="../src/common/utility.cpp" line="141"/> + <source>%L1 B</source> + <translation>%L1 B</translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="310"/> + <source>%n year(s)</source> + <translation><numerusform>%n godine/godina</numerusform><numerusform>%n godine/godina</numerusform><numerusform>%n godine/godina</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="311"/> + <source>%n month(s)</source> + <translation><numerusform>%n mjeseca/mjeseci</numerusform><numerusform>%n mjeseca/mjeseci</numerusform><numerusform>%n mjeseca/mjeseci</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="312"/> + <source>%n day(s)</source> + <translation><numerusform>%n dan/dana</numerusform><numerusform>%n dan/dana</numerusform><numerusform>%n dan/dana</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="313"/> + <source>%n hour(s)</source> + <translation><numerusform>%n sat/sati</numerusform><numerusform>%n sat/sati</numerusform><numerusform>%n sat/sati</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="314"/> + <source>%n minute(s)</source> + <translation><numerusform>%n minute/minuta</numerusform><numerusform>%n minute/minuta</numerusform><numerusform>%n minute/minuta</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="315"/> + <source>%n second(s)</source> + <translation><numerusform>%n sekunde/sekundi</numerusform><numerusform>%n sekunde/sekundi</numerusform><numerusform>%n sekunde/sekundi</numerusform></translation> + </message> + <message> + <location filename="../src/common/utility.cpp" line="339"/> + <source>%1 %2</source> + <translation>%1 %2</translation> + </message> +</context> +<context> + <name>ValidateChecksumHeader</name> + <message> + <location filename="../src/common/checksums.cpp" line="233"/> + <source>The checksum header is malformed.</source> + <translation>Zaglavlje kontrolnog zbroja pogrešno je oblikovano.</translation> + </message> + <message> + <location filename="../src/common/checksums.cpp" line="248"/> + <source>The checksum header contained an unknown checksum type '%1'</source> + <translation>Zaglavlje kontrolnog zbroja sadrži nepoznatu vrstu kontrolnog zbroja ‘%1’</translation> + </message> + <message> + <location filename="../src/common/checksums.cpp" line="252"/> + <source>The downloaded file does not match the checksum, it will be resumed.</source> + <translation>Preuzeta se datoteka ne podudara s kontrolnim zbrojem, nastavit će se.</translation> + </message> +</context> +<context> + <name>main.cpp</name> + <message> + <location filename="../src/gui/main.cpp" line="39"/> + <source>System Tray not available</source> + <translation>Ladica sustava nije dostupna</translation> + </message> + <message> + <location filename="../src/gui/main.cpp" line="40"/> + <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> + <translation>%1 je tražen na radnoj ladici sustava. Ako upotrebljavate XFCE, slijedite <a href=“http://docs.xfce.org/xfce/xfce4-panel/systray“>ove upute</a>. U suprotnom instalirajte aplikaciju ladice sustava kao što je „trayer” i pokušajte ponovno.</translation> + </message> +</context> +<context> + <name>nextcloudTheme::about()</name> + <message> + <location filename="../src/libsync/theme.cpp" line="328"/> + <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>Izrađeno iz revizije Gita <a href="%1“>%2</a>na %3, %4 s pomoću Qt %5, %6</small></p></translation> + </message> +</context> +<context> + <name>progress</name> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <source>Downloaded</source> + <translation>Preuzeto</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <source>Uploaded</source> + <translation>Otpremljeno</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <source>Server version downloaded, copied changed local file into conflict file</source> + <translation>Preuzeta je inačica poslužitelja, promijenjena lokalna datoteka kopirana u datoteku nepodudaranja</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="39"/> + <source>Deleted</source> + <translation>Izbrisano</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <source>Moved to %1</source> + <translation>Premješteno u %1</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <source>Ignored</source> + <translation>Zanemareno</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <source>Filesystem access error</source> + <translation>Pogreška pristupa datotečnom sustavu</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="48"/> + <source>Error</source> + <translation>Pogreška</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <source>Updated local metadata</source> + <translation>Ažurirani lokalni metapodaci</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="55"/> + <source>Unknown</source> + <translation>Nepoznato</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <source>downloading</source> + <translation>preuzimanje</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="68"/> + <source>uploading</source> + <translation>otpremanje</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> + <source>deleting</source> + <translation>brisanje</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> + <source>moving</source> + <translation>premještanje</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <source>ignoring</source> + <translation>zanemarivanje</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="77"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="79"/> + <source>error</source> + <translation>pogreška</translation> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="81"/> + <source>updating local metadata</source> + <translation>ažuriranje lokalnih metapodataka</translation> + </message> +</context> +<context> + <name>theme</name> + <message> + <location filename="../src/libsync/theme.cpp" line="62"/> + <source>Status undefined</source> + <translation>Status nije definiran</translation> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="65"/> + <source>Waiting to start sync</source> + <translation>Čeka se početak sinkronizacije</translation> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="68"/> + <source>Sync is running</source> + <translation>Sinkronizacija je pokrenuta</translation> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="71"/> + <source>Sync Success</source> + <translation>Uspješna sinkronizacija</translation> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="74"/> + <source>Sync Success, some files were ignored.</source> + <translation>Uspješna sinkronizacija, neke su datoteke zanemarene.</translation> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="77"/> + <source>Sync Error</source> + <translation>Pogreška sinkronizacije</translation> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="80"/> + <source>Setup Error</source> + <translation>Pogreška pri postavljanju</translation> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="83"/> + <source>Preparing to sync</source> + <translation>Priprema za sinkronizaciju</translation> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="86"/> + <source>Aborting...</source> + <translation>Prekidanje...</translation> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="89"/> + <source>Sync is paused</source> + <translation>Sinkronizacija je pauzirana</translation> + </message> +</context> +<context> + <name>utility</name> + <message> + <location filename="../src/gui/guiutility.cpp" line="34"/> + <source>Could not open browser</source> + <translation>Nije moguće otvoriti preglednik</translation> + </message> + <message> + <location filename="../src/gui/guiutility.cpp" line="35"/> + <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source> + <translation>Došlo je do pogreške prilikom pokretanja preglednika radi otvaranja URL-a %1. Možda nije konfiguriran zadani preglednik?</translation> + </message> + <message> + <location filename="../src/gui/guiutility.cpp" line="58"/> + <source>Could not open email client</source> + <translation>Nije moguće otvoriti klijent e-pošte</translation> + </message> + <message> + <location filename="../src/gui/guiutility.cpp" line="59"/> + <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source> + <translation>Došlo je do pogreške prilikom pokretanja preglednika radi stvaranja nove poruke. Možda nije konfiguriran zadani klijent e-pošte?</translation> + </message> +</context> +</TS>
\ No newline at end of file diff --git a/translations/client_hu.ts b/translations/client_hu.ts index cee5f67ef..5b8d3e236 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -35,7 +35,7 @@ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation type="unfinished"/> + <translation>Nem található mostanában módosított fájl</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> @@ -50,47 +50,42 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>Weboldal megnyitása</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>Nemrég módosítva</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>Szinkronizálás szüneteltetése</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>Súgó</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>Beállítások</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>Kijelentkezés</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> <source>Quit sync client</source> - <translation type="unfinished"/> + <translation>Kilépés a szinkronizálási kliensből</translation> </message> </context> <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Párbeszédablak</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Címke</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation>Űrlap</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Váltson a böngészőre a folytatáshoz.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Hiba történt a kapcsolódáskor. Próbálja újra.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> <translation>Űrlap</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Váltson a böngészőre a folytatáshoz.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Hiba történt a kapcsolódáskor. Próbálja újra.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Válasszon egy helyi mappát a számítógépen a szinkronizáláshoz</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Távoli célkönyvtár kiválasztása</translation> @@ -163,7 +204,7 @@ <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> <source>TextLabel</source> - <translation>TextLabel</translation> + <translation>Címke</translation> </message> </context> <context> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Végpontok közötti titkosítás mnemonikus kódja</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>A kriptográfiai személyazonossága megvédéséhez, egy 12 szótári szóból álló mnemonikus kóddal titkosítjuk. Jegyezze meg ezeket, és tartsa azokat biztonságban. Szüksége lesz rájuk, ha egy új eszközt akar hozzáadni a fiókjához (például a mobiltelefonját vagy a laptopját).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>…</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Tárhely mérete: …</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>A ki nem választott mappák <b>törlésre kerülnek</b> a helyi fájlrendszerről, és a továbbiakban nem lesznek szinkronizálva erre a számítógépre.</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Minden szinkronizálása</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Nincs szinkronizálás</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Kézi módosítások alkalmazása</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Alkalmaz</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Mégse</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Kapcsolódva <user> felhasználóval ehhez: <server></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Nincs fiók beállítva.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Új hozzáadása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Eltávolítás</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Fiók</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Ez a fiók támogatja a végpontok közötti titkosítást</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Titkosítás engedélyezése</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>E2E mnemonikus kód megjelenítése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Titkosítás</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Szinkronizálandó elemek kiválasztása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Szinkronizálás azonnal</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Szinkronizálás újraindítása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Mappa szinkronizálási kapcsolatának eltávolítása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Mappa létrehozása sikertelen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>A helyi mappa nem hozható létre: <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Mappa szinkronizációs kapcsolatának eltávolításának megerősítése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Mappa szinkronizálási kapcsolatának eltávolítása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>A szinkronizálás fut</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>A szinkronizálás folyamatban van. <br/>Megszakítja?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 használatban</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1, mint <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>A(z) %1 kiszolgálóverzió régi és már nem támogatott! Csak saját felelősségre folytassa.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Kapcsolódva ehhez: %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>A(z) %1 kiszolgáló jelenleg nem érhető el.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>A(z) %1 kiszolgáló jelenleg karbantartási módban van.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Kijelentkezve innen: %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Engedély kérése a böngészőtől. <a href='%1'>Kattintson ide</a> a böngésző újranyitásához.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Kapcsolódás ehhez: %1…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Nincs kapcsolat ehhez: %1, itt: %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Bejelentkezés</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Az alábbi mappák nem lettek szinkronizálva, mert túl nagyok:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Az alábbi mappák nem lettek szinkronizálva, mert külső tárolók:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Az alábbi mappák nem lettek szinkronizálva, mert túl nagyok, vagy külső tárolók:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Fiók törlésének megerősítése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Tényleg törölni szeretné a kapcsolatot a(z) <i>%1</i> fiókkal?</p><p><b>Megjegyzés:</b> Ez <b>nem</b> töröl fájlokat.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Kapcsolat eltávolítása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Mappa megnyitása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Kilépés</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Szinkronizálás folytatása</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Szinkronizálás szüneteltetése</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Tényleg leállítja a(z) <i>%1</i> mappa szinkronizálását?</p><p><b>Megjegyzés:</b> Ez <b>nem</b> töröl fájlokat.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) / %2 használatban. Néhány mappa – beleértve a hálózati megosztásokat és a megosztott könyvtárakat – eltérő korlátozással rendelkezhet.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 / %2 használatban</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Jelenleg nem érhetőek el a tárhelyhasználati információk.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Nincs %1 kapcsolat beállítva.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Elfogadás</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Szinkronizálva</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Összes feltöltés újrapróbálása</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>A(z) %1 fióknál nincsenek tevékenységek engedélyezve.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Hiba a metaadatok adatbázisba írásakor</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Adja meg a végpontok közötti titkosítási jelmondatát:<br><br>Felhasználó: %2<br>Fiók: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Adja meg az E2E jelmondatot</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>A kiszolgáló hibát adott vissza: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Hiba történt a „token” végpont elérésekor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>A kiszolgálótól visszakapott JSON nem dolgozható fel: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>A kiszolgáló válasza nem tartalmazta az összes várt mezőt</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Kapcsolódás: %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Bejelentkezés böngészőben (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>A böngésző nem nyitható meg, másolja a hivatkozást a böngészőjébe.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>A böngésző nem nyitható meg, másolja a hivatkozást a böngészőjébe.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>A(z) %1 nem olvasható.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>A(z) %1 sikeresen eltávolítva.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>A(z) %1 sikeresen letöltve.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>A(z) %1 sikeresen feltöltve.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>A(z) %1 átnevezve erre: %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>A(z) %1 áthelyezve ide: %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>A(z) %1 és %d további fájl törölve.</numerusform><numerusform>A(z) %1 és %d további fájl törölve.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>A(z) %1 és %n további fájl letöltve.</numerusform><numerusform>A(z) %1 és %n további fájl letöltve.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>A(z) %1 és %n további fájl feltöltve.</numerusform><numerusform>A(z) %1 és %n további fájl feltöltve.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>A(z) %1 átnevezve erre: %2, és még %n további fájl lett átnevezve.</numerusform><numerusform>A(z) %1 átnevezve erre: %2, és még %n további fájl lett átnevezve.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>A(z) %1 áthelyezve ide: %2, és még %n további fájl áthelyezve.</numerusform><numerusform>A(z) %1 áthelyezve ide: %2, és még %n további fájl áthelyezve.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>A(z) %1 és %n további fájl szinkronizálási ütközéssel rendelkezik.</numerusform><numerusform>A(z) %1 és %n további fájl szinkronizálási ütközéssel rendelkezik.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>A(z) %1 fájl szinkronizálási ütközéssel rendelkezik. Ellenőrizze az ütközési fájlt!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>A(z) %1 és %n további fájl hibák miatt nem szinkronizálható. Bővebb információk a naplófájlban.</numerusform><numerusform>A(z) %1 és %n további fájl hibák miatt nem szinkronizálható. Bővebb információk a naplófájlban.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>A(z) %1 hiba miatt nem szinkronizálható. Bővebb információk a naplófájlban.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Szinkronizálási tevékenység</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Nem lehetett beolvasni a rendszer kizárási fájlját</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Egy %1 MB méretet meghaladó mappa lett hozzáadva: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Egy külső tárolóból származó mappa lett hozzáadva. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>A beállításoknál válassza ki, ha le szeretné tölteni.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>A(z) %1 mappa létre lett hozva, de előzőleg ki lett hagyva a szinkronizálásból. A benne lévő adatok nem lesznek szinkronizálva.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>A(z) %1 fájl létre lett hozva, de előzőleg ki lett hagyva a szinkronizálásból. Nem lesz szinkronizálva.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,7 +961,7 @@ Ez azt jelenti, hogy a szinkronizációs kliens lehet, hogy nem fogja azonnal fe %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -877,22 +972,22 @@ Ha úgy dönt, hogy megtartja a fájlokat, akkor újra fel lesznek töltve a kis Ha úgy dönt, hogy törli ezeket a fájlokat, akkor többé nem fogja azokat elérni, hacsak nem Ön a tulajdonos.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Letölti az új fájlokat?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Új fájlok letöltése</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Helyi fájlok megtartása</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -901,7 +996,7 @@ Biztos, hogy szinkronizálni akarja ezeket a változásokat a kiszolgálóval? Ha ez véletlen volt, és úgy dönt, hogy megtartja ezeket a fájlokat, akkor újra letöltésre kerülnek a kiszolgálóról.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -910,17 +1005,17 @@ Ez lehet, hogy azért van, mert egy biztonsági mentést állíthattak vissza a A szinkronizálás folytatásával az összes fájlja felül lesz írva egy régebbi állapottal. Megtartja ütközési fájlként a legfrissebb helyi fájlokat?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Biztonsági mentés észlelve</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Normál szinkronizálás</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Helyi fájlok megtartása ütközésként</translation> </message> @@ -1036,12 +1131,12 @@ A szinkronizálás folytatásával az összes fájlja felül lesz írva egy rég <translation>Mappa szinkronizálási kapcsolat hozzáadása</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Szinkronizálva a helyi mappákkal</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Fájl</translation> </message> @@ -1071,7 +1166,7 @@ A szinkronizálás folytatásával az összes fájlja felül lesz írva egy rég <translation>Hiba történt a kiszolgálón levő mappák listájának betöltésekor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Kijelentkezve</translation> </message> @@ -1086,107 +1181,107 @@ A szinkronizálás folytatásával az összes fájlja felül lesz írva egy rég <translation>Feloldatlan ütközések vannak. Kattintson a részletekért.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Változások egyeztetése</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, „%1”</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>„%1”</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>%1 szinkronizálása</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>letöltés: %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>feltöltés: %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Változások keresése a(z) „%1” távoli mappában</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Változások keresése a(z) „%1” helyi mappában</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 / %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 van hátra, %1 / %2, %3 / %4 fájl</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 / %2, %3 / %4 fájl</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>%1 / %2 fájl</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Várakozás…</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Várakozás %n további könyvtárra…</numerusform><numerusform>Várakozás %n további könyvtárra…</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Felkészülés a szinkronizálásra…</translation> </message> @@ -1317,11 +1412,6 @@ A szinkronizálás folytatásával az összes fájlja felül lesz írva egy rég <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Jogi nyilatkozat</translation> @@ -1472,83 +1562,79 @@ A szinkronizálás folytatásával az összes fájlja felül lesz írva egy rég <translation>Minták miatt kihagyott fájlok</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Hozzáadás</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>A bejegyzést az itt lévő rendszer biztosítja: „%1”, és nem lehet módosítani ebben a nézetben.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Összes eltávolítása</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Minta</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Törlés engedélyezése</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Eltávolítás</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>A mintára illeszkedő fájlok vagy mappák nem lesznek szinkronizálva. - -Ahol a törlés engedélyezett, ott az elemek törölve lesznek, ha megakadályoznák egy mappa törlését. Ez metaadatok esetén hasznos.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>A fájl nem nyitható meg</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>A változások nem írhatóak ide: „%1”.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Kihagyási minta hozzáadása</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Új kihagyási minta hozzáadása:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>A bejegyzést az itt lévő rendszer biztosítja: „%1”, és nem lehet módosítani ebben a nézetben.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Párbeszédablak</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Jogi nyilatkozat</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Bezárás</translation> @@ -1680,11 +1766,6 @@ A naplók ide lesznek írva: %1</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Proxy beállítások</translation> @@ -1928,7 +2009,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> <source>There isn't enough free space in the local folder!</source> - <translation type="unfinished"/> + <translation>Nincs elég szabad hely a helyi mappában.</translation> </message> </context> <context> @@ -1994,11 +2075,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>Bejelentkezés böngészőben</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Hivatkozás vágólapra másolása</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2050,12 +2126,12 @@ Használata nem ajánlott.</translation> <translation>&Következő ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Érvénytelen URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>A tanúsítvány nem tölthető be. Lehet, hogy hibás a jelszó?</translation> </message> @@ -2133,79 +2209,79 @@ Használata nem ajánlott.</translation> <translation>A(z) %1 helyi mappa nem hozható létre</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Nincs távoli mappa megadva!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Hiba: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>mappa létrehozása a Nextcloudon: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>A(z) %1 távoli mappa sikeresen létrehozva.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>A(z) %1 távoli mappa már létezik. Kapcsolódás a szinkronizáláshoz.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A könyvtár létrehozása HTTP %1 hibakódot eredményezett</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>A távoli mappa létrehozása meghiúsult, mert a megadott hitelesítő adatok hibásak.<br/>Lépjen vissza, és ellenőrizze az adatait.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">A távoli mappa létrehozása sikertelen, valószínűleg azért, mert hibás hitelesítési adatokat adott meg.</font><br/>Lépjen vissza, és ellenőrizze az adatait.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>A távoli %1 mappa létrehozása meghiúsult, hibaüzenet: <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>A szinkronizálási kapcsolat a(z) %1 és a(z) %2 távoli mappa között létrejött.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Sikeresen kapcsolódva ehhez: %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>A kapcsolat a(z) %1 kiszolgálóval nem hozható létre. Ellenőrizze újra.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>A mappa átnevezése nem sikerült</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Nem távolíthatja el és készíthet biztonsági másolatot egy mappáról, mert a mappa, vagy egy benne lévő fájl meg van nyitva egy másik programban. Zárja be a mappát vagy fájlt, és nyomja meg az újrapróbálkozást, vagy szakítsa meg a beállítást.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>A(z) %1 helyi szinkronizációs mappa sikeresen létrehozva.</b></font></translation> </message> @@ -2213,12 +2289,12 @@ Használata nem ajánlott.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 kapcsolódási varázsló</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Mappák konfigurációjának kihagyása</translation> </message> @@ -2252,7 +2328,7 @@ Használata nem ajánlott.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Hiba a metaadatok adatbázisba írásakor</translation> </message> @@ -2280,32 +2356,32 @@ Használata nem ajánlott.</translation> <translation>A lemezen lévő szabad hely kevesebb mint %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>A fájl törlésre került a kiszolgálóról</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>A fájl nem tölthető le teljesen.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> - <translation type="unfinished"/> + <translation>A letöltött fájl üres, annak ellenére, hogy a kiszolgáló szerint %1 méretű kellene legyen.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>A(z) %1 fájl nem menthető, mert ütközik egy helyi fájl nevével.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>A fájl változott a felfedezése óta</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Hiba a metaadatok adatbázisba írásakor</translation> </message> @@ -2318,7 +2394,7 @@ Használata nem ajánlott.</translation> <translation>; Sikertelen helyreállítás: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>A fájl vagy mappa egy csak olvasható megosztásról lett törölve, de a helyreállítás meghiúsult: %1</translation> </message> @@ -2450,27 +2526,27 @@ Használata nem ajánlott.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>A helyi fájl el lett távolítva szinkronizálás közben.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>A helyi fájl megváltozott szinkronizálás közben.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Nem várt visszatérési érték a kiszolgálótól (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Hiányzik a fájlazonosító a kiszolgálóról</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Hiányzik az ETag a kiszolgálóról</translation> </message> @@ -2528,7 +2604,7 @@ Használata nem ajánlott.</translation> <message> <location filename="../src/gui/proxyauthdialog.ui" line="74"/> <source>TextLabel</source> - <translation>TextLabel</translation> + <translation>Címke</translation> </message> </context> <context> @@ -2679,24 +2755,24 @@ Használata nem ajánlott.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> - <translation>&Megosztás hivatkozás</translation> + <translation>&Megosztási hivatkozás</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Jelszó:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Lejárati idő:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> - <translation>TextLabel</translation> + <translation>Címke</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="409"/> @@ -2741,7 +2817,7 @@ Használata nem ajánlott.</translation> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="224"/> <source>Add another link</source> - <translation type="unfinished"/> + <translation>Egyéb hivatkozás hozzáadása</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="402"/> @@ -2767,22 +2843,22 @@ Használata nem ajánlott.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Megosztás felhasználókkal vagy csoportokkal …</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Hivatkozás másolása</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Nincs találat erre: „%1”</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Megosztottam Önnel valamit</translation> </message> @@ -2800,22 +2876,27 @@ Használata nem ajánlott.</translation> <translation>szerkesztheti</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Újra megosztható</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Megosztás visszavonása</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Létrehozható</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Módosítható</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Törölhető</translation> </message> @@ -2842,7 +2923,7 @@ Használata nem ajánlott.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation>SSL titkosítási hibakereső nézet</translation> </message> <message> @@ -2988,7 +3069,7 @@ Használata nem ajánlott.</translation> <message> <location filename="../src/gui/sslbutton.cpp" line="116"/> <source><p><b>Note:</b> This certificate was manually approved</p></source> - <translation><p><b>Megjegyzés:</b> A tanúsítvány kézileg jóváhagyva</p></translation> + <translation><p><b>Megjegyzés:</b> A tanúsítvány kézileg lett jóváhagyva</p></translation> </message> <message> <location filename="../src/gui/sslbutton.cpp" line="136"/> @@ -3028,11 +3109,6 @@ Használata nem ajánlott.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Mindenképp fogadja el ezt a tanúsítványt</translation> @@ -3061,44 +3137,49 @@ Használata nem ajánlott.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Szervezet: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Egység: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Ország: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Ellenőrzőkód (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Ellenőrzőkód (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> - <translation>Tényleges dátum: %1</translation> + <translation>Érvényességi dátum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Lejárati dátum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Kibocsátó: %1</translation> </message> @@ -3189,7 +3270,7 @@ Használata nem ajánlott.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="150"/> <source>CSync unspecified error.</source> - <translation>CSync ismeretlen hiba.</translation> + <translation>Ismeretlen CSync hiba.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="153"/> @@ -3244,7 +3325,7 @@ Használata nem ajánlott.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="485"/> <source>Symbolic links are not supported in syncing.</source> - <translation>A szimbolikus nem támogatott a szinkronizálásnál.</translation> + <translation>A szimbolikus linkek nem támogatottak a szinkronizálásnál.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="488"/> @@ -3389,11 +3470,11 @@ Használata nem ajánlott.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>%1 verzió. További információkért keresse fel a <a href='%2'>%3</a> weboldalt.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>%1 verzió. További információkért kattintson <a href='%2'>ide</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Ezt a kiadást a %1 biztosította</p></translation> </message> @@ -3401,25 +3482,25 @@ Használata nem ajánlott.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Érvénytelen tanúsítvány észlelve</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>A(z) „%1” kiszolgáló érvénytelen tanúsítványt adott meg. Folytatja?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Kijelentkezett a(z) %1 fiókjából, mint %2 felhasználó. Jelentkezzen be újra</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Jelentkezzen be a következő felhasználóval: %1</translation> </message> @@ -3487,11 +3568,6 @@ Használata nem ajánlott.</translation> <translation>Beállítások…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Részletek…</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Súgó</translation> @@ -3499,12 +3575,12 @@ Használata nem ajánlott.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="790"/> <source>Quit %1</source> - <translation>%1 kilépés</translation> + <translation>Kilépés a %1ból</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="283"/> <source>Disconnected from %1</source> - <translation>Kapcsolat bontva ezzel: %1</translation> + <translation>Kapcsolat bontva a %1dal</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="233"/> @@ -3603,6 +3679,11 @@ Használata nem ajánlott.</translation> <translation>Új fiók…</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Több tevékenység megtekintése…</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> @@ -3662,23 +3743,6 @@ Használata nem ajánlott.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Kiszolgáló</translation> @@ -3720,11 +3784,6 @@ Használata nem ajánlott.</translation> <translation>&Helyi mappa</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>Helyi adatok &megtartása</translation> @@ -3743,11 +3802,6 @@ Használata nem ajánlott.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Felhasználónév</translation> @@ -3761,11 +3815,6 @@ Használata nem ajánlott.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Váltson a böngészőre a folytatáshoz.</translation> @@ -3780,21 +3829,15 @@ Használata nem ajánlott.</translation> <source>Re-open Browser</source> <translation>Böngésző újranyitása</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Készítsen saját kiszolgálót</span></a></translation> @@ -3822,32 +3865,16 @@ Használata nem ajánlott.</translation> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="339"/> <source>Error Label</source> - <translation>Hiba címke</translation> + <translation>Hibacímke</translation> </message> </context> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>A teljes fiókja szinkronizálásra került a helyi mappába.</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Nyomógomb</translation> - </message> </context> <context> <name>QObject</name> @@ -3902,7 +3929,7 @@ Használata nem ajánlott.</translation> <translation>Néhány perccel ezelőtt</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3985,14 +4012,6 @@ Használata nem ajánlott.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_id.ts b/translations/client_id.ts new file mode 100644 index 000000000..bc9949abe --- /dev/null +++ b/translations/client_id.ts @@ -0,0 +1,4199 @@ +<?xml version="1.0" ?><!DOCTYPE TS><TS language="id" version="2.1"> +<context> + <name>CloudProviderWrapper</name> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="107"/> + <source>%1 (%2, %3)</source> + <translation>%1 (%2, %3)</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/> + <source>Checking for changes in '%1'</source> + <translation>Memeriksa perubahan pada '%1'</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/> + <source>Syncing %1 of %2 (%3 left)</source> + <translation>Sinkronisasi %1 dari %2 (tersisa %3)</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/> + <source>Syncing %1 of %2</source> + <translation>Sinkronisasi %1 dari %2</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/> + <source>Syncing %1 (%2 left)</source> + <translation>%1 Sinkronisasi (tersisa %2)</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/> + <source>Syncing %1</source> + <translation>Sinkronisasi %1</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> + <source>No recently changed files</source> + <translation>Tidak ada perubahan berkas terbaru</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> + <source>Sync paused</source> + <translation>Sinkronisasi dijeda</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="184"/> + <source>Syncing</source> + <translation>Sinkronisasi berlangsun</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> + <source>Open website</source> + <translation>Buka situs web</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> + <source>Recently changed</source> + <translation>Perubahan terbaru</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> + <source>Pause synchronization</source> + <translation>Jeda sinkronisasi</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> + <source>Help</source> + <translation>Bantuan</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> + <source>Settings</source> + <translation>Pengaturan</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> + <source>Log out</source> + <translation>Log keluar</translation> + </message> + <message> + <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> + <source>Quit sync client</source> + <translation>Hentikan klien sinkron</translation> + </message> +</context> +<context> + <name>Dialog</name> + <message> + <location filename="../src/gui/mnemonicdialog.ui" line="58"/> + <source>Label</source> + <translation>Label</translation> + </message> +</context> +<context> + <name>FileSystem</name> + <message> + <location filename="../src/common/filesystembase.cpp" line="445"/> + <source>Could not make directories in trash</source> + <translation>Tidak dapat membuat direktori pada tempat sampah</translation> + </message> + <message> + <location filename="../src/common/filesystembase.cpp" line="459"/> + <location filename="../src/common/filesystembase.cpp" line="465"/> + <source>Could not move '%1' to '%2'</source> + <translation>Tidak dapat memindahkan '%1' ke '%2'</translation> + </message> + <message> + <location filename="../src/common/filesystembase.cpp" line="502"/> + <source>Moving to the trash is not implemented on this platform</source> + <translation>Memindahkan tempat sampat tidak diimplementasikan pada platform ini</translation> + </message> +</context> +<context> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> + <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation>Pilih direktori lokal pada komputer Anda untuk sinkronisasi</translation> + </message> + <message> + <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/> + <source>&Choose...</source> + <translation>&Pilih...</translation> + </message> +</context> +<context> + <name>FolderWizardTargetPage</name> + <message> + <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> + <source>Select a remote destination folder</source> + <translation>Pilih destinasi folder remote</translation> + </message> + <message> + <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> + <source>Create Folder</source> + <translation>Buat Folder</translation> + </message> + <message> + <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/> + <source>Refresh</source> + <translation>Segarkan</translation> + </message> + <message> + <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/> + <source>Folders</source> + <translation>Folder-folder</translation> + </message> + <message> + <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/> + <source>TextLabel</source> + <translation>LabelTeks</translation> + </message> +</context> +<context> + <name>OCC::AbstractNetworkJob</name> + <message> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="249"/> + <source>Connection timed out</source> + <translation>Koneksi terputus</translation> + </message> + <message> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="251"/> + <source>Unknown error: network reply was deleted</source> + <translation>Galat tidak diketahui: balasan jaringan telah dihapus</translation> + </message> + <message> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="403"/> + <source>Server replied "%1 %2" to "%3 %4"</source> + <translation>Server membalas "%1 %2" ke "%3 %4"</translation> + </message> +</context> +<context> + <name>OCC::AccountManager</name> + <message> + <location filename="../src/gui/accountmanager.cpp" line="353"/> + <source>End to end encryption mnemonic</source> + <translation>Enkripsi mnemonic end to end</translation> + </message> + <message> + <location filename="../src/gui/accountmanager.cpp" line="354"/> + <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> + <translation>Untuk melindungi Identitas Kriptografi Anda, kami mengenkripsinya dengan sebuah mnemonic dari 12 kamus kata. Mohon untuk dicatat dan amankan. Enkripsi ini akan dibutuhkan untuk menambah perangkat lainnya ke akun Anda (seperti ponsel Anda atau laptop).</translation> + </message> +</context> +<context> + <name>OCC::AccountSettings</name> + <message> + <location filename="../src/gui/accountsettings.ui" line="190"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="211"/> + <source>Storage space: ...</source> + <translation>Ruang penyimpanan: ...</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>Folder yang tidak dicentang akan <b>dihapus</b> dari berkas lokal sistem Anda dan tidak akan disinkronisasi ke komputer ini lagi</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="77"/> + <source>Synchronize all</source> + <translation>Sinkronisasi semua</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="84"/> + <source>Synchronize none</source> + <translation>Tidak ada sinkronisasi</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="91"/> + <source>Apply manual changes</source> + <translation>Terapkan perubahan secara manual</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="139"/> + <source>Apply</source> + <translation>Terapkan</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> + <source>Cancel</source> + <translation>Batal</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.ui" line="174"/> + <source>Connected with <server> as <user></source> + <translation>Terhubung dengan <server> sebagai <user></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="188"/> + <source>No account configured.</source> + <translation>Belum ada akun terkonfigurasi</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="216"/> + <source>Add new</source> + <translation>Tambahkan baru</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="224"/> + <source>Remove</source> + <translation>Buang</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="228"/> + <source>Account</source> + <translation>Akun</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Akun ini mendukung enkripsi end-to-end</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Hidupkan enkripsi</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> + <source>Show E2E mnemonic</source> + <translation>Tampilkan E2E mnemonic</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="610"/> + <source>Encrypt</source> + <translation>Enkrip</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> + <source>Choose what to sync</source> + <translation>Pilih apa yang akan disinkron</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="664"/> + <source>Force sync now</source> + <translation>Paksa sinkronisasi sekarang</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="666"/> + <source>Restart sync</source> + <translation>Ulang sinkronisasi</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="675"/> + <source>Remove folder sync connection</source> + <translation>Hapus koneksi sinkronisasi folder</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="746"/> + <source>Folder creation failed</source> + <translation>Pembuatan Folder gagal</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="747"/> + <source><p>Could not create local folder <i>%1</i>.</source> + <translation><p>Tidak dapat membuat folder lokal <i>%1</i></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="800"/> + <source>Confirm Folder Sync Connection Removal</source> + <translation>Konfirmasi Penghapusan Koneksi Sinkronisasi Folder</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="807"/> + <source>Remove Folder Sync Connection</source> + <translation>Hapus Koneksi Sinkronisasi Folder</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="889"/> + <source>Sync Running</source> + <translation>Sinkronisasi berlangsung</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="890"/> + <source>The syncing operation is running.<br/>Do you want to terminate it?</source> + <translation>Operasi sinkronisasi sedang berjalan. <br/>Apakah Anda ingin membatalkannya?</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="979"/> + <source>%1 in use</source> + <translation>%1 digunakan</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> + <source>%1 as <i>%2</i></source> + <translation>%1 sebagai <i>%2</i></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> + <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> + <translation>Versi server %1 sudah usang dan tidak lagi di dukung! Resiko tanggung sendiri.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> + <source>Connected to %1.</source> + <translation>Tersambung ke %1.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> + <source>Server %1 is temporarily unavailable.</source> + <translation>Peladen %1 sementara tidak tersedia.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> + <source>Server %1 is currently in maintenance mode.</source> + <translation>Peladen %1 sementara dalam moda pemeliharaan.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> + <source>Signed out from %1.</source> + <translation>Log keluar dari %1.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> + <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> + <translation>Mendapatkan autorisasi dari browser. <a href='%1'>Klik disini</a> untuk membuka ulang browser.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> + <source>Connecting to %1...</source> + <translation>Menghubungi ke %1...</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> + <source>No connection to %1 at %2.</source> + <translation>Tidak ada koneksi ke %1 di %2.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> + <source>Log in</source> + <translation>Log masuk</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> + <source>There are folders that were not synchronized because they are too big: </source> + <translation>Terdapat folder tidak tersinkronisasi karena terlalu besar:</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> + <source>There are folders that were not synchronized because they are external storages: </source> + <translation>Terdapat folder tidak tersinkronisasi karena penyimpanan eksternal:</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> + <source>There are folders that were not synchronized because they are too big or external storages: </source> + <translation>Terdapat folder tidak tersinkronisasi karena terlalu besar atau penyimpanan ekternal:</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> + <source>Confirm Account Removal</source> + <translation>Konfirmasi pemutusan akun</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> + <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> Apakah Anda ingin menghapus koneksi untuk akun <i> %1</i>?</p> <p><b> Catatan: </b> Aksi ini tidak akan menghapus berkas apapun.</p></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> + <source>Remove connection</source> + <translation>Hapus koneksi</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> + <source>Open folder</source> + <translation>Buka folder</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> + <source>Log out</source> + <translation>Log keluar</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="672"/> + <source>Resume sync</source> + <translation>Lanjutkan sinkron</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="672"/> + <source>Pause sync</source> + <translation>Jeda sinkron</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="801"/> + <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> Apakah Anda ingin menghentikan sinkronisasi folder <i>%1</i>?</p><p><b> Catatan:</b> Aksi ini tidak akan menghapus berkas apapun.</p></translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="966"/> + <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> + <translation>%1 (%3%) dari %2 sedang digunakan. Beberapa folder, termasuk jaringan yang terpasang atau folder yang telah dibagikan, kemungkinan mempunyai beberapa keterbatasan.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="967"/> + <source>%1 of %2 in use</source> + <translation>%1 dari %2 sedang digunakan</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="976"/> + <source>Currently there is no storage usage information available.</source> + <translation>Saat ini tidak ada informasi penggunaan ruang yang tersedia.</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> + <source>No %1 connection configured.</source> + <translation>Tidak ada koneksi %1 yang dikonfigurasi.</translation> + </message> +</context> +<context> + <name>OCC::AccountState</name> + <message> + <location filename="../src/gui/accountstate.cpp" line="120"/> + <source>Signed out</source> + <translation>Log keluar</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="122"/> + <source>Disconnected</source> + <translation>Terputus</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="124"/> + <source>Connected</source> + <translation>Tersambung</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="126"/> + <source>Service unavailable</source> + <translation>Layanan tidak tersedia</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="128"/> + <source>Maintenance mode</source> + <translation>Mode perbaikan</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="130"/> + <source>Network error</source> + <translation>Kesalahan jaringan</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="132"/> + <source>Configuration error</source> + <translation>Kesalahan konfigurasi</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="134"/> + <source>Asking Credentials</source> + <translation>Menanyakan Kredensial</translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="136"/> + <source>Unknown account state</source> + <translation>Kondisi akun tidak diketahui</translation> + </message> +</context> +<context> + <name>OCC::ActivityItemDelegate</name> + <message> + <location filename="../src/gui/activityitemdelegate.cpp" line="131"/> + <source>%1</source> + <translation>%1</translation> + </message> + <message> + <location filename="../src/gui/activityitemdelegate.cpp" line="179"/> + <source>More information</source> + <translation>Informasi lebih lanjut</translation> + </message> + <message> + <location filename="../src/gui/activityitemdelegate.cpp" line="180"/> + <source>Accept</source> + <translation>Terima</translation> + </message> + <message> + <location filename="../src/gui/activityitemdelegate.cpp" line="181"/> + <source>Join</source> + <translation>Gabung</translation> + </message> + <message> + <location filename="../src/gui/activityitemdelegate.cpp" line="198"/> + <source>Open Browser</source> + <translation>Buka Peramban</translation> + </message> +</context> +<context> + <name>OCC::ActivityWidget</name> + <message> + <location filename="../src/gui/activitywidget.cpp" line="56"/> + <source>Accept</source> + <translation>Terima</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="188"/> + <source>Synced</source> + <translation>Tersinkronisasi</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="223"/> + <source>Retry all uploads</source> + <translation>Mencoba semua unggahan</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="338"/> + <source><br/>Account %1 does not have activities enabled.</source> + <translation><br/>Akun %1 tidak memiliki aktivitas yang diaktifkan.</translation> + </message> +</context> +<context> + <name>OCC::AddCertificateDialog</name> + <message> + <location filename="../src/gui/addcertificatedialog.ui" line="17"/> + <source>SSL client certificate authentication</source> + <translation>Sertifikat autentikasi klien SSL</translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.ui" line="23"/> + <source>This server probably requires a SSL client certificate.</source> + <translation>Server ini kemungkinan mengharuskan sebuah sertifikat klien SSL.</translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.ui" line="35"/> + <source>Certificate & Key (pkcs12) :</source> + <translation>Sertifikat & Kunci (pkcs12) : </translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.ui" line="51"/> + <source>Browse...</source> + <translation>Jelajahi...</translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.ui" line="60"/> + <source>Certificate password :</source> + <translation>Kata sandi sertifikat :</translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.cpp" line="38"/> + <source>Select a certificate</source> + <translation>Pilih sertifikat</translation> + </message> + <message> + <location filename="../src/gui/addcertificatedialog.cpp" line="38"/> + <source>Certificate files (*.p12 *.pfx)</source> + <translation>Berkas sertifikat (*.p12 *.pfx)</translation> + </message> +</context> +<context> + <name>OCC::Application</name> + <message> + <location filename="../src/gui/application.cpp" line="192"/> + <source>Error accessing the configuration file</source> + <translation>Galat saat mengakses berkas konfigurasi</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="193"/> + <source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source> + <translation>Terdapat kesalahan saat mengakses berkas konfigurasi pada %1. Mohon untuk memastikan berkas dapat diakses oleh pengguna Anda.</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="196"/> + <source>Quit %1</source> + <translation>Keluar dari %1</translation> + </message> +</context> +<context> + <name>OCC::AuthenticationDialog</name> + <message> + <location filename="../src/gui/authenticationdialog.cpp" line="30"/> + <source>Authentication Required</source> + <translation>Autentikasi Diperlukan</translation> + </message> + <message> + <location filename="../src/gui/authenticationdialog.cpp" line="32"/> + <source>Enter username and password for '%1' at %2.</source> + <translation>Masukkan nama pengguna dan kata sandi untuk '%1' di %2.</translation> + </message> + <message> + <location filename="../src/gui/authenticationdialog.cpp" line="37"/> + <source>&User:</source> + <translation>&Pengguna:</translation> + </message> + <message> + <location filename="../src/gui/authenticationdialog.cpp" line="38"/> + <source>&Password:</source> + <translation>&Kata sandi:</translation> + </message> +</context> +<context> + <name>OCC::CleanupPollsJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> + <source>Error writing metadata to the database</source> + <translation>Kesalahan saat menulis metadata ke database</translation> + </message> +</context> +<context> + <name>OCC::ClientSideEncryption</name> + <message> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> + <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> + <translation>Mohon untuk memasukkan kata sandi (passphrase) enkripsi end to end Anda: <br><br>Pengguna: %2<br>Akun: %3<br></translation> + </message> + <message> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> + <source>Enter E2E passphrase</source> + <translation>Masukkan kata sandi (passphrase) E2E</translation> + </message> +</context> +<context> + <name>OCC::ConnectionValidator</name> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="47"/> + <source>No ownCloud account configured</source> + <translation>Belum ada akun ownCloud yang dikonfigurasi</translation> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <source>The configured server for this client is too old</source> + <translation>Server yang telah dikonfigurasi untuk klien ini sudah terlalu usang</translation> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="283"/> + <source>Please update to the latest server and restart the client.</source> + <translation>Mohon untuk memperbaharui ke server yang terbaru kemudian restart klien.</translation> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="144"/> + <source>Authentication error: Either username or password are wrong.</source> + <translation>Autentikasi bermasalah: Nama pengguna atau kata sandi salah.</translation> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="156"/> + <source>timeout</source> + <translation>waktu habis</translation> + </message> + <message> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> + <source>The provided credentials are not correct</source> + <translation>Kredensial yang telah disediakan tidak benar</translation> + </message> +</context> +<context> + <name>OCC::DiscoveryMainThread</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="631"/> + <source>Aborted by the user</source> + <translation>Dibatalkan oleh pengguna</translation> + </message> +</context> +<context> + <name>OCC::DiscoverySingleDirectoryJob</name> + <message> + <location filename="../src/libsync/discoveryphase.cpp" line="392"/> + <source>The server file discovery reply is missing data.</source> + <translation>Ada data yang hilang di berkas server deteksi balasan.</translation> + </message> +</context> +<context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> + <name>OCC::Folder</name> + <message> + <location filename="../src/gui/folder.cpp" line="141"/> + <source>Local folder %1 does not exist.</source> + <translation>Tidak ditemukan folder lokal %1.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="144"/> + <source>%1 should be a folder but is not.</source> + <translation>%1 seharusnya sebuah folder namun ini bukan.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="147"/> + <source>%1 is not readable.</source> + <translation>%1 tidak dapat dibaca.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="375"/> + <source>%1 has been removed.</source> + <comment>%1 names a file.</comment> + <translation>%1 telah dihapus.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="382"/> + <source>%1 has been downloaded.</source> + <comment>%1 names a file.</comment> + <translation>%1 telah diunduh.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="389"/> + <source>%1 has been updated.</source> + <comment>%1 names a file.</comment> + <translation>%1 telah diperbaharui.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="396"/> + <source>%1 has been renamed to %2.</source> + <comment>%1 and %2 name files.</comment> + <translation>%1 telah diubah namanya ke %2.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="403"/> + <source>%1 has been moved to %2.</source> + <translation>%1 telah dipindah ke %2.</translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="373"/> + <source>%1 and %n other file(s) have been removed.</source> + <translation><numerusform>%1 dan %n berkas lainnya telah dihapus.</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="380"/> + <source>%1 and %n other file(s) have been downloaded.</source> + <translation><numerusform>%1 dan %n berkas lainnya telah diunduh.</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="387"/> + <source>%1 and %n other file(s) have been updated.</source> + <translation><numerusform>%1 dan %n berkas lainnya telah diperbaharui.</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="394"/> + <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> + <translation><numerusform>%1 dan %n berkas lainnya telah dinamai ulang.</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="401"/> + <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> + <translation><numerusform>%1 telah dipindah ke %2 dan juga %n berkas lainnya telah dipindah.</numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="408"/> + <source>%1 has and %n other file(s) have sync conflicts.</source> + <translation><numerusform>%1 dan %n berkas lainnya mempunyai konflik sinkronisasi.</numerusform></translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="410"/> + <source>%1 has a sync conflict. Please check the conflict file!</source> + <translation>%1 memiliki konflik sinkronisasi. Mohon cek kembali berkasnya!</translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folder.cpp" line="415"/> + <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> + <translation><numerusform>%1 dan %n berkas lainnya tidak dapat disinkronisasi disebabkan kesalahan. Lihat catatan log untuk lebih lanjut.</numerusform></translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="417"/> + <source>%1 could not be synced due to an error. See the log for details.</source> + <translation>%1 tidak dapat disinkronisasi disebabkan kesalahan. Lihat catatan log untuk lebih lanjut.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="425"/> + <source>Sync Activity</source> + <translation>Aktivitas Sinkronisasi</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="636"/> + <source>Could not read system exclude file</source> + <translation>Tidak dapat membaca berkas sistem yang dikecualikan</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="957"/> + <source>A new folder larger than %1 MB has been added: %2. +</source> + <translation>Sebuah folder baru lebih dari %1 MB telah ditambahkan: %2. +</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="960"/> + <source>A folder from an external storage has been added. +</source> + <translation>Sebuah folder dari luar ruang penyimpanan telah ditambahkan. +</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="961"/> + <source>Please go in the settings to select it if you wish to download it.</source> + <translation>Mohon untuk ke pengaturan untuk memilihnya jika Anda ingin mengunduhnya.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1016"/> + <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> + <translation>Folder %1 telah dibuat namun dikecualikan dari sinkronisasi sebelumnya. Data yang ada di dalamnya tidak akan disinkronisasi.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1019"/> + <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> + <translation>Berkas %1 telah dibuat namun dikecualikan dari sinkronisasi sebelumnya. Data yang ada di dalamnya tidak akan disinkronisasi.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1030"/> + <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). + +%1</source> + <translation>Perubahan di folder yang tersinkronisasi tidak dapat dilacak reabilitasnya. + +Ini artinya sinkronisasi klien mungkin tidak menggunggah perubahan lokal sesegera mungkin dan justru akan memindai perubahan lokal saja dan dalam waktu senggan akan mengunggahnya (setiap dua jam dari bawaan). + +%1</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1075"/> + <source>All files in the sync folder '%1' folder 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 keep 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>Semua berkas di dalam sinkronisasi folder '%1' telah dihapus dari server. +Perubahan ini akan disinkronisasi ke folder sinkronisasi lokal Anda, termasuk membuat berkas-berkas Anda tidak lagi tersedia kecuali Anda mempunyai hak untuk memulihkannya kembali. +Jika Anda memutuskan untuk berkas Anda tetap tersedia, berkas-berkas Anda akan disinkronisasi ulang dengan server jika Anda mempunyai hak akses untuk melakukannya. +Jika Anda memutuskan untuk menghapusnya, berkas-berkas Anda tidak akan lagi tersedia untuk Anda, kecuali Anda sang pemiliknya.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1084"/> + <source>Download new files?</source> + <translation>Unduh berkas baru?</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1087"/> + <source>Download new files</source> + <translation>Unduh berkas baru</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1088"/> + <source>Keep local files</source> + <translation>Biarkan berkas-berkas lokal tetap ada</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1080"/> + <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. +Are you sure you want to sync those actions with the server? +If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> + <translation>Semua berkas di dalam sinkronisasi folder '%1' telah dihapus dari server. Perubahan ini akan disinkronisasi ke folder sinkronisasi lokal Anda, termasuk membuat berkas-berkas Anda tidak lagi tersedia kecuali Anda memulihkannya kembali. +Anda yakin ingin mesinkronisasi aksi tersebut dengan server? +Jika ini adalah sebuah ketidaksengajaan dan Anda memutuskan untuk berkas Anda tetap tersedia, berkas-berkas Anda akan disinkronisasi ulang dengan server.</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1105"/> + <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> + <translation>Sinkronisasi ini akan mereset berkas-berkas ke waktu sebelumnya di dalam folder sinkronisasi '%1'. +Ini disebabkan karena sebuah cadangan telah dipulihkan di server. +Melanjutkan sinkronisasi seperti biasanya akan menyebabkan semua berkas Anda ditimpa dengan berkas yang lama di kondisi yang lama. Apakah Anda ingin tetap membuat berkas lokal paling baru Anda sebagai berkas yang berkonflik?</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1110"/> + <source>Backup detected</source> + <translation>Cadangan ditemukan</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1113"/> + <source>Normal Synchronisation</source> + <translation>Sinkronisasi Normal</translation> + </message> + <message> + <location filename="../src/gui/folder.cpp" line="1114"/> + <source>Keep Local Files as Conflict</source> + <translation>Buat Berkas Lokal sebagai Konflik</translation> + </message> +</context> +<context> + <name>OCC::FolderMan</name> + <message> + <location filename="../src/gui/folderman.cpp" line="274"/> + <source>Could not reset folder state</source> + <translation>Tidak dapat mereset keadaan folder</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="275"/> + <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> + <translation>Sebuah jurnal sinkronisasi lama '%1' telah ditemukan, namun tidak dapat menghapusnya. Mohon untuk memastikan bahwa tida ada aplikasi yang sedang menggunakannya.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1023"/> + <source> (backup)</source> + <translation>(cadangan)</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1028"/> + <source> (backup %1)</source> + <translation>(cadangkan %1)</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1206"/> + <source>Undefined State.</source> + <translation>Kondisi Yang Tidak Ditentukan</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1209"/> + <source>Waiting to start syncing.</source> + <translation>Menunggu untuk memulai sinkronisasi.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1212"/> + <source>Preparing for sync.</source> + <translation>Persiapan untuk sinkronisasi.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1215"/> + <source>Sync is running.</source> + <translation>Sinkronisasi sedang berjalan.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1220"/> + <source>Sync was successful, unresolved conflicts.</source> + <translation>Sinkronisasi berhasi, konflik belum diselesaikan.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1222"/> + <source>Last Sync was successful.</source> + <translation>Sinkronisasi terakhir sukses.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1228"/> + <source>Setup Error.</source> + <translation>Kesalahan Persiapan.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1231"/> + <source>User Abort.</source> + <translation>Pengguna Batalkan.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1234"/> + <source>Sync is paused.</source> + <translation>Sinkronisasi dijeda.</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1240"/> + <source>%1 (Sync is paused)</source> + <translation>%1 (Sinkronisasi dijeda)</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1248"/> + <source>No valid folder selected!</source> + <translation>Tidak ada folder yang valid dipilih!</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1258"/> + <source>The selected path is not a folder!</source> + <translation>Jalur yang dipilih bukanlah sebuah folder!</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1262"/> + <source>You have no permission to write to the selected folder!</source> + <translation>Anda tidak memiliki ijin untuk menulis ke folder yang dipilih!</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1318"/> + <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> + <translation>Sudah ada sinkronisasi dari server ke folder lokal ini. Mohon pilih folder lokal lainnya!</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1298"/> + <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> + <translation>Folder lokal %1 sudah terdapat sebuah folder yang digunakan di dalam sebuah koneksi sinkronisasi folder. Mohon pilih yang lainnya!</translation> + </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1304"/> + <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> + <translation>Folder lokal %1 sudah terdapat sebuah folder yang digunakan di dalam sebuah koneksi sinkronisasi folder. Mohon pilih yang lainnya!</translation> + </message> +</context> +<context> + <name>OCC::FolderStatusDelegate</name> + <message> + <location filename="../src/gui/folderstatusdelegate.cpp" line="48"/> + <source>Add Folder Sync Connection</source> + <translation>Tambah Koneksi Sinkronisasi Folder</translation> + </message> + <message> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> + <source>File</source> + <translation>Berkas</translation> + </message> +</context> +<context> + <name>OCC::FolderStatusModel</name> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> + <source>You need to be connected to add a folder</source> + <translation>Anda diharuskan terhubung untuk menambahkan sebuah folder</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="146"/> + <source>Click this button to add a folder to synchronize.</source> + <translation>Klik tombol ini untuk menambahkan sebuah folder untuk disinkronisasi.</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="157"/> + <source>%1 (%2)</source> + <extracomment>Example text: "File.txt (23KB)"</extracomment> + <translation>%1 (%2)</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="186"/> + <source>Error while loading the list of folders from the server.</source> + <translation>Galat saat memuat daftar folder dari server.</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> + <source>Signed out</source> + <translation>Telah keluar</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="189"/> + <source>Fetching folder list from server...</source> + <translation>Memuat daftar folder dari server....</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <source>There are unresolved conflicts. Click for details.</source> + <translation>Terdapat konflik yang belum diselesaikan. Klik untuk detilnya.</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> + <source>Reconciling changes</source> + <translation>Mencocokkan perubahan</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> + <source>, '%1'</source> + <extracomment>Build a list of file names</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> + <source>'%1'</source> + <extracomment>Argument is a file name</extracomment> + <translation>'%1'</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <source>Syncing %1</source> + <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> + <translation>Mensinkronisasi %1</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> + <source>, </source> + <translation>,</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <source>download %1/s</source> + <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> + <translation>unduhan %1/s</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <source>upload %1/s</source> + <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> + <translation>unggahan %1/s</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> + <source>Checking for changes in remote '%1'</source> + <translation>Mengecek perubahan di remote '%1'</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> + <source>Checking for changes in local '%1'</source> + <translation>Mengecek perubahan di '%1' lokal</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> + <source>↓ %1/s</source> + <translation>↓ %1/s</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> + <source>↑ %1/s</source> + <translation>↑ %1/s</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> + <source>%1 %2 (%3 of %4)</source> + <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> + <translation>%1 %2 (%3 dari %4)</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> + <source>%1 %2</source> + <extracomment>Example text: "uploading foobar.png"</extracomment> + <translation>%1 %2</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> + <source>%5 left, %1 of %2, file %3 of %4</source> + <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> + <translation>Sisa %5, %1 dari %2, berkas ke %3 dari %4</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> + <source>%1 of %2, file %3 of %4</source> + <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> + <translation>%1 dari %2, berkas ke %3 dari %4</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> + <source>file %1 of %2</source> + <translation>Berkas %1 dari %2</translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <source>Waiting...</source> + <translation>Menunggu...</translation> + </message> + <message numerus="yes"> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> + <source>Waiting for %n other folder(s)...</source> + <translation><numerusform>Menunggu untuk %n folder lainnya...</numerusform></translation> + </message> + <message> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> + <source>Preparing to sync...</source> + <translation>Menunggu untuk sinkronisasi...</translation> + </message> +</context> +<context> + <name>OCC::FolderWatcherPrivate</name> + <message> + <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> + <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> + <translation>Masalah ini sering kali terjadi ketika inotify watches kehausan. Cek halaman FAQ untuk lebih lanjut.</translation> + </message> +</context> +<context> + <name>OCC::FolderWizard</name> + <message> + <location filename="../src/gui/folderwizard.cpp" line="550"/> + <source>Add Folder Sync Connection</source> + <translation>Tambah Koneksi Sinkronisasi Folder</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="552"/> + <source>Add Sync Connection</source> + <translation>Tambah Koneksi Sinkronisasi</translation> + </message> +</context> +<context> + <name>OCC::FolderWizardLocalPath</name> + <message> + <location filename="../src/gui/folderwizard.cpp" line="67"/> + <source>Click to select a local folder to sync.</source> + <translation>Klik untuk memilih sebuah folder lokal untuk disinkronisasi.</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="74"/> + <source>Enter the path to the local folder.</source> + <translation>Masukkan sebuah jalur ke folder lokal.</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="135"/> + <source>Select the source folder</source> + <translation>Pilih sumber folder</translation> + </message> +</context> +<context> + <name>OCC::FolderWizardRemotePath</name> + <message> + <location filename="../src/gui/folderwizard.cpp" line="183"/> + <source>Create Remote Folder</source> + <translation>Buat Folder Remote</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="184"/> + <source>Enter the name of the new folder to be created below '%1':</source> + <translation>Masukkan nama untuk folder baru yang akan dibuat dibawah '%1':</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="214"/> + <source>Folder was successfully created on %1.</source> + <translation>Folder telah sukses dibuat di %1.</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="225"/> + <source>Authentication failed accessing %1</source> + <translation>Autentikasi gagal saat mengakses %1</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="227"/> + <source>Failed to create the folder on %1. Please check manually.</source> + <translation>Gagal untuk membuat folder baru di %1. Mohon cek secara manual.</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="236"/> + <source>Failed to list a folder. Error: %1</source> + <translation>Gagal untuk mengurutkan daftar folder. Galat: %1</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="317"/> + <source>Choose this to sync the entire account</source> + <translation>Pilih ini untuk mensinkronisasi ke seluruh akun</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="447"/> + <source>This folder is already being synced.</source> + <translation>Folder ini telah disinkronisasi.</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> + <translation>Anda sudah mensinkronisasi <i>%1</i>, yang mana termasuk dalam folder <i>%2</i>.</translation> + </message> +</context> +<context> + <name>OCC::FormatWarningsWizardPage</name> + <message> + <location filename="../src/gui/folderwizard.cpp" line="48"/> + <source><b>Warning:</b> %1</source> + <translation><b>Peringatan:</b> %1</translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Warning:</b></source> + <translation><b>Peringatan:</b></translation> + </message> +</context> +<context> + <name>OCC::GETFileJob</name> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="186"/> + <source>No E-Tag received from server, check Proxy/Gateway</source> + <translation>Tidak ada E-Tag yang diterima dari server, cek Proksi/Gerbang</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="193"/> + <source>We received a different E-Tag for resuming. Retrying next time.</source> + <translation>Kami menerima sebuah E-Tag yang berbeda untuk dilanjutkan. Mencoba lain waktu.</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="220"/> + <source>Server returned wrong content-range</source> + <translation>Server kembali dengan jarak-konten yang salah</translation> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="332"/> + <source>Connection Timeout</source> + <translation>Waktu Koneksi Habis</translation> + </message> +</context> +<context> + <name>OCC::GeneralSettings</name> + <message> + <location filename="../src/gui/generalsettings.ui" line="41"/> + <source>Legal notice</source> + <translation>Pemberitahuan hukum</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="66"/> + <source>General Settings</source> + <translation>Pengaturan Umum</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="72"/> + <source>For System Tray</source> + <translation>Untuk Tray Sistem</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="89"/> + <source>Show Server &Notifications</source> + <translation>Tampilkan Server & Notifikasi</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="163"/> + <source>Advanced</source> + <translation>Tingkat Lanjut</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="195"/> + <source>Ask for confirmation before synchronizing folders larger than</source> + <translation>Meminta untuk konfirmasi sebelum sinkronisasi folder yang melebihi dari</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="215"/> + <source>MB</source> + <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> + <translation>MB</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="239"/> + <source>Ask for confirmation before synchronizing external storages</source> + <translation>Meminta konfirmasi sebelum sinkronisasi penyimpanan eksternal</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="82"/> + <source>&Launch on System Startup</source> + <translation>&Luncurkan saat Sistem Dimulai</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="75"/> + <source>Use &Monochrome Icons</source> + <translation>Gunakan Ikon &Monokrom</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="171"/> + <source>Edit &Ignored Files</source> + <translation>Sunting &Abaikan Berkas</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="250"/> + <source>Show sync folders in &Explorer's Navigation Pane</source> + <translation>Tampilkan folder yang disinkronisasi di Panel Navigasi &Explorer</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="267"/> + <source>S&how crash reporter</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="20"/> + <location filename="../src/gui/generalsettings.ui" line="32"/> + <source>About</source> + <translation>Tentang</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="99"/> + <source>Updates</source> + <translation>Pembaruan</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="124"/> + <source>&Restart && Update</source> + <translation>&Hidupkan ulang && Perbarui</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="49"/> + <source>Server notifications that require attention.</source> + <translation>Notifikasi server yang memerlukan perhatian.</translation> + </message> +</context> +<context> + <name>OCC::GetOrCreatePublicLinkShare</name> + <message> + <location filename="../src/gui/socketapi.cpp" line="520"/> + <source>Sharing error</source> + <translation>Gagal berbagi</translation> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="521"/> + <source>Could not retrieve or create the public link share. Error: + +%1</source> + <translation>Tidak dapat mengambil atau membuat berbagi tautan publik. Galat: + +%1</translation> + </message> +</context> +<context> + <name>OCC::HttpCredentialsGui</name> + <message> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="100"/> + <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> + <translation>Mohon untuk memasukkan kata sandi %1:<br><br>Pengguna: %2<br>Akun: %3<br></translation> + </message> + <message> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="114"/> + <source>Reading from keychain failed with error: '%1'</source> + <translation>Membaca dari keychain gagal dengan galat: '%1'</translation> + </message> + <message> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="120"/> + <source>Enter Password</source> + <translation>Masukkan Kata Sandi</translation> + </message> + <message> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="156"/> + <source><a href="%1">Click here</a> to request an app password from the web interface.</source> + <translation><a href="%1">Klik disini</a> untuk meminta kata sandi aplikasi dari antarmuka situs.</translation> + </message> +</context> +<context> + <name>OCC::IgnoreListEditor</name> + <message> + <location filename="../src/gui/ignorelisteditor.ui" line="14"/> + <source>Ignored Files Editor</source> + <translation>Abaikan Editor Berkas</translation> + </message> + <message> + <location filename="../src/gui/ignorelisteditor.ui" line="20"/> + <source>Global Ignore Settings</source> + <translation>Pengaturan Pengabaian Global</translation> + </message> + <message> + <location filename="../src/gui/ignorelisteditor.ui" line="26"/> + <source>Sync hidden files</source> + <translation>Sinkronisasi berkas tersembunyi</translation> + </message> + <message> + <location filename="../src/gui/ignorelisteditor.ui" line="36"/> + <source>Files Ignored by Patterns</source> + <translation>Berkas Diabaikan Menurut Pola</translation> + </message> + <message> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Entri ini disediakan oleh sistem di '%1' dan tidak dapat dimodifikasi dalam tampilan ini.</translation> + </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> + <source>Pattern</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> + <source>Allow Deletion</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> + <source>Remove</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> + <source>Could not open file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> + <source>Cannot write changes to '%1'.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> + <source>Add Ignore Pattern</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> + <source>Add a new ignore pattern:</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::LegalNotice</name> + <message> + <location filename="../src/gui/legalnotice.ui" line="26"/> + <source>Legal notice</source> + <translation>Pemberitahuan hukum</translation> + </message> + <message> + <location filename="../src/gui/legalnotice.ui" line="58"/> + <source>Close</source> + <translation>Tutup</translation> + </message> + <message> + <location filename="../src/gui/legalnotice.cpp" line="27"/> + <source><p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></source> + <translation><p>Hak Cipta 2017-2018 Nextcloud GmbH<br />Hak Cipta 2012-2018 ownCloud GmbH</p></translation> + </message> + <message> + <location filename="../src/gui/legalnotice.cpp" line="30"/> + <source><p>Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.</p></source> + <translation><p>Lisensi dibawah Lisensi Umum Publik GNU (GPL) Versi 2.0 atau versi termutakhir apapun.</p></translation> + </message> +</context> +<context> + <name>OCC::LogBrowser</name> + <message> + <location filename="../src/gui/logbrowser.cpp" line="58"/> + <source>Log Output</source> + <translation>Log Keluaran</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="70"/> + <source>&Search:</source> + <translation>&Cari:</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="78"/> + <source>&Find</source> + <translation>&Temukan</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="89"/> + <source>&Capture debug messages</source> + <translation>&Tangkap pesan debug</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="101"/> + <source>Permanently save logs</source> + <translation>Simpan log secara permanen</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="103"/> + <source>When this option is enabled and no other logging is configured, logs will be written to a temporary folder and expire after a few hours. This setting persists across client restarts. + +Logs will be written to %1</source> + <translation>Ketika opsi ini dinyalakan dan tidak ada logging yang dikonfigurasikan, log akan ditulis di folder sementara dan akan kadaluarsa setelah beberapa jam. Pengaturan ini akan tetap ada untuk semua klien saat menghidupkan ulang. +</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="115"/> + <source>Clear</source> + <translation>Bersihkan</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="116"/> + <source>Clear the log display.</source> + <translation>Bersihkan tampilan log</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="122"/> + <source>S&ave</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="123"/> + <source>Save the log file to a file on disk for debugging.</source> + <translation>Simpan berkas log ke sebuah berkas di cakram untuk pendebug-an.</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="212"/> + <source>Save log file</source> + <translation>Simpan berkas log</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="222"/> + <source>Error</source> + <translation>Galat</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="222"/> + <source>Could not write to log file %1</source> + <translation>Tidak dapat menulis berkas log %1</translation> + </message> +</context> +<context> + <name>OCC::Logger</name> + <message> + <location filename="../src/libsync/logger.cpp" line="162"/> + <source>Error</source> + <translation>Galat</translation> + </message> + <message> + <location filename="../src/libsync/logger.cpp" line="163"/> + <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> + <translation><nobr>Berkas '%1'<br/>tidak dapat dibuka untuk ditulis.<br/><br/>Keluaran log <b>tidak</b>dapat disimpan!</nobr></translation> + </message> +</context> +<context> + <name>OCC::NSISUpdater</name> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="332"/> + <source>New Version Available</source> + <translation>Versi Terbaru Tersedia</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="338"/> + <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> + <translation><p>Versi terbaru telah tersedia untuk Klien %1.</p><p><b>%2</b>telah tersedia untuk diunduh. Versi saat ini yang telah dipasang %3.</p></translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="352"/> + <source>Skip this version</source> + <translation>Lewati versi ini</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="353"/> + <source>Skip this time</source> + <translation>Lewati saat ini</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="354"/> + <source>Get update</source> + <translation>Dapatkan pembaruan</translation> + </message> +</context> +<context> + <name>OCC::NetworkSettings</name> + <message> + <location filename="../src/gui/networksettings.ui" line="23"/> + <source>Proxy Settings</source> + <translation>Pengaturan Proksi</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="29"/> + <source>No Proxy</source> + <translation>Tidak Ada Proksi</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="42"/> + <source>Use system proxy</source> + <translation>Gunakan Proksi Sistem</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="52"/> + <source>Specify proxy manually as</source> + <translation>Tentukan proksi secara manual sebagai</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="80"/> + <source>Host</source> + <translation>Host</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="100"/> + <source>:</source> + <translation>:</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="131"/> + <source>Proxy server requires authentication</source> + <translation>Server proksi membutuhkan autentikasi</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="190"/> + <source>Download Bandwidth</source> + <translation>Bandwidth Unduhan</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="196"/> + <location filename="../src/gui/networksettings.ui" line="275"/> + <source>Limit to</source> + <translation>Batas hingga</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="241"/> + <location filename="../src/gui/networksettings.ui" line="320"/> + <source>KBytes/s</source> + <translation>KBytes/s</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="203"/> + <location filename="../src/gui/networksettings.ui" line="292"/> + <source>No limit</source> + <translation>Tidak ada limit</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="250"/> + <location filename="../src/gui/networksettings.ui" line="282"/> + <source>Limit to 3/4 of estimated bandwidth</source> + <translation>Limit hingga 3/4 dari estimasi bandwidth</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="269"/> + <source>Upload Bandwidth</source> + <translation>Bandwidth Unggahan</translation> + </message> + <message> + <location filename="../src/gui/networksettings.ui" line="253"/> + <location filename="../src/gui/networksettings.ui" line="285"/> + <source>Limit automatically</source> + <translation>Otomatikan batas</translation> + </message> + <message> + <location filename="../src/gui/networksettings.cpp" line="37"/> + <source>Hostname of proxy server</source> + <translation>Nama Host server proksi</translation> + </message> + <message> + <location filename="../src/gui/networksettings.cpp" line="38"/> + <source>Username for proxy server</source> + <translation>Nama pengguna server proksi</translation> + </message> + <message> + <location filename="../src/gui/networksettings.cpp" line="39"/> + <source>Password for proxy server</source> + <translation>Kata sandi server proksi</translation> + </message> + <message> + <location filename="../src/gui/networksettings.cpp" line="41"/> + <source>HTTP(S) proxy</source> + <translation>Proksi HTTP(S)</translation> + </message> + <message> + <location filename="../src/gui/networksettings.cpp" line="42"/> + <source>SOCKS5 proxy</source> + <translation>Proksi SOCKS5</translation> + </message> +</context> +<context> + <name>OCC::OAuth</name> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="112"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Galat terjadi dari server: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="115"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Terdapat galat saat mengakses endpoint 'token': <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="118"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Tidak dapat mengurai JSON yang didapat dari server: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="121"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Balasan dari server tidak terdapat semua bidang yang diekspektasi</translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="125"/> + <source><h1>Login Error</h1><p>%1</p></source> + <translation><h1>Gagal Masuk</h1><p>%1</p></translation> + </message> + <message> + <location filename="../src/gui/creds/oauth.cpp" line="131"/> + <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> + <translation><h1>Pengguna salah</h1><p>Anda telah masuk dengan pengguna<em>%1</em>, namun harus masuk dengan pengguna <em>%2</em>. <br>Mohon untuk keluar dari %3 di tab lainnya, kemudian <a href='%4'>klik disini</a> dan masuk kembali sebagai pengguna %2</p></translation> + </message> +</context> +<context> + <name>OCC::OCUpdater</name> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="103"/> + <source>New %1 Update Ready</source> + <translation>%1 Pembaruan Baru Siap</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="104"/> + <source>A new update for %1 is about to be installed. The updater may ask +for additional privileges during the process.</source> + <translation>Sebuah pembaruan baru untuk %1 akan dipasang. Pemasang pembaruan mungkin akan meminta +beberapa ijin pada saat proses berjalan.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="143"/> + <source>Downloading version %1. Please wait...</source> + <translation>Mengunduh versi %1. Mohon tunggu...</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="147"/> + <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> + <translation>Tidak dapat mengunduh pembaruan. Klik <a href='%1'>disini</a> untuk mengunduh pembaruan secara manual.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="149"/> + <source>Could not check for new updates.</source> + <translation>Tidak dapat mengecek pembaruan baru.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="145"/> + <source>%1 version %2 available. Restart application to start the update.</source> + <translation>%1 versi %2 tersedia. Hidupkan ulang aplikasi untuk memulai pembaruan.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="151"/> + <source>New %1 version %2 available. Please use the system's update tool to install it.</source> + <translation>%1 baru versi %2 tersedia. Mohon untuk gunakan alat pembaruan sistem untuk memasangnya.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="153"/> + <source>Checking update server...</source> + <translation>Mengecek pembaruan server...</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="155"/> + <source>Update status is unknown: Did not check for new updates.</source> + <translation>Status pembaruan tidak diketahui: Tidak mengecek untuk pembaruan baru.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="159"/> + <source>No updates available. Your installation is at the latest version.</source> + <translation>Tidak ada pembaruan tersedia. Instalasi Anda sudah paling mutakhir.</translation> + </message> + <message> + <location filename="../src/gui/updater/ocupdater.cpp" line="178"/> + <source>Update Check</source> + <translation>Pembaruan Dicek</translation> + </message> +</context> +<context> + <name>OCC::OwncloudAdvancedSetupPage</name> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="49"/> + <source>Connect to %1</source> + <translation>Hubungkan ke %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/> + <source>Setup local folder options</source> + <translation>Atur opsi folder lokal</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="59"/> + <source>Connect...</source> + <translation>Menghubungkan...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="157"/> + <source>%1 folder '%2' is synced to local folder '%3'</source> + <translation>%1 folder '%2' disinkronisasi ke folder lokal '%3'</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="160"/> + <source>Sync the folder '%1'</source> + <translation>Sinkronkan folder '%1'</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="165"/> + <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> + <translation><p><small><strong>Peringatan:</strong> Lokal folder tidak kosong. Pilih sebuah resolusi!</small></p></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/> + <source>Free space: %1</source> + <translation>Ruang bebas: %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> + <source>Local Sync Folder</source> + <translation>Folder Sinkronisasi Lokal</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="340"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="370"/> + <source>(%1)</source> + <translation>(%1)</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> + <source>There isn't enough free space in the local folder!</source> + <translation>Tidak ada ruang bebas yang cukup di folder lokal!</translation> + </message> +</context> +<context> + <name>OCC::OwncloudConnectionMethodDialog</name> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> + <source>Connection failed</source> + <translation>Koneksi gagal</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="43"/> + <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> + <translation><html><head/><body><p>Gagal menghubungkan ke alamat aman server yang ditentukan. Bagaimana Anda ingin melanjutkannya?</p></body></html></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> + <source>Select a different URL</source> + <translation>Pilih sebuah URL yang berbeda</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="62"/> + <source>Retry unencrypted over HTTP (insecure)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="69"/> + <source>Configure client-side TLS certificate</source> + <translation>Atur sertifikat sisi-klien TLS</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> + <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> + <translation><html><head/><body><p>Gagal menghubungkan ke alamat aman server <em>%1</em>. Bagaimana Anda ingin melanjutkannya?</p></body></html></translation> + </message> +</context> +<context> + <name>OCC::OwncloudHttpCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> + <source>&Email</source> + <translation>&Email</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="59"/> + <source>Connect to %1</source> + <translation>Hubungkan ke %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/> + <source>Enter user credentials</source> + <translation>Masukkan kredensial pengguna</translation> + </message> +</context> +<context> + <name>OCC::OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/> + <source>Connect to %1</source> + <translation>Hubungkan ke %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <source>Login in your browser</source> + <translation>Masuk ke peramban Anda</translation> + </message> +</context> +<context> + <name>OCC::OwncloudSetupPage</name> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> + <source>Connect to %1</source> + <translation>Hubungkan ke %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="55"/> + <source>Setup %1 server</source> + <translation>Atur server %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="83"/> + <source>Keep your data secure and under your control</source> + <translation>Buat data Anda aman dan tetap dalam kontrol Anda</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/> + <source>Secure collaboration & file exchange</source> + <translation>Amankan kolaborasi & pertukaran berkas</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/> + <source>Easy-to-use web mail, calendaring & contacts</source> + <translation>Web mail, kalendar & kontak yang mudah digunakan</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/> + <source>Screensharing, online meetings & web conferences</source> + <translation>Bagikan layar, online meetings & konferensi web</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="180"/> + <source>This url is NOT secure as it is not encrypted. +It is not advisable to use it.</source> + <translation>Url ini TIDAK aman karena tidak dienkripsi. +Tidak disarankan untuk digunakan.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="184"/> + <source>This url is secure. You can use it.</source> + <translation>Url ini aman. Anda dapat menggunakannya.</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="223"/> + <source>&Next ></source> + <translation>&Lanjut></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> + <source>Invalid URL</source> + <translation>URL tidak valid</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> + <source>Could not load certificate. Maybe wrong password?</source> + <translation>Tidak dapat memuat sertifikat. Mungkin salah kata sandi?</translation> + </message> +</context> +<context> + <name>OCC::OwncloudSetupWizard</name> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> + <translation><font color="green">Sukses terhubung ke %1: %2 versi %3 (%4)</font><br/><br/></translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/> + <source>Failed to connect to %1 at %2:<br/>%3</source> + <translation>Gagal terhubung ke %1 di %2:<br/>%3</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="315"/> + <source>Timeout while trying to connect to %1 at %2.</source> + <translation>Waktu habis saat mencoba untuk menghubungkan ke %1 di %2.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="334"/> + <source>Trying to connect to %1 at %2...</source> + <translation>Mencoba terhubung ke %1 di %2...</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="385"/> + <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> + <translation>Permintaan autentikasi ke server telah dialihkan ke '%1'. URL sangat buruk, server salah konfigurasi.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/> + <source>There was an invalid response to an authenticated webdav request</source> + <translation>Terdapat respon yang tidak valid untuk permintaan autentikasi webdav</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> + <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> + <translation>Akses ditolak dari server. Untuk memverifikasi bahwa Anda memiliki akses yang benar, <a href="%1">klik disini</a> untuk akses ke layanan dengan peramban Anda.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="278"/> + <source>Invalid URL</source> + <translation>URL Tidak Valid</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/> + <source>The server reported the following error:</source> + <translation>Server melaporkan galat sebagai berikut:</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/> + <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> + <translation>Folder sinkronisasi lokal %1 sudah ada, mengatur untuk disinkronisasi.<br/><br/></translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/> + <source>Creating local sync folder %1...</source> + <translation>Membuat sikronisasi folder lokal %1...</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="459"/> + <source>ok</source> + <translation>ok</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="461"/> + <source>failed.</source> + <translation>gagal.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="463"/> + <source>Could not create local folder %1</source> + <translation>Tidak dapat membuat folder lokal %1</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> + <source>No remote folder specified!</source> + <translation>Tidak ada folder remote yang ditentukan!</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> + <source>Error: %1</source> + <translation>Galat: %1</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <source>creating folder on Nextcloud: %1</source> + <translation>Membuat folder di Nextcloud: %1</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> + <source>Remote folder %1 created successfully.</source> + <translation>Folder remote %1 sukses dibuat.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> + <source>The remote folder %1 already exists. Connecting it for syncing.</source> + <translation>Folder remote %1 sudah ada. Menghubungkan untuk sinkronisasi.</translation> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <source>The folder creation resulted in HTTP error code %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> + <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> + <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 type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> + <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> + <source>A sync connection from %1 to remote directory %2 was set up.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> + <source>Successfully connected to %1!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> + <source>Connection to %1 could not be established. Please check again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> + <source>Folder rename failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> + <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 type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> + <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudWizard</name> + <message> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> + <source>%1 Connection Wizard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> + <source>Skip folders configuration</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::OwncloudWizardResultPage</name> + <message> + <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="36"/> + <source>Everything set up!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="40"/> + <source>Open Local Folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="48"/> + <source>Open %1 in Browser</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PollJob</name> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="140"/> + <source>Invalid JSON reply from the poll URL</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateDirectory</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> + <source>Error writing metadata to the database</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateDownloadFile</name> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <source>File %1 can not be downloaded because encryption information is missing.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="434"/> + <source>File %1 can not be downloaded because of a local file name clash!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="484"/> + <source>The download would reduce free local disk space below the limit</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="488"/> + <source>Free space on disk is less than %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> + <source>File was deleted from server</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> + <source>The file could not be downloaded completely.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> + <source>The downloaded file is empty despite that the server announced it should have been %1.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> + <source>File %1 cannot be saved because of a local file name clash!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> + <source>File has changed since discovery</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> + <source>Error writing metadata to the database</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateItemJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="234"/> + <source>; Restoration Failed: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> + <source>A file or folder was removed from a read only share, but restoring failed: %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateLocalMkdir</name> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="170"/> + <source>could not delete file %1, error: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="185"/> + <source>Attention, possible case sensitivity clash with %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="191"/> + <source>could not create folder %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="203"/> + <source>Error writing metadata to the database</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateLocalRemove</name> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="77"/> + <source>Error removing '%1': %2;</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="102"/> + <source>Could not remove folder '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="123"/> + <source>Could not remove %1 because of a local file name clash</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateLocalRename</name> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="241"/> + <source>File %1 can not be renamed to %2 because of a local file name clash</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="277"/> + <source>Error writing metadata to the database</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateRemoteDelete</name> + <message> + <location filename="../src/libsync/propagateremotedelete.cpp" line="130"/> + <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateRemoteMkdir</name> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="99"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/> + <source>Error writing metadata to the database</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateRemoteMove</name> + <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="134"/> + <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="166"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="172"/> + <source>Error writing metadata to the database</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateUploadFileCommon</name> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="214"/> + <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="348"/> + <source>Local file changed during syncing. It will be resumed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="362"/> + <source>Local file changed during sync.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> + <location filename="../src/libsync/propagateupload.cpp" line="602"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="334"/> + <source>File Removed (start upload) %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="684"/> + <source>Error writing metadata to the database</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateUploadFileNG</name> + <message> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> + <source>The local file was removed during sync.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> + <source>Local file changed during sync.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> + <source>Unexpected return code from server (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> + <source>Missing File ID from server</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> + <source>Missing ETag from server</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::PropagateUploadFileV1</name> + <message> + <location filename="../src/libsync/propagateuploadv1.cpp" line="213"/> + <source>Poll URL missing</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <source>The local file was removed during sync.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <source>Local file changed during sync.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::ProxyAuthDialog</name> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="20"/> + <source>Proxy authentication required</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="26"/> + <source>Username:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="36"/> + <source>Proxy:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="43"/> + <source>The proxy server needs a username and password.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="50"/> + <source>Password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/proxyauthdialog.ui" line="74"/> + <source>TextLabel</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::SelectiveSyncDialog</name> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <source>Choose What to Sync</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::SelectiveSyncWidget</name> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/> + <source>Loading ...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="79"/> + <source>Deselect remote folders you do not wish to synchronize.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="95"/> + <source>Name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="96"/> + <source>Size</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <source>No subfolders currently on the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <source>An error occurred while loading the list of sub folders.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::ServerNotificationHandler</name> + <message> + <location filename="../src/gui/servernotificationhandler.cpp" line="153"/> + <source>Dismiss</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::SettingsDialog</name> + <message> + <location filename="../src/gui/settingsdialog.ui" line="14"/> + <source>Settings</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <source>Activity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="105"/> + <source>General</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="111"/> + <source>Network</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/settingsdialog.cpp" line="234"/> + <source>Account</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::SettingsDialogMac</name> + <message> + <location filename="../src/gui/settingsdialogmac.cpp" line="92"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/settingsdialogmac.cpp" line="155"/> + <source>Activity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/settingsdialogmac.cpp" line="106"/> + <source>General</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/settingsdialogmac.cpp" line="110"/> + <source>Network</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/settingsdialogmac.cpp" line="138"/> + <location filename="../src/gui/settingsdialogmac.cpp" line="231"/> + <source>Account</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::ShareDialog</name> + <message> + <location filename="../src/gui/sharedialog.ui" line="92"/> + <source>share label</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="67"/> + <source>ownCloud Path:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.ui" line="123"/> + <source>Icon</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="104"/> + <source>%1 Sharing</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="80"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="101"/> + <source>Folder: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharedialog.cpp" line="272"/> + <source>The file can not be shared because it was shared without sharing permission.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::ShareLinkWidget</name> + <message> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> + <source>&Share link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> + <source>Password:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> + <source>Expiration date:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> + <source>TextLabel</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="409"/> + <source>Delete</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="149"/> + <source>Allow Editing</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="155"/> + <source>Read only</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> + <source>Allow Upload && Editing</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <source>File Drop (Upload Only)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="183"/> + <source>Password Protect</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="200"/> + <source>Expiration Date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="219"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="224"/> + <source>Add another link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="402"/> + <source>Confirm Link Share Deletion</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="403"/> + <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 type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="410"/> + <source>Cancel</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sharelinkwidget.cpp" line="428"/> + <source>Public link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::ShareUserGroupWidget</name> + <message> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> + <source>Share with users or groups ...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> + <source>No results for '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> + <source>I shared something with you</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::ShareUserLine</name> + <message> + <location filename="../src/gui/shareuserline.ui" line="66"/> + <source>User name</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareuserline.ui" line="82"/> + <source>can edit</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> + <source>Can reshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> + <source>Can create</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> + <source>Can change</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> + <source>Can delete</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::ShibbolethCredentials</name> + <message> + <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/> + <source>Login Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/> + <source>You must sign in as user %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::ShibbolethWebView</name> + <message> + <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="83"/> + <source>%1 - Authenticate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> + <source>Reauthentication required</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> + <source>Your session has expired. You need to re-login to continue to use the client.</source> + <translation type="unfinished"/> + </message> +</context> +<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 type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="491"/> + <source>Context menu share</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="612"/> + <source>I shared something with you</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="625"/> + <location filename="../src/gui/socketapi.cpp" line="655"/> + <source>Share...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="627"/> + <location filename="../src/gui/socketapi.cpp" line="672"/> + <source>Copy private link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="628"/> + <source>Send private link by email...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="653"/> + <source>Resharing this file is not allowed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="666"/> + <location filename="../src/gui/socketapi.cpp" line="668"/> + <source>Copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi.cpp" line="722"/> + <source>Open in browser</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::SslButton</name> + <message> + <location filename="../src/gui/sslbutton.cpp" line="87"/> + <source><h3>Certificate Details</h3></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="90"/> + <source>Common Name (CN):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="91"/> + <source>Subject Alternative Names:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="92"/> + <source>Organization (O):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="93"/> + <source>Organizational Unit (OU):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="94"/> + <source>State/Province:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="95"/> + <source>Country:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="96"/> + <source>Serial:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="99"/> + <source><h3>Issuer</h3></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="102"/> + <source>Issuer:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="103"/> + <source>Issued on:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="104"/> + <source>Expires on:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="107"/> + <source><h3>Fingerprints</h3></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="111"/> + <source>SHA-256:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="112"/> + <source>SHA-1:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="116"/> + <source><p><b>Note:</b> This certificate was manually approved</p></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="136"/> + <source>%1 (self-signed)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="138"/> + <source>%1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="173"/> + <source>This connection is encrypted using %1 bit %2. +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="204"/> + <source>No support for SSL session tickets/identifiers</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="214"/> + <source>Certificate information:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslbutton.cpp" line="177"/> + <source>This connection is NOT secure as it is not encrypted. +</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::SslErrorDialog</name> + <message> + <location filename="../src/gui/sslerrordialog.ui" line="25"/> + <source>Trust this certificate anyway</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="65"/> + <source>Untrusted Certificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="132"/> + <source>Cannot connect securely to <i>%1</i>:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="166"/> + <source>with Certificate %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="175"/> + <location filename="../src/gui/sslerrordialog.cpp" line="177"/> + <location filename="../src/gui/sslerrordialog.cpp" line="179"/> + <source>&lt;not specified&gt;</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="180"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> + <source>Organization: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="181"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> + <source>Unit: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="182"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> + <source>Country: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="189"/> + <source>Fingerprint (SHA1): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <source>Effective Date: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> + <source>Expiration Date: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <source>Issuer: %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::SyncEngine</name> + <message> + <location filename="../src/libsync/syncengine.cpp" line="122"/> + <source>Success.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="132"/> + <source>A network connection timeout happened.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="135"/> + <source>A HTTP transmission error happened.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="159"/> + <source>The mounted folder is temporarily not available on the server</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="165"/> + <source>An error occurred while opening a folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="168"/> + <source>Error while reading folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="244"/> + <source>%1 (skipped due to earlier error, trying again in %2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="516"/> + <source>File/Folder is ignored because it's hidden.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="519"/> + <source>Folder hierarchy is too deep</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="535"/> + <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="801"/> + <source>Only %1 are available, need at least %2 to start</source> + <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="836"/> + <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1350"/> + <source>Not allowed because you don't have permission to add parent folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1357"/> + <source>Not allowed because you don't have permission to add files in that folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1690"/> + <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1697"/> + <source>There is insufficient space available on the server for some uploads.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="150"/> + <source>CSync unspecified error.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="153"/> + <source>Aborted by the user</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="125"/> + <source>Failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="129"/> + <source>Discovery step failed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="138"/> + <source>Permission denied.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="141"/> + <source>File or directory not found:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="144"/> + <source>Tried to create a folder that already exists.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="147"/> + <source>No space on %1 server available.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="156"/> + <source>The service is temporarily unavailable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="162"/> + <source>Access is forbidden</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="173"/> + <source>An internal error number %1 occurred.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="485"/> + <source>Symbolic links are not supported in syncing.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="488"/> + <source>File is listed on the ignore list.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="492"/> + <source>File names ending with a period are not supported on this file system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="502"/> + <source>File names containing the character '%1' are not supported on this file system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="505"/> + <source>The file name is a reserved name on this file system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="510"/> + <source>Filename contains trailing spaces.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="513"/> + <source>Filename is too long.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="522"/> + <source>The filename cannot be encoded on your file system.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="531"/> + <source>Unresolved conflict.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="539"/> + <source>Stat failed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="566"/> + <source>Filename encoding is not valid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="731"/> + <source>Invalid characters, please rename "%1"</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="864"/> + <source>Unable to read the blacklist from the local database</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="905"/> + <source>Unable to read from the sync journal.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="968"/> + <source>Cannot open the sync journal</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1034"/> + <source>File name contains at least one invalid character</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1276"/> + <location filename="../src/libsync/syncengine.cpp" line="1316"/> + <source>Ignored because of the "choose what to sync" blacklist</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1335"/> + <source>Not allowed because you don't have permission to add subfolders to that folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1382"/> + <source>Not allowed to upload this file because it is read-only on the server, restoring</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1398"/> + <location filename="../src/libsync/syncengine.cpp" line="1417"/> + <source>Not allowed to remove, restoring</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1431"/> + <source>Local files and share folder removed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1485"/> + <source>Move not allowed, item restored</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1496"/> + <source>Move not allowed because %1 is read-only</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1496"/> + <source>the destination</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncengine.cpp" line="1496"/> + <source>the source</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::SyncLogDialog</name> + <message> + <location filename="../src/gui/synclogdialog.ui" line="14"/> + <source>Synchronisation Log</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Systray</name> + <message> + <location filename="../src/gui/systray.cpp" line="54"/> + <source>%1: %2</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Theme</name> + <message> + <location filename="../src/libsync/theme.cpp" line="344"/> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="348"/> + <source><p>This release was supplied by %1</p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::WebEnginePage</name> + <message> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> + <source>Invalid certificate detected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::WebFlowCredentials</name> + <message> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> + <source>You have been logged out of %1 as user %2. Please login again</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> + <source>Please login with the user: %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::ownCloudGui</name> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="302"/> + <source>Please sign in</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> + <source>Folder %1: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="366"/> + <source>There are no sync folders configured.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <source>Open in browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="424"/> + <source>Log in...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="428"/> + <source>Log out</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="523"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="402"/> + <source>Managed Folders:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="405"/> + <source>Open folder '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="377"/> + <source>Open %1 in browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <source>Unknown status</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="780"/> + <source>Settings...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <source>Help</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <source>Quit %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="283"/> + <source>Disconnected from %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="233"/> + <source>Unsupported Server Version</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> + <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 type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <source>Disconnected</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <source>Disconnected from some accounts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="286"/> + <source>Disconnected from accounts:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="288"/> + <source>Account %1: %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> + <source>Signed out</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="307"/> + <source>Account synchronization is disabled</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> + <location filename="../src/gui/owncloudgui.cpp" line="361"/> + <source>Synchronization is paused</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="356"/> + <source>Unresolved conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="363"/> + <source>Error during synchronization</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <source>No sync folders configured</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="413"/> + <source>Resume all folders</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="418"/> + <source>Pause all folders</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <source>Resume all synchronization</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="696"/> + <source>Resume synchronization</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="704"/> + <source>Pause all synchronization</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <source>Pause synchronization</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="781"/> + <source>New account...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <source>Apps</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="898"/> + <source>No items synced recently</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="920"/> + <source>Checking for changes in remote '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="923"/> + <source>Checking for changes in local '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="938"/> + <source>Syncing %1 of %2 (%3 left)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="943"/> + <source>Syncing %1 of %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="952"/> + <source>Syncing %1 (%2 left)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="955"/> + <source>Syncing %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="973"/> + <source>%1 (%2, %3)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="358"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OwncloudAdvancedSetupPage</name> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> + <source>Server</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="354"/> + <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="357"/> + <source>Start a &clean sync (Erases the local folder!)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="148"/> + <source>Ask for confirmation before synchroni&zing folders larger than</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="165"/> + <source>MB</source> + <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="174"/> + <source>Ask for confirmation before synchronizing e&xternal storages</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="198"/> + <source>Choose what to sync</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="251"/> + <source>&Local Folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> + <source>&Keep local data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/> + <source>S&ync everything from server</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/> + <source>Status message</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OwncloudHttpCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> + <source>&Username</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="83"/> + <source>&Password</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OwncloudOAuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OwncloudSetupPage</name> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> + <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="143"/> + <source>Register with a provider</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="165"/> + <source>Log in</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="288"/> + <source>Server Address</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="304"/> + <source>https://...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="339"/> + <source>Error Label</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OwncloudWizardResultPage</name> + <message> + <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> + <source>Your entire account is synced to the local folder </source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>QObject</name> + <message> + <location filename="../src/common/utility.cpp" line="443"/> + <source>in the future</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="437"/> + <source>%n day ago</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="439"/> + <source>%n days ago</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="449"/> + <source>%n hour ago</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="451"/> + <source>%n hours ago</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> + <location filename="../src/common/utility.cpp" line="458"/> + <source>now</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/common/utility.cpp" line="460"/> + <source>Less than a minute ago</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="464"/> + <source>%n minute ago</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="466"/> + <source>%n minutes ago</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> + <location filename="../src/common/utility.cpp" line="470"/> + <source>Some time ago</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/syncresult.cpp" line="153"/> + <source>%1: %2</source> + <extracomment>this displays an error string (%2) for a file %1</extracomment> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Utility</name> + <message> + <location filename="../src/common/utility.cpp" line="130"/> + <source>%L1 GB</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/common/utility.cpp" line="134"/> + <source>%L1 MB</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/common/utility.cpp" line="138"/> + <source>%L1 KB</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/common/utility.cpp" line="141"/> + <source>%L1 B</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="310"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="311"/> + <source>%n month(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="312"/> + <source>%n day(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="313"/> + <source>%n hour(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="314"/> + <source>%n minute(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message numerus="yes"> + <location filename="../src/common/utility.cpp" line="315"/> + <source>%n second(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> + <location filename="../src/common/utility.cpp" line="339"/> + <source>%1 %2</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ValidateChecksumHeader</name> + <message> + <location filename="../src/common/checksums.cpp" line="233"/> + <source>The checksum header is malformed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/common/checksums.cpp" line="248"/> + <source>The checksum header contained an unknown checksum type '%1'</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/common/checksums.cpp" line="252"/> + <source>The downloaded file does not match the checksum, it will be resumed.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>main.cpp</name> + <message> + <location filename="../src/gui/main.cpp" line="39"/> + <source>System Tray not available</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/main.cpp" line="40"/> + <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>nextcloudTheme::about()</name> + <message> + <location filename="../src/libsync/theme.cpp" line="328"/> + <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>progress</name> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="32"/> + <source>Downloaded</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="34"/> + <source>Uploaded</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> + <source>Server version downloaded, copied changed local file into conflict file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="39"/> + <source>Deleted</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="42"/> + <source>Moved to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="44"/> + <source>Ignored</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="46"/> + <source>Filesystem access error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="48"/> + <source>Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="50"/> + <source>Updated local metadata</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="53"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="55"/> + <source>Unknown</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> + <source>downloading</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="68"/> + <source>uploading</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="70"/> + <source>deleting</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="73"/> + <source>moving</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="75"/> + <source>ignoring</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="77"/> + <location filename="../src/libsync/progressdispatcher.cpp" line="79"/> + <source>error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/progressdispatcher.cpp" line="81"/> + <source>updating local metadata</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>theme</name> + <message> + <location filename="../src/libsync/theme.cpp" line="62"/> + <source>Status undefined</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="65"/> + <source>Waiting to start sync</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="68"/> + <source>Sync is running</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="71"/> + <source>Sync Success</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="74"/> + <source>Sync Success, some files were ignored.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="77"/> + <source>Sync Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="80"/> + <source>Setup Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="83"/> + <source>Preparing to sync</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="86"/> + <source>Aborting...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/theme.cpp" line="89"/> + <source>Sync is paused</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>utility</name> + <message> + <location filename="../src/gui/guiutility.cpp" line="34"/> + <source>Could not open browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/guiutility.cpp" line="35"/> + <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/guiutility.cpp" line="58"/> + <source>Could not open email client</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/guiutility.cpp" line="59"/> + <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source> + <translation type="unfinished"/> + </message> +</context> +</TS>
\ No newline at end of file diff --git a/translations/client_is.ts b/translations/client_is.ts index d7f03e587..6e7d4a16c 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Samskiptagluggi</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Skýring</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Eyðublað</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Veldu möppu á tölvunni þinni til að samstilla</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Eyðublað</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Veldu fjartengda móttökumöppu</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,272 +241,283 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Eyðublað</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Geymslurými: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Ómerktar möppur verða <b>fjarlægðar</b> úr skráakerfi tölvunnar þinnar og því ekki samstilltar lengur við þessa tölvu</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Samstilla allt</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Samstilla ekkert</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Virkja handvirkar breytingar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Virkja</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Hætta við</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Tengd/ur við <server> sem <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Enginn aðgangur stilltur.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Bæta við nýju</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Fjarlægja</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Aðgangur</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Virkja dulritun</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Sýna E2E minnistækni</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Dulrita</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Veldu það sem á að samstilla</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Þvinga samstillingu núna</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Endurræsa samstillingu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Fjarlægja samstillingartengingu möppu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Gerð möppu mistókst</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Gat ekki búið til staðværa möppu <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Staðfesta fjarlægingu á samstillingartengingu möppu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Fjarlægja samstillingartengingu möppu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Samstilling er keyrandi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Aðgerðin sem samstillir er í gangi.<br/>Viltu stöðva hana?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 í notkun</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 sem <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Þjónninn er af útgáfu %1 sem er úrelt og ekki lengur studd! Ef þú heldur áfram er það á þína eigin ábyrgð.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Tengdur við %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Þjónninn %1 er ekki tiltækur í augnablikinu.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Þjónninn %1 er í viðhaldsham.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Skráður út af %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Tengist við %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Engin tenging við %1 á %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Skrá inn</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Það eru möppur sem ekki eru samstilltar því þær eru of stórar: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Það eru möppur sem ekki eru samstilltar því þær ytri eru gagnageymslur: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Það eru möppur sem ekki eru samstilltar því þær eru of stórar eða eru ytri gagnageymslur: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Staðfesta fjarlægingu aðgangs</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Viltu í alvörunni fjarlægja tenginguna við aðganginn <i>%1</i>?</p><p><b>Athugið:</b> Þetta mun <b>ekki</b> eyða neinum skrám.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Fjarlægja tengingu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Opna möppu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Skrá út</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Halda samstillingu áfram</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Gera hlé á samstillingu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Viltu í alvörunni hætta að samstilla möppuna <i>%1</i>?</p><p><b>Athugið:</b> Þetta mun <b>ekki</b> eyða neinum skrám.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) af %2 í notkun. Sumar möppur, þar með taldar netmöppur tengdar í skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 af %2 í notkun</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Það eru engar upplýsingar um gagnamagn fáanlegar í augnablikinu.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Engin %1 tenging skilgreind.</translation> </message> @@ -549,32 +601,22 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</transla <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Eyðublað</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TextaMerking</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Samþykkja</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Samstillt</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Prófa aftur allar innsendingar</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>%1 aðgangurinn er ekki með virkniskráningu.</translation> </message> @@ -661,7 +703,7 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</transla <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Villa við ritun lýsigagna í gagnagrunninn</translation> </message> @@ -669,12 +711,12 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</transla <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Settu inn lykilorð fyrir enda-í-enda dulritun:<br><br>Notandi: %2<br>Aðgangur: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Settu inn EíE-lykilorð</translation> </message> @@ -729,6 +771,59 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</transla </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -746,122 +841,122 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</transla <translation>%1 er ekki lesanleg.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 hefur verið fjarlægð.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 hefur verið sótt.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 var uppfærð.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 hefur verið endurnefnd sem %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 hefur verið færð í %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 og %n skrá til viðbótar hafa verið fjarlægðar.</numerusform><numerusform>%1 og %n skrár til viðbótar hafa verið fjarlægðar.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 og %n skrá til viðbótar hafa verið sóttar.</numerusform><numerusform>%1 og %n skrár til viðbótar hafa verið sóttar.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 og %n skrár til viðbótar hafa verið uppfærðar.</numerusform><numerusform>%1 og %n skrár til viðbótar hafa verið uppfærðar.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 var endurnefnd sem %2 og %n skrá til viðbótar var líka endurnefnd.</numerusform><numerusform>%1 var endurnefnd sem %2 og %n skrár til viðbótar voru líka endurnefndar.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 var færð í %2 og %n skrár til viðbótar voru líka færðar.</numerusform><numerusform>%1 var færð í %2 og %n skrár til viðbótar voru líka færðar.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 og %n skrá til viðbótar eru með árekstra við samstillingu.</numerusform><numerusform>%1 og %n skrár til viðbótar eru með árekstra við samstillingu.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 er með árekstra við samstillingu. Skoðaðu yfirlitsskrána fyrir árekstra!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 og %n skrá til viðbótar var ekki hægt að samstilla vegna villu sem kom upp. Skoðaðu annálinn fyrir nánari upplýsingar.</numerusform><numerusform>%1 og %n skrár til viðbótar var ekki hægt að samstilla vegna villu sem kom upp. Skoðaðu annálinn fyrir nánari upplýsingar.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 var ekki hægt að samstilla vegna villu sem kom upp Skoðaðu annálinn fyrir nánari upplýsingar.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Virkni samstillingar</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Gat ekki lesið kerfisútilokunarskrána</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Nýrri möppu stærri en %1 MB var bætt við: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Möppu úr ytri gagnageymslu var bætt við. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Farðu í stillingarnar til að velja hana ef þú vilt sækja hana.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -870,7 +965,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -878,46 +973,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Sækja nýjar skrár?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Sækja nýjar skrár</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Halda skrám á tölvu</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Öryggisafrit fannst</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Venjuleg samstilling</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Halda skrám á tölvunni við árekstra</translation> </message> @@ -1034,12 +1129,12 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation> <translation>Bæta við samstillingartengingu möppu</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Samstillt við möppu á tölvunni</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Skrá</translation> </message> @@ -1069,7 +1164,7 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation> <translation>Villa við að hlaða inn lista yfir möppur frá vefþjóninum.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Skráð(ur) út</translation> </message> @@ -1084,107 +1179,107 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation> <translation>Það eru óleystir árekstrar. Smelltu til að skoða nánar.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Samþætti breytingar</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Samstilli %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>sæki %1/sek</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>sendi inn %1/sek</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Athuga með breytingar í fjartengdri '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Athuga með breytingar í staðværri '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 af %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 eftir, %1 af %2, skrá %3 af %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 af %2, skrá %3 af %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>skrá %1 af %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Bíð...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Bíð eftir %n möppu til viðbótar...</numerusform><numerusform>Bíð eftir %n möppum til viðbótar...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Undirbý samstillingu...</translation> </message> @@ -1315,11 +1410,6 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation> <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Eyðublað</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Lagaleg atriði</translation> @@ -1468,81 +1558,79 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation> <translation>Skrár hunsaðar eftir mynstrum</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Bæta við</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation type="unfinished"/> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Fjarlægja allt</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Mynstur</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Leyfa eyðingu</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Fjarlægja</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Gat ekki opnað skrá</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Get ekki skrifað breytingar í '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Bæta við hunsunarmynstri</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Bæta við nýju hunsunarmynstri:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Samskiptagluggi</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Lagaleg atriði</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextaMerking</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Loka</translation> @@ -1673,11 +1761,6 @@ niðurhals. Uppsetta útgáfan er %3.</p></translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Eyðublað</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Stillingar milliþjóns (proxy)</translation> @@ -1988,11 +2071,6 @@ aðgerð til að leysa málið!</small></p></translation> <source>Login in your browser</source> <translation>Skráðu þig inn í vafranum þínum</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Afrita tengil á klippispjald</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2045,12 +2123,12 @@ Ekki er mælt með því að hún sé notuð. <translation>&Næsta ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Ógild slóð</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Gat ekki hlaðið inn skilríki. Kannski rangt lykilorð?</translation> </message> @@ -2129,79 +2207,79 @@ Ekki er mælt með því að hún sé notuð. <translation>Gat ekki búið til staðværu möppuna %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Engin fjartengd mappa tilgreind!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Villa: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>bý til möppu á Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Það tókst að búa til fjartengdu möppuna %1.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Tenging við %1 tókst!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Ekki tókst að koma á tengingu við %1. Prófaðu aftur.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Endurnefning möppu mistókst</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Það tókst að búa til staðværu möppuna %1!</b></font></translation> </message> @@ -2209,12 +2287,12 @@ Ekki er mælt með því að hún sé notuð. <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 tengingaleiðarvísir</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Sleppa uppsetningu á möppum</translation> </message> @@ -2248,7 +2326,7 @@ Ekki er mælt með því að hún sé notuð. <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Villa við ritun lýsigagna í gagnagrunninn</translation> </message> @@ -2276,32 +2354,32 @@ Ekki er mælt með því að hún sé notuð. <translation>Laust pláss á diski er minna en %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Skrá var eytt af þjóninum</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Ekki var hægt að sækja skrána að fullu.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Skráin hefur breyst síðan hún fannst</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Villa við ritun lýsigagna í gagnagrunninn</translation> </message> @@ -2314,7 +2392,7 @@ Ekki er mælt með því að hún sé notuð. <translation>; Endurheimt mistókst: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -2446,27 +2524,27 @@ Ekki er mælt með því að hún sé notuð. <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Staðværa skráin var fjarlægð við samstillingu.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Staðværu skránni var breytt við samstillingu.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Óvæntur svarkóði frá þjóni (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -2675,22 +2753,22 @@ Ekki er mælt með því að hún sé notuð. <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Deilitengill</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Lykilorð:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Gildistími:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TextaMerking</translation> </message> @@ -2764,22 +2842,22 @@ Ekki er mælt með því að hún sé notuð. <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Deila með notendum eða hópum ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Afrita tengil</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Engar niðurstöður fyrir '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Ég deildi einhverju með þér</translation> </message> @@ -2797,22 +2875,27 @@ Ekki er mælt með því að hún sé notuð. <translation>getur breytt</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Getur endurdeilt</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Getur búið til</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Getur breytt</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Getur eytt</translation> </message> @@ -2839,7 +2922,7 @@ Ekki er mælt með því að hún sé notuð. </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> @@ -3026,11 +3109,6 @@ Ekki er mælt með því að hún sé notuð. <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Eyðublað</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Treysta samt áreiðanleika þessa skilríkis</translation> @@ -3059,44 +3137,49 @@ Ekki er mælt með því að hún sé notuð. </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Stofnun/Fyrirtæki/Félag (O): %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Eining: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Land: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Fingrafar (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingrafar (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Virkt þann: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Gildir til dags: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Útgefandi: %1</translation> </message> @@ -3387,11 +3470,11 @@ Ekki er mælt með því að hún sé notuð. <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><pÚtgáfa %1. Til að vita meira ættirðu að skoða <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Þessi útgáfa var gefin út af %1</p></translation> </message> @@ -3399,25 +3482,25 @@ Ekki er mælt með því að hún sé notuð. <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Fann ógilt skilríki</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Þú hefur verið skráður út af %1 sem notandinn %2. Skráðu þig aftur inn</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Skráðu þig inn með notandanafninu: %1</translation> </message> @@ -3485,11 +3568,6 @@ Ekki er mælt með því að hún sé notuð. <translation>Stillingar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Nánar...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Hjálp</translation> @@ -3601,6 +3679,11 @@ Ekki er mælt með því að hún sé notuð. <translation>Nýr aðgangur...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3660,23 +3743,6 @@ Ekki er mælt með því að hún sé notuð. <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Eyðublað</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextaMerking</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Þjónn</translation> @@ -3718,11 +3784,6 @@ Ekki er mælt með því að hún sé notuð. <translation>&Staðvær mappa</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Halda staðværum gögnum</translation> @@ -3741,11 +3802,6 @@ Ekki er mælt með því að hún sé notuð. <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Eyðublað</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>N&otandanafn</translation> @@ -3759,11 +3815,6 @@ Ekki er mælt með því að hún sé notuð. <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Eyðublað</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Skiptu yfir í vafrann þinn til að halda áfram.</translation> @@ -3778,21 +3829,15 @@ Ekki er mælt með því að hún sé notuð. <source>Re-open Browser</source> <translation>Opna vafra aftur</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Eyðublað</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TextaMerking</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Hýstu þinn eigin þjón</span></a></translation> @@ -3826,26 +3871,10 @@ Ekki er mælt með því að hún sé notuð. <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Eyðublað</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TextaMerking</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Allt á notandaaðgangnum þínum er samstillt við staðværu möppuna </translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>ÝtiHnappur</translation> - </message> </context> <context> <name>QObject</name> @@ -3900,7 +3929,7 @@ Ekki er mælt með því að hún sé notuð. <translation>Fyrir nokkru síðan</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3983,14 +4012,6 @@ Ekki er mælt með því að hún sé notuð. </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_it.ts b/translations/client_it.ts index 2adc52c1d..8adda2309 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Finestra</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etichetta</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> <translation>Modulo</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Passa al tuo browser per continuare.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Si è verificato un errore durante la connessione. Prova ancora.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Apri nuovamente il browser</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copia collegamento</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation>Modulo</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Passa al tuo browser per continuare.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Si è verificato un errore durante la connessione. Prova ancora.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Apri nuovamente il browser</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Copia collegamento</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Scegli una cartella locale sul tuo computer da sincronizzare</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Seleziona una cartella remota di destinazione </translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Codice mnemonico per cifratura End to End</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Per proteggere la tua identità crittografica, la cifriamo con un codice mnemonico di 12 parole di dizionario. Annotale e tienile al sicuro. Saranno necessarie per aggiungere altri dispositivi al tuo account (come il tuo smartphone o il portatile).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Spazio di archiviazione: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Le cartelle non marcate saranno <b>rimosse</b> dal file system locale e non saranno sincronizzate più con questo computer</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizza tutto</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Non sincronizzare</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Applica le modifiche manuali</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Applica</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Connesso a <server> come <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Nessun account configurato.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Aggiungi nuovo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Rimuovi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Questo account supporta la cifratura End-To-End</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Abilita cifratura</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Mostra codice mnemonico E2E</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Cifra</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Modifica file ignorati</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Scegli cosa sincronizzare</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forza ora la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Riavvia sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Rimuovi connessione di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Creazione della cartella non riuscita</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Impossibile creare la cartella locale <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Conferma rimozione connessione di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Rimuovi connessione di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>La sincronizzazione è in corso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 in uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 come <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>La versione %1 del server è datata e non supportata! Continua a tuo rischio.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Connesso a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Il server %1 è temporaneamente non disponibile.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Il Server %1 è attualmente in manutenzione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Disconnesso da %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Ottenimento dell'autorizzazione dal browser. <a href='%1'>Fai clic qui</a> per aprire nuovamente il browser.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Connessione a %1 in corso…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Nessuna connessione a %1 su %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Accedi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono archiviazioni esterne:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi o archiviazioni esterne:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Conferma rimozione account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Vuoi davvero eliminare la connessione all'account <i>%1</i>?</p><p><b>Nota:</b> ciò <b>non</b> eliminerà alcun file.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Rimuovi connessione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Apri cartella</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Esci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Riprendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Sospendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Vuoi davvero fermare la sincronizzazione della cartella <i>%1</i>?</p><p><b>Nota:</b> ciò <b>non</b> eliminerà alcun file.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) di %2 in uso. Alcune cartelle, incluse quelle montate in rete o le cartelle condivise, potrebbero avere limiti diversi.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 di %2 in uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Nessuna connessione di %1 configurata.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtichettaTesto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Accetta</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Sincronizzato</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Riprova tutti icaricamenti</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>L'account %1 non ha attività abilitate.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Errore durante la scrittura dei metadati nel database</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Digita la tua frase segreta di cifratura end-to-end: <br><br>Utente: %2<br>Account: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Digita la frase segreta E2E</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Errore restitutito dal server: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Si è verificato un errore durante l'accesso al terminatore dei 'token': <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Impossibile elaborare il JSON restituito dal server: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>La risposta dal server non conteneva tutti i campi attesi</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Connetti a %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Accedi tramite il tuo browser (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>Impossibile aprire il browser, copia il collegamento nel tuo browser.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>Impossibile aprire il browser, copia il collegamento nel tuo browser.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,98 +835,98 @@ <translation>%1 non è leggibile.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 è stato rimosso.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 è stato scaricato.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 è stato aggiornato.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 è stato rinominato in %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 è stato spostato in %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 e %n altro file sono stati rimossi.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 e %n altro file sono stati scaricati.</numerusform><numerusform>%1 e %n altri file sono stati scaricati.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 e %n altro file sono stati aggiornati.</numerusform><numerusform>%1 e %n altri file sono stati aggiornati.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 è stato rinominato in %2 e %n altro file sono stati rinominati.</numerusform><numerusform>%1 è stato rinominato in %2 e %n altri file sono stati rinominati.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 è stato spostato in %2 e %n altro file sono stati spostati.</numerusform><numerusform>%1 è stato spostato in %2 e %n altri file sono stati spostati.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 e %n altro file hanno conflitti di sincronizzazione.</numerusform><numerusform>%1 e %n altri file hanno conflitti di sincronizzazione.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 ha un conflitto di sincronizzazione. Controlla il file in conflitto!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>1% e %n altro file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform><numerusform>1% e %n altri file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 non può essere sincronizzato a causa di un errore. Controlla il log per i dettagli.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sincronizza attività</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Impossibile leggere il file di esclusione di sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una nuova cartella più grande di %1 MB è stata aggiunta: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Una nuova cartella da un'archiviazione esterna è stata aggiunta. @@ -839,22 +934,22 @@ </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Vai nelle impostazioni e selezionala se vuoi scaricarla.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>La cartella %1 è stata creata, ma è stata esclusa dalla sincronizzazione in precedenza. I dati al suo interno non saranno sincronizzati.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Il file %1 è stato creato, ma è stato escluso dalla sincronizzazione in precedenza. Non sarà sincronizzato.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -867,7 +962,7 @@ Questo significa che il client di sincronizzazione potrebbe non caricare le modi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -878,22 +973,22 @@ Se decidi di tenere i file, saranno sincronizzati nuovamente con il server, se h Se decidi di eliminare i file, non saranno più disponibili, a meno che tu sia il proprietario.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Vuoi scaricare i nuovi file?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Scarica i nuovi file</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Mantieni i file locali</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -903,7 +998,7 @@ Sei sicuro di voler sincronizzare queste azioni con il server? Se è stato un errore e decidi di tenere i file, saranno sincronizzati nuovamente con il server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -912,17 +1007,17 @@ Ciò potrebbe verificarsi in seguito al ripristino di un backup sul server. Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tutti i tuoi file con file più datati in uno stato precedente. Vuoi mantenere i tuoi file locali più recenti come file di conflitto?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Backup rilevato</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronizzazione normale</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Mantieni i file locali come conflitto</translation> </message> @@ -1038,12 +1133,12 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut <translation>Aggiungi connessioni di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Sincronizzato con cartella locale</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>Sincronizzato con la cartella locale (%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>File</translation> </message> @@ -1073,7 +1168,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut <translation>Errore durante il caricamento dell'elenco delle cartelle dal server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Disconnesso</translation> </message> @@ -1088,107 +1183,107 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut <translation>Ci sono conflitti irrisolti. Clicca per ulteriori dettagli. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Riconciliazione delle modifiche</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizzazione di %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ricezione %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>invio %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Controllo delle modifiche in '%1' remoto</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Controllo delle modifiche in '%1' locale</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 di %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 rimanenti, %1 di %2, file %3 di %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 di %2, file %3 di %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>file %1 di %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Attendere...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>In attesa di %n altra cartella...</numerusform><numerusform>In attesa di %n altre cartelle...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparazione della sincronizzazione...</translation> </message> @@ -1319,11 +1414,6 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Avviso legale</translation> @@ -1474,83 +1564,81 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut <translation>File ignorati per modelli</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Aggiungi</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Questa voce è fornita dal sistema in '%1' e non può essere modificata in questa vista.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Rimuovi tutto</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation>IgnoreListTableWidget</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation>Modello</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation>Consenti eliminazione</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>Aggiungi</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> <translation>Rimuovi</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation>Rimuovi tutto</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>I file e le cartelle che verificano un modello non saranno sincronizzati. -Gli elementi per i quali è consentita l'eliminazione, saranno eliminati se impediscono la rimozione di una cartella. Utile per i metadati.</translation> +Gli elementi per i quali è consentita l'eliminazione saranno eliminati se impediscono la rimozione di una cartella. Utile per i metadati.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation>Impossibile aprire il file</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Impossibile scrivere le modifiche in '%1'.</translation> + <translation>Impossibile scrivere le modifiche su '%1'.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Aggiungi modello Ignora</translation> + <translation>Aggiungi modello di esclusione</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> <translation>Aggiungi un nuovo modello di esclusione:</translation> </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Questa voce è fornita dal sistema in '%1' e non può essere modificata in questa vista.</translation> - </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Finestra</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Avviso legale</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>EtichettaTesto</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Chiudi</translation> @@ -1682,11 +1770,6 @@ I log saranno scritti in %1</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Impostazioni proxy</translation> @@ -1996,11 +2079,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>Accedi tramite il tuo browser</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Copia collegamento negli appunti</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2052,12 +2130,12 @@ Non è consigliabile utilizzarlo.</translation> <translation>Ava&nti ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>URL non valido</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Impossibile caricare il certificato. Forse la password è errata?</translation> </message> @@ -2135,79 +2213,79 @@ Non è consigliabile utilizzarlo.</translation> <translation>Impossibile creare la cartella locale %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Nessuna cartella remota specificata!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Errore: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>creazione cartella su Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>La cartella remota %1 è stata creata correttamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La cartella remota %1 esiste già. Connessione in corso per la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creazione della cartella ha restituito un codice di errore HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>La creazione della cartella remota non è riuscita poiché le credenziali fornite sono errate!<br/>Torna indietro e verifica le credenziali.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">La creazione della cartella remota non è riuscita probabilmente perché le credenziali fornite non sono corrette.</font><br/>Torna indietro e controlla le credenziali inserite.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Creazione della cartella remota %1 non riuscita con errore <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una connessione di sincronizzazione da %1 alla cartella remota %2 è stata stabilita.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Connesso con successo a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>La connessione a %1 non può essere stabilita. Prova ancora.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Rinomina della cartella non riuscita</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Impossibile rimuovere o creare una copia di sicurezza della cartella poiché la cartella o un file in essa contenuto è aperta in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Cartella locale %1 creata correttamente!</b></font></translation> </message> @@ -2215,12 +2293,12 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>Procedura guidata di connessione di %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Salta la configurazione delle cartelle</translation> </message> @@ -2254,7 +2332,7 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Errore durante la scrittura dei metadati nel database</translation> </message> @@ -2282,32 +2360,32 @@ Non è consigliabile utilizzarlo.</translation> <translation>Lo spazio libero su disco è inferiore a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Il file è stato eliminato dal server</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Il file non può essere scaricato completamente.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Il file è stato modificato dal suo rilevamento</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Errore durante la scrittura dei metadati nel database</translation> </message> @@ -2320,7 +2398,7 @@ Non è consigliabile utilizzarlo.</translation> <translation>; Ripristino non riuscito: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Un file o una cartella è stato rimosso da una condivisione in sola lettura, ma il ripristino non è riuscito: %1</translation> </message> @@ -2452,27 +2530,27 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Un file locale è cambiato durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Codice di uscita inatteso dal server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>File ID mancante dal server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag mancante dal server</translation> </message> @@ -2681,22 +2759,22 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>Condi&vidi collegamento</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Password:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Data di scadenza</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>EtichettaTesto</translation> </message> @@ -2769,22 +2847,22 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Condividi con utenti o gruppi...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Copia collegamento</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Nessun risultato per '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Ho condiviso qualcosa con te</translation> </message> @@ -2802,22 +2880,27 @@ Non è consigliabile utilizzarlo.</translation> <translation>può modificare</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Può ri-condividere</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Rimuovi condivisione</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Può creare</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Può cambiare</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Può eliminare</translation> </message> @@ -2844,7 +2927,7 @@ Non è consigliabile utilizzarlo.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation>Vista debug cifrario SSL</translation> </message> <message> @@ -3030,11 +3113,6 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Fidati comunque di questo certificato</translation> @@ -3063,44 +3141,49 @@ Non è consigliabile utilizzarlo.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organizzazione: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Reparto: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Nazione: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Impronta digitale (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Impronta digitale (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Impronta digitale (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>Impronta digitale (SHA-512): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Data effettiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Data di scadenza: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emittente: %1</translation> </message> @@ -3391,11 +3474,11 @@ Non è consigliabile utilizzarlo.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versione %1. Per ulteriori informazioni vedi <a href="%2">3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Versione %1. Per ulteriori informazioni fai clic <a href='%2'>qui</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Questa versione è stata fornita da %1</p></translation> </message> @@ -3403,25 +3486,25 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Rilevato certificato non valido</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>L'host "%1" ha fornito un certificato non valido. Vuoi continuare?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Sei stato disconnesso da %1 come utente %2. Accedi nuovamente</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Accedi con l'utente: %1</translation> </message> @@ -3489,11 +3572,6 @@ Non è consigliabile utilizzarlo.</translation> <translation>Impostazioni...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Dettagli...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Aiuto</translation> @@ -3605,6 +3683,11 @@ Non è consigliabile utilizzarlo.</translation> <translation>Nuovo account...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Visualizza altre attività…</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> @@ -3664,23 +3747,6 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>EtichettaTesto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Server</translation> @@ -3722,11 +3788,6 @@ Non è consigliabile utilizzarlo.</translation> <translation>Carte&lla locale</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Mantieni i dati locali</translation> @@ -3745,11 +3806,6 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>Nome &utente</translation> @@ -3763,11 +3819,6 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Passa al tuo browser per continuare.</translation> @@ -3782,21 +3833,15 @@ Non è consigliabile utilizzarlo.</translation> <source>Re-open Browser</source> <translation>Apri nuovamente il browser</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copia collegamento</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>EtichettaTesto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Ospita il tuo server</span></a></translation> @@ -3830,26 +3875,10 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>EtichettaTesto</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>L'intero account è sincronizzato con la cartella locale</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PremiPulsante</translation> - </message> </context> <context> <name>QObject</name> @@ -3904,7 +3933,7 @@ Non è consigliabile utilizzarlo.</translation> <translation>Tempo fa</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3987,14 +4016,6 @@ Non è consigliabile utilizzarlo.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Modulo</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index d7e830f23..e7ba5f93c 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -35,7 +35,7 @@ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation type="unfinished"/> + <translation>最近変更されたファイルはありません。</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> @@ -50,47 +50,42 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>ウェブサイトを開く</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>最近変更されたもの</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>同期を一時停止</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>ヘルプ</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>設定</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>ログアウト</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> <source>Quit sync client</source> - <translation type="unfinished"/> + <translation>同期クライアントを終了する</translation> </message> </context> <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>ダイアログ</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>ラベル</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</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="69"/> + <source>Copy link</source> + <translation>リンクをコピー</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> <translation>フォーム</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>続行するには、ブラウザに切り替えてください。</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>接続中にエラーが発生しました。 もう一度お試しください。</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>ブラウザーを再度開く</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>リンクをコピー</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>同期するコンピューターのローカルフォルダーを選択してください</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>リモートの同期先フォルダーを選択</translation> @@ -187,279 +228,290 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>End to end暗号化ニーモニック</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> - <translation type="unfinished"/> + <translation>あなたの暗号化IDを保護するために、私たちは12の辞書単語のニモニックでIDを暗号化します。他のデバイス(携帯電話やラップトップなど)をアカウントに追加するために必要になるので、これらをメモして、安全に保管してください。</translation> </message> </context> <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>…</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>ストレージ空き容量: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>すべてを同期</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>同期なし</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>手動による変更を適用</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>適用</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>キャンセル</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation><server> に <user> で接続中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>アカウントが未設定です。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>新規追加</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>アカウント</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>このアカウントはエンドツーエンドの暗号化をサポートしています</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>暗号化を有効にする</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>E2Eニーモニックを表示</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>暗号化</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>同期フォルダーを選択</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>今すぐ強制的に同期</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>同期を再実行</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>同期フォルダー接続を削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>フォルダーの作成に失敗しました</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>ローカルフォルダー <i>%1</i> を作成できません。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>同期フォルダー接続の削除を確認</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>同期フォルダー接続を削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>同期を実行中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <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="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 を使用中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation><i>%2</i> の %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <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="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>%1 に接続</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>サーバー %1 は一時的に利用できません</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>サーバー %1 は現在メンテナンスモードです。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>%1 からサインアウトしました。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <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="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>%1 に接続中...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>%2 の %1 への接続がありません。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>ログイン</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <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="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <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="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <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="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>アカウント削除確認</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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> これによりファイルが一切削除されることはありません。</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>接続削除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>フォルダーを開く</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>ログアウト</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>再開</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>一時停止</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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> これによりファイルが一切削除されることはありません。</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%2 の %1(%3%) 利用中。外部ネットワークストレージや共有フォルダーを含むフォルダーがある場合は、容量の上限値が異なる可能性があります。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%2 のうち %1 を使用中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>現在、利用できるストレージ利用状況はありません。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>%1 の接続は設定されていません。</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>テキストラベル</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>承諾</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>同期した</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>すべてのアップロードを再試行</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>%1 アカウントは、 アクティビティを有効にしていません。</translation> </message> @@ -621,12 +663,12 @@ <message> <location filename="../src/gui/application.cpp" line="193"/> <source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source> - <translation type="unfinished"/> + <translation>％1の設定ファイルのアクセス中にエラーが発生しました。 ユーザーがファイルにアクセスできることを確認してください。</translation> </message> <message> <location filename="../src/gui/application.cpp" line="196"/> <source>Quit %1</source> - <translation type="unfinished"/> + <translation>%1 を終了</translation> </message> </context> <context> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> - <translation type="unfinished"/> + <translation>エンドツーエンドの暗号化パスフレーズを入力してください：<br> <br>ユーザー：%2<br>アカウント：%3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>E2Eパスフレーズを入力</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>%1 に接続</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,152 +835,159 @@ <translation>%1 は読み込み可能ではありません。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 は削除されました。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 はダウンロードされました。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 が更新されました。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 の名前が %2 に変更されました。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 は %2 に移動しました。</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 とその他 %n 個のファイルが削除されました。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 とその他 %n 個のファイルがダウンロードされました。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 とその他 %n 個のファイルが更新されました。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 を %2 にファイル名を変更し、その他 %n 個のファイル名を変更しました。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 を %2 に移動し、その他 %n 個のファイルを移動しました。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 と その他 %n 個のファイルが同期で衝突しました。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 が同期で衝突しています。コンフリクトファイルを確認してください。</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>エラーにより、%1 と その他 %n 個のファイルが同期できませんでした。ログで詳細を確認してください。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>エラーにより %1 が未同期です。ログで詳細を確認してください。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>同期アクティビティ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>システム上の除外ファイルを読み込めません</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <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="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>外部ストレージからフォルダーが追加されました。 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <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="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> - <translation type="unfinished"/> + <translation>フォルダ％1は作成されましたが、以前に同期から除外されました。 中のデータは同期されません。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> - <translation type="unfinished"/> + <translation>ファイル％1は作成されましたが、以前に同期から除外されました。 このファイルは同期されません。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). %1</source> - <translation type="unfinished"/> + <translation>同期フォルダの変更を確実に追跡できませんでした。 + +これは、同期クライアントはすぐにローカルの変更をアップロードしない場合がありますが、代わりにローカルの変更をスキャンし（デフォルトでは2時間ごとに）時折それらをアップロードすることを意味します。 + +%1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep 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="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>新しいファイルをダウンロードしますか？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>新しいファイルをダウンロードする</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>ローカルファイルを保持</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,24 +996,24 @@ If this was an accident and you decide to keep your files, they will be re-synce 「ファイルを残す」を選択した場合、ファイルはサーバーから再同期されます。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation>この同期により同期フォルダー '%1' のファイルが以前のものに戻されます。 これは、バックアップがサーバー上に復元されたためです。 通常と同じように同期を続けると、すべてのファイルが以前の状態の古いファイルによって上書きされます。最新のローカルファイルを競合ファイルとして保存しますか？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>バックアップが検出されました</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>正常同期</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>コンフリクト時にローカルファイルを保持</translation> </message> @@ -1027,12 +1129,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>同期フォルダーを追加</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>ローカルフォルダーと同期</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>ローカルフォルダーと同期(%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>ファイル</translation> </message> @@ -1062,7 +1164,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>サーバーからフォルダーリスト取得中にエラーが発生しました。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>サインアウト</translation> </message> @@ -1077,107 +1179,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>未解決の競合があります。クリックで詳細。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>変更の調整</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>同期中 %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ダウンロード %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>アップロード %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>リモート '%1'の変更を確認する</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>ローカル '%1'の変更を確認する</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%4 中 %3 完了)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>残り%5、%2中%1完了 、ファイル%4個中%3個完了</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 of %2, ファイル数 %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>%1 / %2 ファイル</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>待機中...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>%n 他のフォルダーの完了待ち...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>同期の準備中...</translation> </message> @@ -1308,11 +1410,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>法的通知</translation> @@ -1461,83 +1558,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>パターンによって除外するファイル</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>追加</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>このエントリーは、システム '%1' から提供されています。この画面では変更できません。</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>すべて削除する</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation>パターン</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation>削除を許可</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>追加</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> <translation>削除</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <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>パターンに一致するファイルやフォルダーは同期されません。 - -パターンによってディレクトリを削除から除外する場合は，パターンに含まれた項目も削除されます。例えばメタデータファイルに有用です。</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>ファイルが開けませんでした</translation> + <translation>ファイルを開けませんでした</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>'%1'を更新できません。</translation> + <translation>”%1”を更新できません</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>除外するファイルパターンを追加</translation> + <translation>除外パターンを追加</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>除外するファイルパターンを新しく追加:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>このエントリーは、システム '%1' から提供されています。この画面では変更できません。</translation> + <translation>新しい除外パターンを追加</translation> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>ダイアログ</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>法的通知</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>テキストラベル</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>閉じる</translation> @@ -1545,12 +1638,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/legalnotice.cpp" line="27"/> <source><p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></source> - <translation type="unfinished"/> + <translation><p>Copyright 2017-2018 Nextcloud GmbH2<br />Copyright 2012-2018 ownCloud GmbH1</p></translation> </message> <message> <location filename="../src/gui/legalnotice.cpp" line="30"/> <source><p>Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.</p></source> - <translation type="unfinished"/> + <translation><p>GNU General Public License (GPL)バージョン2.0以降のバージョンでライセンスされています。</p></translation> </message> </context> <context> @@ -1585,7 +1678,9 @@ Items where deletion is allowed will be deleted if they prevent a directory from <source>When this option is enabled and no other logging is configured, logs will be written to a temporary folder and expire after a few hours. This setting persists across client restarts. Logs will be written to %1</source> - <translation type="unfinished"/> + <translation>このオプションが有効になっていて、他のログが設定されていない場合、ログは一時フォルダに書き込まれ、数時間後に期限切れになります。 この設定はクライアントの再起動後も持続します。 + +ログは％1に書き込まれます</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="115"/> @@ -1667,11 +1762,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>プロキシ設定</translation> @@ -1802,7 +1892,7 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/creds/oauth.cpp" line="131"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> - <translation type="unfinished"/> + <translation><h1>間違ったユーザー</h1><p>ユーザー<em>％1</em>でログインしましたが、ユーザー<em>％2</em>でログインする必要があります。<br>別のタブで％3からログアウトしてから、<a href='%4'>ここをクリック</a>してユーザー％2</p>としてログインしてください。</translation> </message> </context> <context> @@ -1899,7 +1989,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/> <source>Free space: %1</source> - <translation type="unfinished"/> + <translation>空き容量: %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> @@ -1915,7 +2005,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> <source>There isn't enough free space in the local folder!</source> - <translation type="unfinished"/> + <translation>ローカルフォルダに十分な空き容量がありません。</translation> </message> </context> <context> @@ -1981,11 +2071,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>ブラウザにログイン</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>リンクをクリップボードにコピーする</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2036,12 +2121,12 @@ It is not advisable to use it.</source> <translation>次(&N) ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>無効なURL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>証明書を読み込めませんでした。 パスワードが間違っていますか？</translation> </message> @@ -2119,79 +2204,79 @@ It is not advisable to use it.</source> <translation>ローカルフォルダー %1 を作成できませんでした</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>リモートフォルダーが指定されていません！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>エラー: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>Nextcloud上にフォルダーを作成中：%1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>リモートフォルダー %1 は正常に生成されました。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>リモートフォルダー %1 はすでに存在します。同期のために接続しています。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>フォルダーの作成はHTTPのエラーコード %1 で終了しました</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <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="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <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="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <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="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>%1への接続に成功しました！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>%1 への接続を確立できませんでした。もう一度確認してください。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>フォルダー名の変更に失敗しました。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>ローカルの同期フォルダー %1 は正常に作成されました！</b></font></translation> </message> @@ -2199,12 +2284,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 接続ウィザード</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>フォルダー設定をスキップ</translation> </message> @@ -2238,7 +2323,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> @@ -2258,7 +2343,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/propagatedownload.cpp" line="484"/> <source>The download would reduce free local disk space below the limit</source> - <translation type="unfinished"/> + <translation>ダウンロードすることによりローカルディスクの空き容量が制限を下回ります。</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="488"/> @@ -2266,32 +2351,32 @@ It is not advisable to use it.</source> <translation>ディスク空き容量が %1 よりも少なくなっています</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>ファイルはサーバーから削除されました</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>このファイルのダウンロードは完了しませんでした</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> - <translation type="unfinished"/> + <translation>サーバーが通知しているファイルは %1 であるべきですが、ダウンロードファイルは空でした。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <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="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>ファイルは発見以降に変更されました</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> @@ -2304,7 +2389,7 @@ It is not advisable to use it.</source> <translation>; 復元に失敗: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>ファイルまたはフォルダーが読み込み専用の共有から削除されましたが、復元に失敗しました: %1</translation> </message> @@ -2436,27 +2521,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>ローカルファイルを同期中に削除します。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>ローカルのファイルが同期中に変更されました。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>サーバー (%1) からの予期しない戻りコード</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>サーバーからファイルIDの戻りがありません</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>サーバーからETagの戻りがありません</translation> </message> @@ -2665,22 +2750,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&リンクの共有</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>パスワード:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>有効期限:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>テキストラベル</translation> </message> @@ -2727,7 +2812,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="224"/> <source>Add another link</source> - <translation type="unfinished"/> + <translation>別のリンクを追加</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="402"/> @@ -2737,7 +2822,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="403"/> <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 type="unfinished"/> + <translation><p>本当にこの公開リンク共有<i>%1</i>を削除しますか？</p><p>注：この操作を元に戻すことはできません。</p></translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="410"/> @@ -2753,22 +2838,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <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="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>リンクをコピー</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>'%1' は見つかりませんでした</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>私はあなたと何かを共有しました</translation> </message> @@ -2786,22 +2871,27 @@ It is not advisable to use it.</source> <translation>編集を許可</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>再共有可能</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>共有解除</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>作成可能</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>変更可能</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>削除可能</translation> </message> @@ -2828,7 +2918,7 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation>SSL暗号デバッグ表示</translation> </message> <message> @@ -3014,11 +3104,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>この証明書を信用する</translation> @@ -3047,44 +3132,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>組織名: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>部門名: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>国: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Fingerprint (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingerprint (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Fingerprint (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>Fingerprint (SHA-512): <tt>% 1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>発効日: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>有効期限: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>発行者: %1</translation> </message> @@ -3375,37 +3465,37 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>バージョン %1. 詳細な情報は<a href='%2'>%3</a>を確認してください。</p></translation> + <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="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> - <translation type="unfinished"/> + <translation><p>このリリースは%1によって提供されました</p></translation> </message> </context> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> - <translation type="unfinished"/> + <translation>無効な証明書が検出されました</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> - <translation type="unfinished"/> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation>ホスト "％1"によって無効な証明書が提供されました。 続けますか？</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <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="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>ユーザーと一緒にログインしてください：%1</translation> </message> @@ -3473,11 +3563,6 @@ It is not advisable to use it.</source> <translation>設定...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>詳細...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>ヘルプ</translation> @@ -3589,6 +3674,11 @@ It is not advisable to use it.</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="794"/> <source>Crash now</source> <comment>Only shows in debug mode to allow testing the crash handler</comment> @@ -3648,23 +3738,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>テキストラベル</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>サーバー</translation> @@ -3706,11 +3779,6 @@ It is not advisable to use it.</source> <translation>ローカルフォルダー(&L)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>ローカルデータを保持(&K)</translation> @@ -3729,11 +3797,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>ユーザー名(&U)</translation> @@ -3747,11 +3810,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>続行するには、ブラウザに切り替えてください。</translation> @@ -3766,24 +3824,18 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation>ブラウザを再度開く</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>リンクをコピー</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>テキストラベル</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">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:#0000ff;">自分のサーバーを立てる</span></a></translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="143"/> @@ -3798,7 +3850,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="288"/> <source>Server Address</source> - <translation type="unfinished"/> + <translation>サーバーアドレス</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="304"/> @@ -3814,26 +3866,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>テキストラベル</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>すべてのアカウントはローカルフォルダーと同期されます</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>プッシュボタン</translation> - </message> </context> <context> <name>QObject</name> @@ -3888,7 +3924,7 @@ It is not advisable to use it.</source> <translation>数分前</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3971,14 +4007,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>フォーム</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index 7bc8e6368..cd336bd79 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialogo langas</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etiketė</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Forma</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Pasirinkite kompiuterio aplanką, kurį norite sinchronizuoti.</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Pasirinkite nuotolinį paskirties aplanką</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Saugyklos vieta: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Nepažymėti aplankai bus <b>pašalinti </b> iš Jūsų lokalios failų sistemos ir nebebus sinchronizuojami su šiuo kompiuteriu.</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sinchronizuoti viską</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Nieko nesinchronizuoti</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Pritaikyti ranka atliktus pakeitimus</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Taikyti</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Atsisakyti</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Prisijungta su <server> kaip <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Nėra sukonfiguruotų paskyrų.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Pridėti naują</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Šalinti</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Paskyra</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Ši paskyra palaiko ištisinį šifravimą</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Įjungti šifravimą</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Šifruoti</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Pasirinkti ką sinchronizuoti</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Inicijuoti sinchronizavimą dabar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Paleisti sinchronizavimą iš naujo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Pašalinti aplankų sinchronizavimo ryšį</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Aplanko sukūrimas nepavyko</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Nepavyko sukurti vietinio aplanko <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Patvirtinti aplankų sinchronizavimo ryšio pašalinimą</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Pašalinti aplankų sinchronizavimo ryšį</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Vyksta sinchronizavimas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Vyksta sinchronizavimo operacija.<br/>Ar norite ją nutraukti?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 naudojama</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 kaip <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Serverio versija %1 yra sena ir daugiau nepalaikoma. Jos naudojimas Jūsų pačių atsakomybė.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Prisijungta prie %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Serveris %1 yra laikinai neprieinamas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Šiuo metu serveris %1 yra techninės priežiūros veiksenoje.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Atsijungta iš %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Autorizuojama vykdoma per naršyklę.<a href='%1'>Paspauskite čia</a>, jei norite iš naujo atidaryti naršyklę. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Jungiamasi prie %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>%2 neturi ryšio su %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Prisijungti</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Yra aplankų, kurie nebuvo sinchronizuoti dėl to, kad buvo per dideli: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Aplankai, kurie nebuvo sinchronizuoti, kadangi jie yra išorinės saugyklos:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Yra aplankų, kurie nebuvo sinchronizuoti dėl to, kad buvo per dideli arba yra išorinės saugyklos: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Patvirtinti paskyros pašalinimą</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Ar tikrai norite pašalinti ryšį su paskyra <i>%1</i>?</p><p><b> Pastaba:</b> Failai <b>nebus</b> ištrinti.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Šalinti ryšį</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Atverti aplanką</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Atsijungti</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Pratęsti sinchronizavimą</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pristabdyti sinchronizavimą</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Ar tikrai norite sustabdyti failų sinchronizavimą <i>%1</i>? </p><p><b>Pastaba:</b> Failai <b>nebus</b> ištrinti.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) iš %2 yra naudojami. Kai kuriuose aplankuose gali būti naudojami skirtingi apribojimai.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 iš %2 yra naudojami</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Šiuo metu nėra informacijos apie saugyklos panaudojimą.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Nesukonfigūruota %1 sujungimų.</translation> </message> @@ -543,33 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TextLabel -</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Priimti</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Sinchronizuota</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Bandyti viską įkelti iš naujo</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Paskyra %1 neturi įjungtų veiklų.</translation> </message> @@ -656,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Klaida rašant metaduomenis į duomenų bazę</translation> </message> @@ -664,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -724,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -741,119 +835,119 @@ <translation>%1 nenuskaitoma</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 pašalintas.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 atsisiųstas.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 atnaujintas.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 pevadintas į %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 perkeltas į %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 ir dar %n failas buvo pašalintas.</numerusform><numerusform>%1 ir dar %n failai buvo pašalinti.</numerusform><numerusform>%1 ir dar %n failų buvo pašalinta.</numerusform><numerusform>%1 ir dar %n failų buvo pašalinta.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 ir dar %n failas buvo atsisiųstas.</numerusform><numerusform>%1 ir dar %n failai buvo atsisiųsti.</numerusform><numerusform>%1 ir dar %n failų buvo atsisiųsta.</numerusform><numerusform>%1 ir dar %n failų buvo atsisiųsta.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 ir dar %n failas buvo pakeistas.</numerusform><numerusform>%1 ir dar %n failai buvo pakeisti.</numerusform><numerusform>%1 ir dar %n failų buvo pakeista.</numerusform><numerusform>%1 ir dar %n failų buvo pakeista.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>Failo %1 pavadinimas pakeistas į %2 ir dar %n failo pavadinimas buvo pakeistas.</numerusform><numerusform>Failo %1 pavadinimas pakeistas į %2 ir dar %n failų pavadinimai buvo pakeisti.</numerusform><numerusform>Failo %1 pavadinimas pakeistas į %2 ir dar %n failų pavadinimai buvo pakeisti.</numerusform><numerusform>Failo %1 pavadinimas pakeistas į %2 ir dar %n failų pavadinimai buvo pakeisti.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 buvo perkeltas į %2 ir dar %n failas buvo perkeltas.</numerusform><numerusform>%1 buvo perkeltas į %2 ir dar %n failai buvo perkelti.</numerusform><numerusform>%1 buvo perkeltas į %2 ir dar %n failų buvo perkelta.</numerusform><numerusform>%1 buvo perkeltas į %2 ir dar %n failų buvo perkelta.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 ir dar %n failas turi sinchronizavimo konfliktų.</numerusform><numerusform>%1 ir dar %n failai turi sinchronizavimo konfliktų.</numerusform><numerusform>%1 ir dar %n failų turi sinchronizavimo konfliktų.</numerusform><numerusform>%1 ir dar %n failų turi sinchronizavimo konfliktų.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 turi sinchronizavimo konfliktą. Patikrinkite "konfliktų" failą!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 ir dar %2 failas negalėjo būti sinchronizuoti dėl klaidos. Žurnale rasite daugiau duomenų.</numerusform><numerusform>%1 ir dar %2 failai negalėjo būti sinchronizuoti dėl klaidos. Žurnale rasite daugiau duomenų.</numerusform><numerusform>%1 ir dar %2 failų negalėjo būti sinchronizuoti dėl klaidos. Žurnale rasite daugiau duomenų.</numerusform><numerusform>%1 ir dar %2 failų negalėjo būti sinchronizuoti dėl klaidos. Žurnale rasite daugiau duomenų.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>Dėl klaidos nepavyko sinchronizuotu %1. Daugiau informacijos rasite įvykių registravimo žurnale.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sinchronizavimo veikla</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Nepavyko perskaityti sistemos išskyrimo failo</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Buvo pridėtas naujas, didesnis nei %1 MB, aplankas: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Buvo pridėtas aplankas iš išorinė saugyklos.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Jei norite parsisiųsti, eikite į nustatymus.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Aplankas %1 buvo sukurtas, bet anksčiau buvo įtrauktas į praleidžiamų sąrašą. Ten esantys duomenys nebus sinchronizuoti.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Failas %1 buvo sukurtas, bet anksčiau buvo įtrauktas į praleidžiamų sąrašą. Failas nebus sinchronizuotas.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +956,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +964,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Atsisiųsti naujus failus?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Atsisiųsti naujus failus</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Palikti failus kompiuteryje</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -896,7 +990,7 @@ Jei tai buvo netyčinis veiksmas ir jūs nusprendėte išsaugoti savo failus, ji Open in Google Translate</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -905,17 +999,17 @@ Taip gali nutikti, jei serveryje buvo atkurta atsarginė kopija. Jei tęsite sinchronizavimą, Jūsų ankstesni failai bus perrašyti senesniais. Ar norite išsaugoti savo lokalius naujausius failus kaip konfliktinius failus?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Aptikta atsarginė kopija</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Įprasta sinchronizacija</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Laikyti vietinius failus kaip konfliktinius</translation> </message> @@ -1031,12 +1125,12 @@ Jei tęsite sinchronizavimą, Jūsų ankstesni failai bus perrašyti senesniais. <translation>Pridėti aplanko sinchronizavimo ryšį</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Sinchronizuota su vietiniais aplankais</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Failas</translation> </message> @@ -1066,7 +1160,7 @@ Jei tęsite sinchronizavimą, Jūsų ankstesni failai bus perrašyti senesniais. <translation>Klaida įkeliant aplankų sąrašą iš serverio.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Atsijungta</translation> </message> @@ -1081,109 +1175,109 @@ Jei tęsite sinchronizavimą, Jūsų ankstesni failai bus perrašyti senesniais. <translation>Yra neišspręstų konfliktų. Spustelėkite išsamesnei informacijai.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Pakeitimų suderinimas</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sinchronizuojama %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>atsisiųsti %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>įkelti %1/s </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Ieškoma pakeitimų serveryje „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Ieškoma pakeitimų kompiuteryje „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 of %4) </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Liko %5, %1 iš %2, %3 failas(-ai) iš %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 iš %2, %3 failas(-ai) iš %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>%1 failas(-ai) iš %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Laukiama...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Laukiama dar %n aplanko</numerusform><numerusform>Laukiama dar %n aplankų</numerusform><numerusform>Laukiama dar %n aplankų</numerusform><numerusform>Laukiama dar %n aplankų</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Ruošiamasi sinchronizuoti...</translation> </message> @@ -1314,11 +1408,6 @@ Jei tęsite sinchronizavimą, Jūsų ankstesni failai bus perrašyti senesniais. <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Teisinis pranešimas</translation> @@ -1469,83 +1558,79 @@ Jei tęsite sinchronizavimą, Jūsų ankstesni failai bus perrašyti senesniais. <translation>Failai, kuriuos ignoravo šablonai</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Pridėti</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Šis įrašas pateikiamas sistemoje "% 1" ir negali būti keičiamas šiame rodinyje.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Pašalinti viską</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Šablonai</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Leisti ištrynimą</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Šalinti</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Failai ar aplankai, atitinkantys šabloną, nebus sinchronizuojami - -Elementai, kuriuose galimas trynimas, bus ištrinti, jei jie apsaugos direktoriją nuo pašalinimo. Tai naudinga metaduomenims.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Nepavyko atverti failą</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Nepavyksta įrašyti pakeitimus į "%1".</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Pridėti nepaisymo šabloną</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Pridėti naują ignoravimo šabloną:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Šis įrašas pateikiamas sistemoje "% 1" ir negali būti keičiamas šiame rodinyje.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialogo langas</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Teisinis pranešimas</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Užverti</translation> @@ -1675,11 +1760,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Įgaliotojo serverio nustatymai</translation> @@ -1990,11 +2070,6 @@ papildomų teisių.</translation> <source>Login in your browser</source> <translation>Prisijunkite naršyklėje</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Kopijuoti nuorodą į iškarpinę</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2046,12 +2121,12 @@ Patariama jo nenaudoti.</translation> <translation>&Kitas ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Neteisingas URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Nepavyko įkelti liudijimo. Galbūt, neteisingas slaptažodis?</translation> </message> @@ -2129,79 +2204,79 @@ Patariama jo nenaudoti.</translation> <translation>Nepavyko sukurti vietinio aplanko %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Nenurodytas nuotolinis aplankas!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Klaida: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>kuriamas aplankas Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Nuotolinis aplankas %1 sėkmingai sukurtas.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Serverio aplankas %1 jau yra. Prisijunkite jį sinchronizavimui.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Aplanko sukūrimas sąlygojo HTTP klaidos kodą %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Nepavyko sukurti aplanko serveryje dėl neteisingų prisijungimo duomenų! <br/>Grįžkite ir įsitinkite, kad prisijungimo duomenys teisingai.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Nepavyko sukurti aplanko serveryje dėl neteisingų prisijungimo duomenų.</font><br/>Grįžkite ir įsitinkite, kad prisijungimo duomenys teisingai.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Nepavyko sukurti aplanko %1 serveryje, klaida <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Sinchronizavimo ryšys su %1 su nuotoliniu katalogu %2 buvo nustatytas.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Sėkmingai prisijungta prie %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Susijungti su %1 nepavyko. Pabandykite dar kartą.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Nepavyko pervadinti aplanką</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Nepavyko pašalinti arba padaryti atsarginės aplanko ar failo kopijos, nes jie atidaryti kitoje programoje. Prašome užverti aplanką ir failą, ir bandyti diegti dar kartą.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Sinchronizavimo aplankas %1 kompiuteryje buvo sėkmingai sukurtas! </b></font></translation> </message> @@ -2209,12 +2284,12 @@ Patariama jo nenaudoti.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 ryšio vediklis</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Praleisti aplankų konfigūravimą</translation> </message> @@ -2248,7 +2323,7 @@ Patariama jo nenaudoti.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Klaida rašant metaduomenis į duomenų bazę</translation> </message> @@ -2276,32 +2351,32 @@ Patariama jo nenaudoti.</translation> <translation>Laisvos vietos diske yra mažiau nei %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Failas buvo ištrintas iš serverio</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Nepavyko pilnai atsisiųsti failo.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Failo %1 nepavyko išsaugoti dėl kompiuterio failo nesuderinamumo!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Aptikus failą, jis buvo pakeistas</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Klaida rašant metaduomenis į duomenų bazę</translation> </message> @@ -2314,7 +2389,7 @@ Patariama jo nenaudoti.</translation> <translation>; Atkūrimas nepavyko: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Failas ar aplankas buvo pašalintas iš tik skaitymui skirtos bendros vietos, atstatymas nepavyko: %1</translation> </message> @@ -2446,27 +2521,27 @@ Patariama jo nenaudoti.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Vietinis failas sinchronizavimo metu buvo pašalintas.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Failas kompiuteryje sinchronizavimo metu buvo pakeistas.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Nežinomas atsakymo kodas iš serverio (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Nėra File ID iš serverio</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Nėra ETag iš serverio</translation> </message> @@ -2675,22 +2750,22 @@ Patariama jo nenaudoti.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Dalinimosi nuoroda</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Slaptažodis:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Galiojimo pabaiga:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -2737,7 +2812,7 @@ Patariama jo nenaudoti.</translation> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="224"/> <source>Add another link</source> - <translation type="unfinished"/> + <translation>Pridėti dar vieną nuorodą</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="402"/> @@ -2763,22 +2838,22 @@ Patariama jo nenaudoti.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Dalintis su naudotojais ar grupėmis ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Kopijuoti nuorodą</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Pagal kriterijų %1 nieko nerasta</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Pasidalinau kai kuo su jumis</translation> </message> @@ -2796,22 +2871,27 @@ Patariama jo nenaudoti.</translation> <translation>gali keisti</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Gali pakartotinai dalintis</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Gali kurti</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Gali keisti</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Gali trinti</translation> </message> @@ -2838,8 +2918,8 @@ Patariama jo nenaudoti.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>SSL šifro derinimo rodinys</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3024,11 +3104,6 @@ Patariama jo nenaudoti.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Vis tiek pasitikėti šiuo liudijimu</translation> @@ -3057,44 +3132,49 @@ Patariama jo nenaudoti.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organizacija: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Vienetas: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Šalis: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Kontrolinis kodas (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Kontrolinis kodas (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Įsigalioja nuo: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Galioja iki: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Leidėjas: %!</translation> </message> @@ -3385,11 +3465,11 @@ Patariama jo nenaudoti.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versija %1. Išsamesnei informacijai, apsilankykite <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Šį išleidimą pateikė %1</p></translation> </message> @@ -3397,25 +3477,25 @@ Patariama jo nenaudoti.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Aptiktas netinkamas sertifikatas</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> - <translation>Serveris „%1“ naudoja netinkamą sertifikatą. Tęsti?</translation> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation>Serveris "%1" pateikė negaliojantį liudijimą. Tęsti?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>%1 jus atjungė kaip vartotoją %2. Pabandykite prisijungti dar kartą</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Prisijunkite vartotoju: %1</translation> </message> @@ -3483,11 +3563,6 @@ Patariama jo nenaudoti.</translation> <translation>Nustatymai...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Išsamiau...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Pagalba</translation> @@ -3599,6 +3674,11 @@ Patariama jo nenaudoti.</translation> <translation>Nauja paskyra...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3658,23 +3738,6 @@ Patariama jo nenaudoti.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Serveris</translation> @@ -3716,11 +3779,6 @@ Patariama jo nenaudoti.</translation> <translation>Aplankas kompiuteryje</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>Palikti failus kompiuteryje</translation> @@ -3739,11 +3797,6 @@ Patariama jo nenaudoti.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>Na&udotojo vardas</translation> @@ -3757,11 +3810,6 @@ Patariama jo nenaudoti.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Norėdami tęsti, persijunkite į savo naršyklę.</translation> @@ -3776,21 +3824,15 @@ Patariama jo nenaudoti.</translation> <source>Re-open Browser</source> <translation>Iš naujo atverti naršyklę</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Turėkite savo serveryje</span></a></translation> @@ -3824,26 +3866,10 @@ Patariama jo nenaudoti.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Visa paskyra yra sinchronizuota su kompiuterio aplanku</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3898,7 +3924,7 @@ Patariama jo nenaudoti.</translation> <translation>Kažkada anksčiau</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3981,14 +4007,6 @@ Patariama jo nenaudoti.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Forma</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_lv.ts b/translations/client_lv.ts index 7e0849455..e083833ad 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -50,7 +50,7 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>Atvērt vietni</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> @@ -65,32 +65,27 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>Palīdzība</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>Iestatījumi</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>Iziet</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> <source>Quit sync client</source> - <translation type="unfinished"/> + <translation>Iziet no sinhronizācijas klienta</translation> </message> </context> <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialogs</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Apzīmējums</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> <translation>Forma</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Izvēlies lokālo datni no sava datora, ko sinhronizēt </translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Izvēlies mērķa mapi</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Krātuves vieta: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Neatzīmētās mapes tiks <b>noņemtas</b> no lokālās datņu sistēmas un vairs netiks sinhronizētas ar šo datoru</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sinhronizēt visu</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sinhronizēt neko</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Pielietot manuālās izmaiņas</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Pielietot</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Atcelt</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Savienojies ar <server> kā <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Nav konfigurēts konts.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Pievienot jaunu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Noņemt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Konts</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Šifrēt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Izvēlies ko sinhronizēt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Piespeist tūlītēju sinhronizēšanu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Restartēt sinronizāciju</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Noņemt mapes sinhronizācijas savienojumu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Mapes izveide neizdevās</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Nevarējas izveidot lokālo mapi <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Noņemt mapes sinhronizācijas savienojuma noņemšanai</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Noņemt mapes sinhronizācijas savienojumu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Notiek Sinhronizācija</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Pašlaik notiek sinhronizācijas operācija.<br/>Vai to izbeigt?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 tiek lietots</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 kā <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Servera versija %1 ir novecojusi un netiek atbalstīta! Turpini un paša atbildību.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Savienots ar %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Serveris %1 ir īslaicīgi nepiejams.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Serveris %1 pašlaik ir uzturēšanas režīmā</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Izrakstījies no %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Saņemam pilnvaru no pārlūka. <a href='%1'>Noklikšķini šeit</a>lai atkārtoti atvērtu pārlūku.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Savienojas ar %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Nav savienojuma ar %1 pie %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Pieteikties</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Šīs mapes netika sinhronizētas, jo tās ir pārāk lielas:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Šīs mapes netika sinhronizētas, jo tās atrodas ārējās krātuvēs:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Šīs mapes netika sinhronizētas, jo tās ir pārāk lielas, vai atrodas ārējās krātuvēs:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Apstiprini Konta noņemšanai</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Vai tiešām vēlaties noņemt savienojumu kontam <i>%1</i>?</p><p><b>Piezīme:</b> Tas <b>neveiks</b> nekādu datņu dzēšanu.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Noņemt savienojumu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Atvērt mapi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Iziet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Turpināt sinhronizāciju</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pauzēt sinhronizāciju</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Vai tiešām vēlaties apturēt mapes <i>%1</i> sinhronizēšanu?</p><p><b>Piezīme:</b> Tas <b>neveiks</b> nekādu datņu dzēšanu.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) no %2 izmantots. Dažas mapes, tajā skaitā montētas no tīkla vai koplietotas, var saturēt dažādus ierobežojumus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 no %2 izmantots</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Pašlaik nav pieejama diska vietas informācija.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Nav %1 savienojums konfigurēts.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Akceptēt</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Sinhronizēts</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Atkārtot visas augšupielādes</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Kontam %1 darbības nav iespējots.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Kļūda rakstot metadatus datubāzē</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Lūdzu ievadiet jūsu end to end šifrēšanas paroli:<br><br>Lietotājs: %2<br>Konts: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Ievadiet E2E paroli</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 nav lasāma.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 tika noņemta.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ir ticis lejupielādēts.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ir atjaunināts.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ir pārsaukts par %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 ir pārvietots uz %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 un %n citas datne(s) tika noņemtas.</numerusform><numerusform>%1 un %n citas datne(s) tika noņemtas.</numerusform><numerusform>%1 un %n citas datne(s) tika noņemtas.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 un %n citas datne(s) tika lejupielādētās.</numerusform><numerusform>%1 un %n citas datne(s) tika lejupielādētās.</numerusform><numerusform>%1 un %n citas datne(s) tika lejupielādētās.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 un %n citas datne(s) tika atjaunotas.</numerusform><numerusform>%1 un %n citas datne(s) tika atjaunotas.</numerusform><numerusform>%1 un %n citas datne(s) tika atjaunotas.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 tika pārsaukta uz %2 un %n citas datne(s) tika pārsauktas.</numerusform><numerusform>%1 tika pārsaukta uz %2 un %n citas datne(s) tika pārsauktas.</numerusform><numerusform>%1 tika pārsaukta uz %2 un %n citas datne(s) tika pārsauktas.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 tika pārvietota uz %2 un %n citas datne(s) tika pārvietotas.</numerusform><numerusform>%1 tika pārvietota uz %2 un %n citas datne(s) tika pārvietotas.</numerusform><numerusform>%1 tika pārvietota uz %2 un %n citas datne(s) tika pārvietotas.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 un %n citām datnēm ir sinhronizācijas konflikts.</numerusform><numerusform>%1 un %n citām datnēm ir sinhronizācijas konflikts.</numerusform><numerusform>%1 un %n citām datnēm ir sinhronizācijas konflikts.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 ir sinhronizācijas konflikts. Lūdzu pārbaudiet konfliktējošo datni!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Sinhronizācijas darbība</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Nevarēja nolasīt sistēmas izņēmumu datni.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Jauna mape lielāka par %1 MB ir tikusi pievienota: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Mape no ārējās krātuves ir tikusi pievienota. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Lūdzu ieej iestatījumos un izvēlies to, ja tu to gribi lejupielādēt.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,46 +965,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Dublējums atrasts</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Saglabāt lokālās datnes kā konfliktu</translation> </message> @@ -1025,12 +1120,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Datne</translation> </message> @@ -1060,7 +1155,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation type="unfinished"/> </message> @@ -1075,107 +1170,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sinhronizē %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>lejupielāde %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>augšupielāde %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 no %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 atlicis, %1 no %2, datne %3 no %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 no %2, datne %3 no %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>datne %1 no %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Gaida...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Sagatavojas sinhronizācijai...</translation> </message> @@ -1306,11 +1401,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1459,81 +1549,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Pievienot</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation type="unfinished"/> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1663,11 +1751,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation type="unfinished"/> @@ -1977,11 +2060,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>Pieteikties jūsu pārlūkā</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2032,12 +2110,12 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2115,79 +2193,79 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation type="unfinished"/> </message> @@ -2195,12 +2273,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation type="unfinished"/> </message> @@ -2234,7 +2312,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -2262,32 +2340,32 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -2300,7 +2378,7 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -2432,27 +2510,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -2526,7 +2604,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/> <source>Loading ...</source> - <translation type="unfinished"/> + <translation>Notiek ielāde...</translation> </message> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="79"/> @@ -2541,7 +2619,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="96"/> <source>Size</source> - <translation type="unfinished"/> + <translation>Izmērs</translation> </message> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> @@ -2568,7 +2646,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/settingsdialog.ui" line="14"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>Iestatījumi</translation> </message> <message> <location filename="../src/gui/settingsdialog.cpp" line="211"/> @@ -2588,7 +2666,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/settingsdialog.cpp" line="234"/> <source>Account</source> - <translation type="unfinished"/> + <translation>Konts</translation> </message> </context> <context> @@ -2617,7 +2695,7 @@ It is not advisable to use it.</source> <location filename="../src/gui/settingsdialogmac.cpp" line="138"/> <location filename="../src/gui/settingsdialogmac.cpp" line="231"/> <source>Account</source> - <translation type="unfinished"/> + <translation>Konts</translation> </message> </context> <context> @@ -2645,7 +2723,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharedialog.cpp" line="80"/> <source>%1</source> - <translation type="unfinished"/> + <translation>%1</translation> </message> <message> <location filename="../src/gui/sharedialog.cpp" line="101"/> @@ -2661,29 +2739,29 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Share saite</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="409"/> <source>Delete</source> - <translation type="unfinished"/> + <translation>Dzēst</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="149"/> @@ -2708,7 +2786,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="183"/> <source>Password Protect</source> - <translation type="unfinished"/> + <translation>Aizsargāts ar paroli</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="200"/> @@ -2738,7 +2816,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="410"/> <source>Cancel</source> - <translation type="unfinished"/> + <translation>Atcelt</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="428"/> @@ -2749,22 +2827,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation type="unfinished"/> </message> @@ -2782,22 +2860,27 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2824,7 +2907,7 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> @@ -2960,12 +3043,12 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sslbutton.cpp" line="111"/> <source>SHA-256:</source> - <translation type="unfinished"/> + <translation>SHA-256:</translation> </message> <message> <location filename="../src/gui/sslbutton.cpp" line="112"/> <source>SHA-1:</source> - <translation type="unfinished"/> + <translation>SHA-1:</translation> </message> <message> <location filename="../src/gui/sslbutton.cpp" line="116"/> @@ -2980,7 +3063,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sslbutton.cpp" line="138"/> <source>%1</source> - <translation type="unfinished"/> + <translation>%1</translation> </message> <message> <location filename="../src/gui/sslbutton.cpp" line="173"/> @@ -3008,11 +3091,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation type="unfinished"/> @@ -3041,44 +3119,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation type="unfinished"/> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> + <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> - <source>Fingerprint (SHA1): <tt>%1</tt></source> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation type="unfinished"/> </message> @@ -3254,7 +3337,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/syncengine.cpp" line="513"/> <source>Filename is too long.</source> - <translation type="unfinished"/> + <translation>Datnes nosaukums ir pārāk garš.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="522"/> @@ -3369,11 +3452,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versija %1. Vairāk informācijai lūdzu apmekējiet <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Šo izlaidumu piegādāja %1</p></translation> </message> @@ -3381,25 +3464,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Detektēts nederīgs sertifikāts</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> - <translation>Hosts "%1" piedāvāja nederīgu sertifikātu. Turpināt?</translation> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Jūs esat atteicies no %1 kā lietotājs %2. Lūdzu piesakieties atkārtoti</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Lūdzu piesakieties kā lietotājs: %1</translation> </message> @@ -3467,11 +3550,6 @@ It is not advisable to use it.</source> <translation>Iestatījumi...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detaļas...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Palīdzība</translation> @@ -3583,6 +3661,11 @@ It is not advisable to use it.</source> <translation>Jauns konts...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3642,23 +3725,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Serveris</translation> @@ -3700,11 +3766,6 @@ It is not advisable to use it.</source> <translation>Lokālā mape</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>Paturēt lokālos datus</translation> @@ -3723,11 +3784,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>Lietotājvārds</translation> @@ -3741,11 +3797,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Lūdzu pārslēdzieties uz pārlūku lai apstiprinātu.</translation> @@ -3760,21 +3811,15 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation>Atkārtoti atvērt pārlūku</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TekstaApzīmējums</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Uzturi pats savu serveri</span></a></translation> @@ -3792,7 +3837,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="288"/> <source>Server Address</source> - <translation type="unfinished"/> + <translation>Servera adrese</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="304"/> @@ -3808,26 +3853,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TekstaApzīmējums</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Viss jūsu konts ir sinhronizēts ar lokālo mapi</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Spiedpoga</translation> - </message> </context> <context> <name>QObject</name> @@ -3882,7 +3911,7 @@ It is not advisable to use it.</source> <translation>Kādu laiku atpakaļ</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3965,14 +3994,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Forma</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index f11ee9cb3..f2cf3dd6e 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etikett</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Skjema</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Velg en lokal mappe på din maskin som skal synkroniseres</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Velg en ekstern mappe som målmappe</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>…</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Lagringsplass: …</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Umarkerte mapper vil bli <b>fjernet</b> fra ditt lokale filsystem og vil ikke bli synkronisert med denne maskinen lenger</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Synkroniser alle</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Synkroniser ingen</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Bruk manuelle endringer</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Bruk</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Tilkoblet <server> som <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Ingen konto konfigurert.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Legg til ny</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Fjern</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Krypter</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Velg hva som synkroniseres</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Tving synkronisering nå</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Synkroniser på ny</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Fjern tilkobling for synkronisering av mappe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Oppretting av mappe feilet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Klarte ikke å opprette lokal mappe <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bekreft fjerning av tilkobling for synkronisering av mappe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Fjern tilkobling for mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Synkroniserer...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Synkronisering kjører.<br/>Vil du avbryte den?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 i bruk</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 som <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Server-versjonen %1 er gammel og støttes ikke! Fortsett på egen risiko.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Tilkoblet %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 er midlertidig utilgjengelig.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 er for øyeblikket i vedlikeholdsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Logget ut fra %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Kobler til %1 …</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Ingen tilkobling til %1 på %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Logg inn</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Noen mapper ble ikke synkronisert fordi de er for store</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Noen mapper ble ikke synkronisert fordi de er eksterne lagringsplasser:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Noen mapper ble ikke synkronisert fordi de er for store eller de er eksterne lagringsplasser:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Bekreft fjerning av konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Vil du virkelig fjerne tilkoblingen til kontoen <i>%1</i>?</p><p><b>Merk:</b> Dette vil <b>ikke</b> slette noen filer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Fjern tilkobling</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Åpne mappe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Logg ut</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Fortsett synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Sett synkronisering på pause</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Vil du virkelig stoppe synkronisering av mappen <i>%1</i>?</p><p><b>Merk:</b> Dette vil <b>ikke</b> slette noen filer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) av %2 i bruk. Noen mapper, inkludert nettverkstilkoblede eller delte mapper, kan ha andre begrensninger.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 av %2 i bruk</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Ingen informasjon om bruk av lagringsplass tilgjengelig for øyeblikket.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Ingen %1-forbindelse konfigurert.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Tekst-etikett</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Aksepter</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Synkronisert</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Prøv alle opplastinger igjen</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Konto %1 har ikke aktiviteter aktivert.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,119 +835,119 @@ <translation>%1 kan ikke leses.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 har blitt fjernet.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 har blitt lastet ned.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 har blitt oppdatert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 har blitt omdøpt til %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 har blitt flyttet til %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 og %n annen fil har blitt fjernet.</numerusform><numerusform>%1 og %n andre filer har blitt fjernet.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 og %n annen fil har blitt lastet ned.</numerusform><numerusform>%1 og %n andre filer har blitt lastet ned.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 og %n annen fil har blitt oppdatert.</numerusform><numerusform>%1 og %n andre filer har blitt oppdatert.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 er blitt omdøpt til %2 og %n annen fil har blitt omdøpt.</numerusform><numerusform>%1 er blitt omdøpt til %2 og %n andre filer har blitt omdøpt.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 er blitt flyttet til %2 og %n annen fil har blitt flyttet.</numerusform><numerusform>%1 er blitt flyttet til %2 og %n andre filer har blitt flyttet.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 har en synkroniseringskonflikt. Sjekk konflikt-filen.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 og %n andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</numerusform><numerusform>%1 og %n andre filer kunne ikke synkroniseres på grunn av feil. Se logg for detaljer.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 kunne ikke synkroniseres på grunn av en feil. Se logg for detaljer.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Synkroniseringsaktivitet</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Klarte ikke å lese systemets ekskluderingsfil</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>En ny mappe større enn %1 MB er blitt lagt til: %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>En mappe fra et eksternt lager er blitt lagt til. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Gå til Innstillinger og velg den hvis du ønsker å laste den ned.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -861,7 +956,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -869,22 +964,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Hent nye filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Hent nye filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Behold lokale filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -893,7 +988,7 @@ Er du sikker på at du ønsker å synkronisere denne handlingen med serveren? Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert tilbake fra serveren.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -902,17 +997,17 @@ Dette kan være fordi en backup ble gjenopprettet på serveren. Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrevet av en eldre fil i en tidligere tilstand. Ønsker du å beholde dine ferskeste lokale filer som konflikt-filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Backup oppdaget</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Normal synkronisering</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Behold lokale filer som konflikt</translation> </message> @@ -1028,12 +1123,12 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev <translation>Legg til mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Synkroniserte med lokal mappe</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Fil</translation> </message> @@ -1063,7 +1158,7 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev <translation>Feil ved innlasting av listen av mapper fra serveren.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Logget ut</translation> </message> @@ -1078,107 +1173,107 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Sammenslår endringer</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synkroniserer %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>nedlasting %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>opplasting %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Sjekker for endringer eksternt '% 1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Sjekker for endringer lokalt '% 1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 av %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 igjen, %1 av %2, fil %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 av %2, fil %3 av %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>fil %1 av %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Venter …</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Venter på %n annen mappe...</numerusform><numerusform>Venter på %n andre mappe(r) …</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Forbereder synkronisering …</translation> </message> @@ -1309,11 +1404,6 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Juridisk varsel</translation> @@ -1464,83 +1554,79 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev <translation>Filer som ignorerers av mønstre</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Legg til</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Denne oppføringen er gitt av systemet på '%1' og kan ikke endres i denne visningen.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Fjern alle</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Mønster</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Tillat sletting</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Fjern</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Filer eller mapper som passer med et mønster vil ikke bli synkronisert. - -Elementer hvor sletting er tillatt, vil bli slettet hvis de forhindrer fjerning av en mappe. Dette er hendig for metadata.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Klarte ikke å åpne fil</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Kan ikke skrive endringer til '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Nytt mønster</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Legg til ignoreringsmønster:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Denne oppføringen er gitt av systemet på '%1' og kan ikke endres i denne visningen.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Juridisk varsel</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>Tekst-etikett</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Lukk</translation> @@ -1670,11 +1756,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Proxy-innstillinger</translation> @@ -1985,11 +2066,6 @@ kan be om flere rettigheter under behandlingen.</translation> <source>Login in your browser</source> <translation>Logg inn i din nettleser</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Kopier lenke til utklippstavlen</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2041,12 +2117,12 @@ Det er ikke tilrådelig å bruke den.</translation> <translation>&Neste ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Ugyldig addresse</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Sertifikatet kunne ikke lastes. Kanskje feil passord?</translation> </message> @@ -2124,79 +2200,79 @@ Det er ikke tilrådelig å bruke den.</translation> <translation>Klarte ikke å opprette lokal mappe %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Ingen ekstern mappe spesifisert!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>oppretter mappe på Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Ekstern mappe %1 ble opprettet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Ekstern mappe %1 finnes allerede. Kobler den til for synkronisering.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Oppretting av mappe resulterte i HTTP-feilkode %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Oppretting av ekstern mappe feilet fordi påloggingsinformasjonen er feil!<br/>Gå tilbake og sjekk brukernavnet og passordet ditt.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Oppretting av ekstern mappe feilet, sannsynligvis fordi oppgitt påloggingsinformasjon er feil.</font><br/>Vennligst gå tilbake og sjekk ditt brukernavn og passord.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Oppretting av ekstern mappe %1 feilet med feil <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>En synkroniseringsforbindelse fra %1 til ekstern mappe %2 ble satt opp.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Forbindelse til %1 opprettet!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Klarte ikke å etablere forbindelse til %1. Sjekk igjen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Omdøping av mappe feilet</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Kan ikke fjerne og sikkerhetskopiere mappen fordi mappen eller en fil i mappen er åpen i et annet program. Lukk mappen eller filen og prøv igjen, eller avbryt oppsettet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Oppretting av lokal synkroniseringsmappe %1 vellykket!</b></font></translation> </message> @@ -2204,12 +2280,12 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Veiviser for tilkobling</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Hopp over mappekonfigurasjon</translation> </message> @@ -2243,7 +2319,7 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -2271,32 +2347,32 @@ Det er ikke tilrådelig å bruke den.</translation> <translation>Ledig plass på disk er mindre enn %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Filen ble slettet fra serveren</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Hele filen kunne ikke lastes ned.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Fil %1 kan ikke lagres på grunn av lokal konflikt med filnavn.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Filen er endret siden den ble oppdaget</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -2309,7 +2385,7 @@ Det er ikke tilrådelig å bruke den.</translation> <translation>; Gjenoppretting feilet: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>En fil eller mappe ble fjernet fra en deling med lesetilgang, men gjenoppretting feilet: %1</translation> </message> @@ -2441,27 +2517,27 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Den lokale filen ble fjernet under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Lokal fil endret under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Uventet returkode fra serveren (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Mangler File ID fra server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Mangler ETag fra server</translation> </message> @@ -2670,22 +2746,22 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Delingslenke</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Passord:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Utløpsdato:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>Tekst-etikett</translation> </message> @@ -2758,22 +2834,22 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Del med brukere eller grupper …</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Kopier lenke</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Ingen resultater for '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Jeg delte noe med deg</translation> </message> @@ -2791,22 +2867,27 @@ Det er ikke tilrådelig å bruke den.</translation> <translation>kan endre</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>kan opprette</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Kan endre</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Kan slette</translation> </message> @@ -2833,8 +2914,8 @@ Det er ikke tilrådelig å bruke den.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>SSL Chipher Debug View</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3019,11 +3100,6 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Stol på dette sertifikatet likevel</translation> @@ -3052,44 +3128,49 @@ Det er ikke tilrådelig å bruke den.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organisasjon: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Enhet: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Land: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Fingeravtrykk (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingeravtrykk (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Gyldig fra dato: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Utløpsdato: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Utsteder: %1</translation> </message> @@ -3380,11 +3461,11 @@ Det er ikke tilrådelig å bruke den.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versjon %1. For mer informasjon gå til <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3392,25 +3473,25 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3478,11 +3559,6 @@ Det er ikke tilrådelig å bruke den.</translation> <translation>Innstillinger …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detaljer …</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Hjelp</translation> @@ -3594,6 +3670,11 @@ Det er ikke tilrådelig å bruke den.</translation> <translation>Ny konto …</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3653,23 +3734,6 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>Tekst-etikett</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Server</translation> @@ -3711,11 +3775,6 @@ Det er ikke tilrådelig å bruke den.</translation> <translation>&Lokal mappe</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Behold lokale data</translation> @@ -3734,11 +3793,6 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Brukernavn</translation> @@ -3752,11 +3806,6 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Vennligst bytt til nettleseren din for å fortsette.</translation> @@ -3771,21 +3820,15 @@ Det er ikke tilrådelig å bruke den.</translation> <source>Re-open Browser</source> <translation>Gjenåpne nettleser</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Tekst-etikett</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3819,26 +3862,10 @@ Det er ikke tilrådelig å bruke den.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Tekst-etikett</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Hele kontoen din er synkronisert til den lokale mappen</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Trykknapp</translation> - </message> </context> <context> <name>QObject</name> @@ -3893,7 +3920,7 @@ Det er ikke tilrådelig å bruke den.</translation> <translation>For en stund siden</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3976,14 +4003,6 @@ Det er ikke tilrådelig å bruke den.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 2dee9bdb6..7b1139a6a 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialoog</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Label</translation> @@ -116,16 +111,67 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> <translation>Formulier</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Schakel om naar je browser om door te gaan.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Er trad een verbindingsfout op. Probeer nogmaals.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Heropen browser</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiëren link </translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation>Formulier</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Schakel om naar je browser om door te gaan.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Er trad een verbindingsfout op. Probeer nogmaals.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Heropen browser</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Kopiëren link </translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> - <translation>Kies een map op uw computer om te synchroniseren</translation> + <translation>Kies een map op je computer om te synchroniseren</translation> </message> <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Kies een externe doelmap</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Begin-tot-eind versleutelingsmnemonic</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Om je cryptografiesche Identiteit te beschermen, versleutelen we die met een mnemonic van 12 woorden. Schrijf die op en bewaar ze op een veilige plek. Ze zijn nodig om nieuwe apparaten aan he account toe te voegen (zoals je smartphone of laptop).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Opslagruimte: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Niet geselecteerde mappen worden <b>verwijderd</b> van uw lokale bestandssysteem en worden niet meer gesynchroniseerd met deze computer</translation> + <translation>Niet geselecteerde mappen worden <b>verwijderd</b> van je lokale bestandssysteem en worden niet meer gesynchroniseerd met deze computer</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Alles synchroniseren</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Niets synchroniseren</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Toepassen handmatige wijzigingen</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Toepassen</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Annuleren</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Verbonden met <server> als <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Geen account ingesteld.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Toevoegen nieuw</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Verwijder</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Dit account ondersteunt end-to-endversleuteling</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Encryptie activeren</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Tonen E2E mnemonic</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Versleutelen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Bewerken genegeerde bestanden</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Selectieve synchronisatie</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forceer sync nu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Herstarten sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Verwijderen map sync verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Maken map mislukt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Kon lokale map <i>%1</i> niet maken.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bevestig verwijderen Map Sync verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Verwijderen Map Sync verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Bezig met synchroniseren</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Bezig met synchroniseren.<br/>Wilt u stoppen met synchroniseren?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 in gebruik</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 als <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>De serverversie %1 is oud en wordt niet meer ondersteund. Verdergaan is op eigen risico.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Verbonden met %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 is tijdelijk niet beschikbaar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 momenteel in onderhoudsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Uitgelogd van %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Authorization van de browser verkrijgen. <a href='%1'>Klik hier</a> om de browser te heropenen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Verbinden met %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Geen verbinding met %1 op %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Meld u aan</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze op externe opslag staan:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn of op externe opslag staan:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Bevestig verwijderen account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Wilt u echt de verbinding met het account <i>%1</i> verbreken?</p><p><b>Let op:</b> Hierdoor verwijdert u <b>geen</b> bestanden.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Verwijderen verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Openen map</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Afmelden</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Hervatten sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pauzeren sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Weet u zeker dat u de synchronisatie van map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal <b>geen</b> bestanden verwijderen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) van %2 in gebruik. Sommige mappen, inclusief netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 van %2 in gebruik</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Geen %1 connectie geconfigureerd.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Tekstlabel</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Accepteren</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Gesynchroniseerd</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Probeer alle uploads opnieuw</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Account %1 heeft geen activiteiten ingeschakeld.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Fout bij schrijven van Metadata naar de database</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Voer je begin-tot-eind crypto wachtwoordzin in: <br><br>Gebruiker: %2<br>Account: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Invoeren E2E wachtwoordzin</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Fout gemeld door de server: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Er trad een fout op bij het benaderen van het 'token' endpoint: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Kon de van de server ontvangen JSON niet verklaren: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Het antwoord van de server bevatte niet alle verwachte velden</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Verbinden met %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Login in je browser (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>Kon de browser niet openen, kopieer de link naar je browser.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>Kon de browser niet openen, kopieer de link naar je browser.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 is niet leesbaar.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 is verwijderd.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 is gedownload.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 is bijgewerkt.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 is hernoemd naar %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 is verplaatst naar %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 en %n ander bestand(en) zijn verwijderd.</numerusform><numerusform>%1 en %n andere bestand(en) zijn verwijderd.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> - <translation><numerusform>%1 en %n ander bestand(en) zijn gedownload.</numerusform><numerusform>%1 en %n andere bestand(en) zijn gedownload.</numerusform></translation> + <translation><numerusform>%1 en %n ander bestand zijn gedownload.</numerusform><numerusform>%1 en %n andere bestand(en) zijn gedownload.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 en %n ander bestand(en) zijn bijgewerkt.</numerusform><numerusform>%1 en %n andere bestand(en) zijn bijgewerkt.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 is hernoemd naar %2 en %n ander bestand(en) is hernoemd.</numerusform><numerusform>%1 is hernoemd naar %2 en %n andere bestand(en) zijn hernoemd.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 is verplaatst naar %2 en %n ander bestand(en) is verplaatst.</numerusform><numerusform>%1 is verplaatst naar %2 en %n andere bestand(en) zijn verplaatst.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 en %n ander bestand(en) hebben een sync conflict.</numerusform><numerusform>%1 en %n andere bestand(en) hebben sync conflicten.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 heeft een sync conflict. Controleer het conflict bestand!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 en %n ander bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform><numerusform>%1 en %n andere bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 kon niet worden gesynchroniseerd door een fout. Bekijk het log voor details.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Synchronisatie-activiteit</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Kon het systeem-uitsluitingsbestand niet lezen</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Er is een nieuwe map groter dan %1 MB toegevoegd: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Er is een map op externe opslag toegevoegd. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Map %1 is gecreëerd, maar eerder uitgesloten van synchronisatie. Bestanden erin worden niet gesynchroniseerd.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Bestand %1 is gecreëerd, maar eerder uitgesloten van synchronisatie. Het wordt niet gesynchroniseerd.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,60 +961,60 @@ Dit betekent dat de synchronisatieclient misschien niet meteen lokale wijziginge %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep 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>Alle bestanden in de syncmap '%1' werden verwijderd van de server. -Deze verwijderingen worden gesynchroniseerd naar uw lokale syncmap, waardoor deze bestanden niet meer beschikbaar zijn, tenzij u het recht hebt om ze te herstellen. -Als u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server als u die autorisatie hebt. -Als u de bestanden wilt verwijderen, worden ze niet beschikbaar, tenzij u de eigenaar bent.</translation> +Deze verwijderingen worden gesynchroniseerd naar je lokale syncmap, waardoor deze bestanden niet meer beschikbaar zijn, tenzij je het recht hebt om ze te herstellen. +Als je de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server als je die autorisatie hebt. +Als je de bestanden wilt verwijderen, worden ze niet beschikbaar, tenzij je de eigenaar bent.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Downloaden nieuwe bestanden?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Downloaden nieuwe bestanden</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Bewaar lokale bestanden</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> - <translation>Alle bestanden in de lokale syncmap '%1' werden verwijderd van de server. Deze verwijderingen worden gesynchroniseerd naar uw server, Weet u zeker dat ik deze acties wilt synchroniseren met de server? -Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server.</translation> + <translation>Alle bestanden in je lokale syncmap '%1' werden verwijderd. Deze verwijderingen worden gesynchroniseerd naar je server, waardoor de bestanden niet beschikbaar zijn, tenzij ze worden teruggezet. Weet je zeker dat je deze acties wilt synchroniseren met de server? +Als dit een ongelukje was en je de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> - <translation>Deze synchronisatie zou uw bestanden terug zetten naar een eerdere staat van de synchronisatie map '%1'. + <translation>Deze synchronisatie zou je bestanden terugzetten naar een eerdere staat van de synchronisatie map '%1'. Dit kan komen doordat een backup is hersteld op de server. -Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere versie. Wilt u uw lokale meer recente bestanden behouden als conflict bestanden?</translation> +Doorgaan met deze synchronisatie overschrijft al je bestanden door een eerdere versie. Wilt je jouw lokale meer recente bestanden behouden als conflict bestanden?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Backup gedetecteerd</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Normale synchronisatie</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Behoud lokale bestanden als conflict</translation> </message> @@ -1035,12 +1130,12 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v <translation>Toevoegen mapsync verbinding</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Gesynchroniseerd met lokale map</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>Gesynchroniseerd met lokale map (%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Bestand</translation> </message> @@ -1071,7 +1166,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v <translation>Fout bij ophalen mappenlijst van de server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Afgemeld</translation> </message> @@ -1086,107 +1181,107 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v <translation>Er zijn nog niet-opgehelderde conflicten. Klik voor details.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Wijzigingen in overeenstemming brengen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchroniseren %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Controleren op wijzigingen in externe '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Controleren op wijzigingen in lokale '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 van %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 over, %1 van %2, bestand %3 van %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 van %2, bestand %3 van %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>bestand %1 van %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Aan het wachten...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Wacht op %n andere map...</numerusform><numerusform>Wacht op %n andere mappen...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Voorbereiden op sync...</translation> </message> @@ -1317,11 +1412,6 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Juridische bepalingen</translation> @@ -1476,83 +1566,81 @@ Account: %3 <translation>Bestanden volgens patroon genegeerd</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Toevoegen</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Dit gegeven is door het systeem vastgelegd op '%1' en kan niet worden aangepast in deze weergave.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Alles verwijderen</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation>IgnoreListTableWidget</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation>Patroon</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Verwijderen toestaan</translation> + <translation>Toestaan verwijderen </translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>Toevoegen</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Verwijder</translation> + <translation>Verwijderen</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation>Alles verwijderen</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>Bestanden of mappen die overeenkomen met een patroon zullen niet worden gesynchroniseerd. -Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een map verdwijnt. Dit is nuttig voor metadata.</translation> +Onderdelen die gewist mogen worden, worden verwijderd als ze verhinderen dat een map verdwijnt. Dit is nuttig voor metadata.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation>Kon het bestand niet openen</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Er kunnen geen wijzigingen worden geschreven naar %1</translation> + <translation>Kan geen wijzigingen wegschrijven naar '%1'.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation>Toevoegen negeerpatroon</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> <translation>Voeg nieuw negeerpatroon toe:</translation> </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Dit gegeven is door het systeem vastgelegd op '%1' en kan niet worden aangepast in deze weergave.</translation> - </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialoog</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Juridische bepalingen</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Sluiten</translation> @@ -1684,11 +1772,6 @@ Logs worden geschreven naar %1</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Proxy Instellingen</translation> @@ -1874,7 +1957,7 @@ vragen om extra autorisaties tijdens installatie.</translation> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="159"/> <source>No updates available. Your installation is at the latest version.</source> - <translation>Geen updates beschikbaar. Uw installatie is al de laatste versie.</translation> + <translation>Geen updates beschikbaar. Je installatie is al van de laatste versie.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="178"/> @@ -1999,11 +2082,6 @@ vragen om extra autorisaties tijdens installatie.</translation> <source>Login in your browser</source> <translation>Login in je browser</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Kopiëren link naar klembord</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2055,12 +2133,12 @@ We adviseren deze site niet te gebruiken.</translation> <translation>&Volgende ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Ongeldige URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Kon certificaat niet laden. Misschien onjuist wachtwoord?</translation> </message> @@ -2100,7 +2178,7 @@ We adviseren deze site niet te gebruiken.</translation> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/> <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Toegang door server verboden. Om te verifiëren dat u toegang mag hebben, <a href="%1">klik hier</a> om met uw browser toegang tot de service te krijgen.</translation> + <translation>Toegang door server verboden. Om te verifiëren dat je toegang mag hebben, <a href="%1">klik hier</a> om met je browser toegang tot de service te krijgen.</translation> </message> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="278"/> @@ -2138,79 +2216,79 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Kon lokale map %1 niet aanmaken</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Geen externe map opgegeven!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Fout: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>aanmaken map op Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Externe map %1 succesvol gecreërd.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>De remote map %1 bestaat al. Verbinden voor synchroniseren.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Het aanmaken van de map resulteerde in HTTP foutcode %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.<br/>Ga terug en controleer uw inloggegevens.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.</font><br/>ga terug en controleer uw inloggevens.</p></translation> + <translation><p><font color="red">Het aanmaken van de externe map is mislukt, waarschijnlijk omdat je inloggegevens fout waren.</font><br/>ga terug en controleer je inloggevens.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Aanmaken van remote map %1 mislukt met fout <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Er is een sync verbinding van %1 naar remote directory %2 opgezet.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Succesvol verbonden met %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Verbinding met %1 niet geslaagd. Probeer het nog eens.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Hernoemen map mislukt</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Kan de map niet verwijderen en backuppen, omdat de map of een bestand daarin, geopend is in een ander programma. Sluit de map of het bestand en drup op Opnieuw of annuleer de installatie.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokale synch map %1 is succesvol aangemaakt!</b></font></translation> </message> @@ -2218,12 +2296,12 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Verbindingswizard</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Sla configuratie van mappen over</translation> </message> @@ -2257,7 +2335,7 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Fout bij schrijven van Metadata naar de database</translation> </message> @@ -2285,32 +2363,32 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Vrije schijfruimte is minder dan %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Bestand was verwijderd van de server</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Het bestand kon niet volledig worden gedownload.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>Het gedownloade bestand is leeg, hoewel de server meldde dat het %1 zou moeten zijn.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Het bestand is gewijzigd sinds het is gevonden</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Fout bij schrijven van Metadata naar de database</translation> </message> @@ -2323,7 +2401,7 @@ We adviseren deze site niet te gebruiken.</translation> <translation>; Herstel mislukte: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Er is een bestand of map verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1</translation> </message> @@ -2455,27 +2533,27 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Het lokale bestand werd verwijderd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd bij sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Onverwachte reactie van server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Ontbrekende File ID van de server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Ontbrekende ETag van de server</translation> </message> @@ -2684,22 +2762,22 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Delen link</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Wachtwoord:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Vervaldatum:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>Tekstlabel</translation> </message> @@ -2772,22 +2850,22 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Delen met gebruikers of groepen ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Kopiëren link </translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Geen resultaten voor '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Ik deelde iets met u</translation> </message> @@ -2805,22 +2883,27 @@ We adviseren deze site niet te gebruiken.</translation> <translation>kan wijzigen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Kan doordelen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Stop met delen</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Kan creëren</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Kan wijzigen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Kan verwijderen</translation> </message> @@ -2847,8 +2930,8 @@ We adviseren deze site niet te gebruiken.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>SSL Cipher Debug weergave</translation> + <source>SSL Cipher Debug View</source> + <translation>SSL Cipher Debug View</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -2858,7 +2941,7 @@ We adviseren deze site niet te gebruiken.</translation> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> <source>Your session has expired. You need to re-login to continue to use the client.</source> - <translation>Uw sessie is verstreken. U moet opnieuw inloggen om de client-applicatie te gebruiken.</translation> + <translation>Je sessie is verstreken. Je moet opnieuw inloggen om de client-applicatie te gebruiken.</translation> </message> </context> <context> @@ -3033,11 +3116,6 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Vertrouw dit certificaat alsnog</translation> @@ -3066,44 +3144,49 @@ We adviseren deze site niet te gebruiken.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organisatie: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unit: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Land: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Fingerprint (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingerprint (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Fingerprint (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>Fingerprint (SHA-512): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Ingangsdatum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Vervaldatum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Uitgever: %1</translation> </message> @@ -3284,7 +3367,7 @@ We adviseren deze site niet te gebruiken.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="522"/> <source>The filename cannot be encoded on your file system.</source> - <translation>De bestandsnaam kan je bestandssysteem niet worden gecodeerd.</translation> + <translation>De bestandsnaam kan op je bestandssysteem niet worden gecodeerd.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="531"/> @@ -3394,11 +3477,11 @@ We adviseren deze site niet te gebruiken.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versie %1. Voor meer informatie bezoek <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Versie %1. Voor meer informatie klik <a href='%2'>hier</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Deze release is geleverd door %1</p></translation> </message> @@ -3406,25 +3489,25 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Ongeldig certificaat gedetecteerd</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> - <translation>De host "%1" verstrekt een ongeldig certificaat. Doorgaan?</translation> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation>De server "%1" heeft een ongeldig certificaat . Wilt u doorgaan?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Je bent uitgelogd van %1 als gebruiker %2. Log opnieuw in</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Login met gebruiker: %1</translation> </message> @@ -3492,11 +3575,6 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Instellingen...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Details ...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Help</translation> @@ -3519,7 +3597,7 @@ We adviseren deze site niet te gebruiken.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="234"/> <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>De server van account %1 gebruikt een oude versie %2. Het gebruik van deze clientsoftware met niet-ondersteunde server versies is niet getest en mogelijk gevaarlijk. Verdergaan is voor uw eigen risico.</translation> + <translation>De server van account %1 gebruikt een oude versie %2. Het gebruik van deze clientsoftware met niet-ondersteunde server versies is niet getest en mogelijk gevaarlijk. Verdergaan is op eigen risico.</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="273"/> @@ -3608,6 +3686,11 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Nieuw account...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Toon meer activiteiten...</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> @@ -3667,23 +3750,6 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TekstLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Server</translation> @@ -3725,11 +3791,6 @@ We adviseren deze site niet te gebruiken.</translation> <translation>&Lokale map</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Bewaar lokale gegevens</translation> @@ -3748,11 +3809,6 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Gebruikersnaam</translation> @@ -3766,11 +3822,6 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Schakel om naar je browser om door te gaan.</translation> @@ -3785,21 +3836,15 @@ We adviseren deze site niet te gebruiken.</translation> <source>Re-open Browser</source> <translation>Heropen browser</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiëren link </translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Tekstlabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Draai je eigen server</span></a></translation> @@ -3833,25 +3878,9 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Tekstlabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> - <translation>Uw volledige account is gesynchroniseerd met de lokale map</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Drukknop</translation> + <translation>Je volledige account is gesynchroniseerd met de lokale map</translation> </message> </context> <context> @@ -3907,7 +3936,7 @@ We adviseren deze site niet te gebruiken.</translation> <translation>Even geleden</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3990,14 +4019,6 @@ We adviseren deze site niet te gebruiken.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Formulier</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 70dea17d1..68ed1c0f3 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -35,7 +35,7 @@ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation>Brak zmienianych ostatnio plików</translation> + <translation>Brak ostatnio zmienionych plików</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etykieta</translation> @@ -112,17 +107,68 @@ <message> <location filename="../src/common/filesystembase.cpp" line="502"/> <source>Moving to the trash is not implemented on this platform</source> - <translation>Przeniesienie do kosza na tej platformie nie jest możliwe</translation> + <translation>Przeniesienie do kosza nie jest możliwe na tej platformie</translation> </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation>Formularz</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Przejdź do przeglądarki, aby kontynuować.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Wystąpił błąd podczas łączenia. Proszę spróbować ponownie.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Ponownie otwórz przeglądarkę</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiuj link</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> <translation>Formularz</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Przejdź do przeglądarki, aby kontynuować.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Wystąpił błąd podczas łączenia. Proszę spróbować ponownie.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Ponownie otwórz przeglądarkę</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Kopiuj link</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Wybierz folder lokalny na komputerze do synchronizacji</translation> @@ -136,14 +182,9 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> - <translation>Wybierz zdalny folder docelowy</translation> + <translation>Wybierz zdalny katalog docelowy</translation> </message> <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/> @@ -187,279 +228,290 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Klucz szyfrowania end to end</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> - <translation>Aby chronić Twoją tożsamość kryptograficzną, szyfrujemy ją kluczem składającym się z 12 wyrazów. Hasło zachowaj w bezpiecznym miejscu. Będzie ono potrzebne do dodania innych urządzeń do twojego konta (takich jak twój telefon komórkowy lub laptop).</translation> + <translation>Aby chronić Twoją tożsamość kryptograficzną, szyfrujemy ją kluczem składającym się z 12 wyrazów. Hasło zachowaj w bezpiecznym miejscu. Będzie ono potrzebne do dodania innych urządzeń do Twojego konta (takich jak twój telefon komórkowy lub laptop).</translation> </message> </context> <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>…</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Przestrzeń: …</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Niezaznaczone katalogi zostaną <b>usunięte</b> z lokalnego systemu plików i nie będą już więcej synchronizowane na tym komputerze.</translation> + <translation>Niezaznaczone foldery zostaną <b>usunięte</b> z lokalnego systemu plików i nie będą już więcej synchronizowane na tym komputerze.</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Synchronizuj wszystko</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> - <translation>Nie synchronizuj niczego</translation> + <translation>Brak synchronizacji</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Zastosuj ręczne zmiany</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Zastosuj</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Połączony z <server> jako <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Brak skonfigurowanych kont.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Dodaj nowe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Usuń</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>To konto obsługuje szyfrowanie typu end-to-end</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Włącz szyfrowanie</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Pokaż klucz E2E</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Szyfruj</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Edytuj Pliki Ignorowane</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> - <translation>Wybierz co synchronizować</translation> + <translation>Wybierz elementy do synchronizacji</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Zsynchronizuj teraz</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Uruchom ponownie synchronizację</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> - <translation>Usuń folder połączenia synchronizacji</translation> + <translation>Usuń folder synchronizacji</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> - <translation>Nie udało się stworzyć katalogu</translation> + <translation>Utworzenie katalogu nie powiodło się</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> - <translation><p>Nie można stworzyć lokalnego katalogu <i>%1</i>.</translation> + <translation><p>Nie można utworzyć folderu lokalnego <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> - <translation>Usuń folder połączenia synchronizacji</translation> + <translation>Potwierdź usunięcie folderu synchronizacji</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> - <translation>Usuń folder połączenia synchronizacji</translation> + <translation>Usuń folder synchronizacji</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Synchronizacja uruchomiona</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> - <translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation> + <translation>Operacja synchronizacji jest uruchomiona.<br/>Czy chcesz ją zakończyć?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> - <translation>%1 w użyciu</translation> + <translation>Wykorzystane: %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 jako <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Wersja serwera %1 jest przestarzała i nie jest już wspierana. Kontynuujesz na własne ryzyko.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Podłączony do %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Serwer %1 jest tymczasowo niedostępny.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Serwer %1 jest obecnie w trybie konserwacji.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Wylogowano z %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Uzyskanie autoryzacji z przeglądarki. <a href='%1'>Kliknij tutaj</a>, aby ponownie otworzyć przeglądarkę.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Łączenie do %1…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Brak połączenia do %1 z %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Zaloguj</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> - <translation>Te foldery nie zostały zsynchronizowane ponieważ są zbyt duze:</translation> + <translation>Te katalogi nie zostały zsynchronizowane ponieważ są zbyt duże:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> - <translation>Te foldery nie zostały zsynchronizowane ponieważ znajdują się w pamięci zewnętrznej:</translation> + <translation>Te katalogi nie zostały zsynchronizowane, ponieważ znajdują się w magazynach zewnętrznych: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> - <translation>Te foldery nie zostały zsynchronizowane ponieważ są zbyt duże lub znajdują się w pamięci zewnętrznej:</translation> + <translation>Te katalogi nie zostały zsynchronizowane, ponieważ są zbyt duże lub znajdują się w magazynach zewnętrznych: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Potwierdź usunięcie konta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Czy na pewno chcesz usunąć połączenie z kontem <i>%1</i>?</p><p><b>Uwaga:</b> ta operacja <b>nie</b> usunie plików klienta.</p></translation> + <translation><p>Czy na pewno chcesz usunąć połączenie z kontem <i>%1</i>?</p><p><b>Uwaga:</b> Ta operacja <b>nie</b> usunie plików klienta.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Usuwanie połączenia</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> - <translation>Otwórz katalog</translation> + <translation>Otwórz folder</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Wyloguj</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Przywróć synchronizację</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Zatrzymaj synchronizację</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Czy na pewno chcesz zatrzymać synchronizację folderu <i>%1</i>?</p><p><b>Uwaga:</b> ta operacja <b>nie</b> usunie plików z klienta.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) z %2 w użyciu. Niektóre foldery, w tym zamontowane lub udostępnione foldery w sieci, mogą mieć różne limity.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> - <translation>%1 z %2 w użyciu</translation> + <translation>Wykorzystane: %1 z %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Połączenie %1 nie skonfigurowane.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Etykieta</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Akceptuj</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Zsynchronizowany</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Ponów wysyłanie</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Użytkownik %1 nie ma włączonej historii aktywności.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Błąd podczas zapisu metadanych do bazy</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Wprowadź hasło szyfrowania E2E:<br><br>Użytkownik: %2<br>Konto: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Wprowadź hasło dla E2E</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Serwer zwrócił błąd: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Wystąpił błąd podczas uzyskiwania dostępu do 'tokena': <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Nie można przeanalizować kodu JSON zwróconego z serwera: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Odpowiedź z serwera nie zawierała wszystkich oczekiwanych zakresów</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Podłącz do %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Zaloguj się w przeglądarce (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>Nie można otworzyć przeglądarki, skopiuj link do swojej przeglądarki.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>Nie można otworzyć przeglądarki, skopiuj link do swojej przeglądarki.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -732,7 +827,7 @@ <message> <location filename="../src/gui/folder.cpp" line="144"/> <source>%1 should be a folder but is not.</source> - <translation>%1 powinien być katalogiem, ale nie jest.</translation> + <translation>%1 powinien być folderem, ale nie jest.</translation> </message> <message> <location filename="../src/gui/folder.cpp" line="147"/> @@ -740,120 +835,120 @@ <translation>%1 jest nie do odczytu.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 został usunięty.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 został ściągnięty.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 został uaktualniony.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 zmienił nazwę na %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 został przeniesiony do %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 i %n inny plik został usunięty.</numerusform><numerusform>%1 i %n inne pliki zostały usunięte.</numerusform><numerusform>%1 i %n innych plików zostało usuniętych.</numerusform><numerusform>%1 i %n innych plików zostało usuniętych.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 i %n inny plik został pobrany.</numerusform><numerusform>%1 i %n inne pliki zostały pobrane.</numerusform><numerusform>%1 i %n innych plików zostało pobranych.</numerusform><numerusform>%1 i %n innych plików zostało pobranych.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 i %n inny plik został zaktualizowany.</numerusform><numerusform>%1 i %n inne pliki zostały zaktualizowane.</numerusform><numerusform>%1 i %n innych plików zostało zaktualizowanych.</numerusform><numerusform>%1 i %n innych plików zostało zaktualizowanych.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>Zmieniono nazwę %1 na %2 oraz %n innemu plikowi została zmieniona nazwa.</numerusform><numerusform>Zmieniono nazwę %1 na %2 oraz %n innym plikom została zmieniona nazwa.</numerusform><numerusform>%1 has been renamed to %2 and %n other file(s) have been renamed.</numerusform><numerusform>%1 has been renamed to %2 and %n other file(s) have been renamed.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n inny plik.</numerusform><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n inne pliki.</numerusform><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n innych plików.</numerusform><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n innych plików.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 plik ma błąd synchronizacji</numerusform><numerusform>%1 i %n innych plików mają konflikt synchronizacji.</numerusform><numerusform>%1 i %n innych plików mają konflikt synchronizacji.</numerusform><numerusform>%1 i %n innych plików mają konflikt synchronizacji.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 ma konflikt synchronizacji. Sprawdź konfliktujący plik!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>Plik %1 nie może zostać zsynchronizowany z powodu błędów. Sprawdź szczegóły w logu..</numerusform><numerusform>%1 i %n innych plików nie mogą zostać zsynchronizowane z powodu błędów. Sprawdź szczegóły w logu..</numerusform><numerusform>%1 i %n innych plików nie mogą zostać zsynchronizowane z powodu błędów. Sprawdź szczegóły w logu..</numerusform><numerusform>%1 i %n innych plików nie mogą zostać zsynchronizowane z powodu błędów. Sprawdź szczegóły w logu..</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 nie może zostać zsynchronizowany z powodu błędu. Zobacz szczegóły w logu.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Aktywności synchronizacji</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Nie można przeczytać pliku wyłączeń</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Nowy folder większy niż %1MB został dodany: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Folder z pamięci zewnętrznej został dodany . </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Przejdź do ustawień żeby go zaznaczyć i pobrać.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Folder %1 został utworzony, ale wcześniej został wykluczony z synchronizacji. Dane w nim zawarte nie zostaną zsynchronizowane.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Plik %1 został utworzony, ale wcześniej został wykluczony z synchronizacji. Dane w nim zawarte nie zostaną zsynchronizowane.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,33 +961,33 @@ Oznacza to, że klient synchronizacji może nie przesłać lokalnych zmian natyc %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep 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>Wszystkie pliki z folderu '%1' zostały usunięte z serwera. -W momencie synchronizacji zostaną usunięte z lokalnego katalogu, co spowoduje ich niedostępność, chyba, że posiadasz prawo do ich przywrócenia. +W momencie synchronizacji zostaną usunięte z lokalnego folderu, co spowoduje ich niedostępność, chyba że posiadasz prawo do ich przywrócenia. Jeśli zdecydujesz się zachować te pliki, zostaną one zsynchronizowane z serwerem, jeżeli posiadasz odpowiednie uprawnienia. Jeśli zdecydujesz je usunąć, nie będą więcej dostępne, chyba że jesteś ich właścicielem. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Pobrać nowe pliki?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Pobierz nowe pliki</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Zachowaj pliki lokalne</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -901,26 +996,26 @@ Czy na pewno chcesz zsynchronizować te działania z serwerem? Jeśli to był wypadek i zdecydujesz się zachować swoje pliki, zostaną one przywrócone z serwera.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation>Ta synchronizacja spowoduje zresetowanie plików do wcześniejszego czasu w folderze synchronizacji '%1'. Przyczyną może być przywrócenie plików z kopii zapasowej na serwerze. -Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pliki zostaną zastąpione starszym plikiem we wcześniejszym stanie. Czy chcesz zachować najnowsze pliki lokalne?</translation> +Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie Twoje pliki zostaną zastąpione starszym plikiem we wcześniejszym stanie. Czy chcesz zachować najnowsze pliki lokalne?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Wykryto kopię zapasową.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Normalna synchronizacja.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Zatrzymaj pliki lokalne i ustaw status konfliktu.</translation> </message> @@ -1005,12 +1100,12 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <message> <location filename="../src/gui/folderman.cpp" line="1258"/> <source>The selected path is not a folder!</source> - <translation>Wybrana ścieżka nie jest katalogiem!</translation> + <translation>Wybrana ścieżka nie jest folderem!</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1262"/> <source>You have no permission to write to the selected folder!</source> - <translation>Nie masz uprawnień, aby zapisywać w tym katalogu!</translation> + <translation>Nie masz uprawnień, aby zapisywać w tym folderze!</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1318"/> @@ -1033,15 +1128,15 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <message> <location filename="../src/gui/folderstatusdelegate.cpp" line="48"/> <source>Add Folder Sync Connection</source> - <translation>Dodaj folder połączenia synchronizacji</translation> + <translation>Dodaj folder synchronizacji</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Synchronizowany z folderem lokalnym</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>Synchronizowany z folderem lokalnym (%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Plik</translation> </message> @@ -1051,7 +1146,7 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <message> <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>You need to be connected to add a folder</source> - <translation>Musisz być podłączony, by dodać folder.</translation> + <translation>Musisz być podłączony, aby dodać folder</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="146"/> @@ -1071,7 +1166,7 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <translation>Wystąpił błąd podczas pobierania listy folderów z serwera.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Odłączony</translation> </message> @@ -1086,107 +1181,107 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <translation>Wystąpiły nierozwiązane konflikty. Kliknij, aby poznać szczegóły.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Sprawdzanie zmian</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronizowanie %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>pobieranie %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>wysyłanie %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Sprawdzanie zmian w zdalnym '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Sprawdzanie zmian w lokalnym '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 z %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Plik %3 z %4, pozostało czasu %5 (%1 z %2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 z %2, plik %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>plik %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Czekaj…</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Oczekiwanie na %n inny folder…</numerusform><numerusform>Oczekiwanie na %n inne foldery…</numerusform><numerusform>Oczekiwanie na %n innych folderów…</numerusform><numerusform>Oczekiwanie na %n innych folderów…</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Przygotowanie do synchronizacji…</translation> </message> @@ -1204,7 +1299,7 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <message> <location filename="../src/gui/folderwizard.cpp" line="550"/> <source>Add Folder Sync Connection</source> - <translation>Dodaj folder połączenia synchronizacji</translation> + <translation>Dodaj folder synchronizacji</translation> </message> <message> <location filename="../src/gui/folderwizard.cpp" line="552"/> @@ -1227,7 +1322,7 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <message> <location filename="../src/gui/folderwizard.cpp" line="135"/> <source>Select the source folder</source> - <translation>Wybierz katalog źródłowy</translation> + <translation>Wybierz folder źródłowy</translation> </message> </context> <context> @@ -1235,12 +1330,12 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <message> <location filename="../src/gui/folderwizard.cpp" line="183"/> <source>Create Remote Folder</source> - <translation>Dodaj zdalny katalog</translation> + <translation>Dodaj katalog zdalny</translation> </message> <message> <location filename="../src/gui/folderwizard.cpp" line="184"/> <source>Enter the name of the new folder to be created below '%1':</source> - <translation>Wpisz nazwę dla nowego katalogu, utworzonego poniżej '%1':</translation> + <translation>Wpisz nazwę dla nowego folderu, utworzonego poniżej '%1':</translation> </message> <message> <location filename="../src/gui/folderwizard.cpp" line="214"/> @@ -1270,7 +1365,7 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <message> <location filename="../src/gui/folderwizard.cpp" line="447"/> <source>This folder is already being synced.</source> - <translation>Ten katalog jest już synchronizowany.</translation> + <translation>Ten folder jest już synchronizowany.</translation> </message> <message> <location filename="../src/gui/folderwizard.cpp" line="449"/> @@ -1317,11 +1412,6 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Nota prawna</translation> @@ -1360,7 +1450,7 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <message> <location filename="../src/gui/generalsettings.ui" line="239"/> <source>Ask for confirmation before synchronizing external storages</source> - <translation>Zapytaj o potwierdzenie przed synchronizacją zewnętrznych skladowisk plikow</translation> + <translation>Zapytaj o potwierdzenie przed synchronizacją zewnętrznych magazynów</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="82"/> @@ -1370,12 +1460,12 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <message> <location filename="../src/gui/generalsettings.ui" line="75"/> <source>Use &Monochrome Icons</source> - <translation>Używaj &monochromatycznych ikon</translation> + <translation>Używaj monochromatycznych ikon</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="171"/> <source>Edit &Ignored Files</source> - <translation>Edytuj pliki &ignorowane (pomijane)</translation> + <translation>Edytuj &ignorowane pliki (pomijane)</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="250"/> @@ -1459,12 +1549,12 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <message> <location filename="../src/gui/ignorelisteditor.ui" line="20"/> <source>Global Ignore Settings</source> - <translation>Ustawienia plików ignorowanych (pomijanych)</translation> + <translation>Ustawienia ignorowanych plików (pomijanych)</translation> </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="26"/> <source>Sync hidden files</source> - <translation>Synchronizuj pliki ukryte</translation> + <translation>Synchronizuj ukryte pliki</translation> </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="36"/> @@ -1472,83 +1562,81 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie twoje pli <translation>Pliki ignorowane zgodnie z szablonem</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Dodaj</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Ten wpis jest podawany przez system w '%1' i nie może być zmieniony w tym widoku.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Usuń wszystko</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation>IgnoreListTableWidget</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Szablon</translation> + <translation>Wzór</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation>Pozwól na usuwanie</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>Dodaj</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> <translation>Usuń</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation>Usuń wszystko</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>Pliki lub katalogi pasujące do szablonu nie będą zsynchronizowane. + <translation>Pliki lub foldery pasujące do szablonu nie będą zsynchronizowane. -Elementy, dla których usuwanie jest dozwolone zostaną usunięte, jeżeli uprawnienia katalogu dopuszczają usuwanie. Jest to przydatne dla metadanych.</translation> +Elementy, dla których usuwanie jest dozwolone zostaną usunięte, jeżeli uprawnienia folderu dopuszczają usuwanie. Jest to przydatne dla metadanych.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Nie można otworzyć plików</translation> + <translation>Nie można otworzyć pliku</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Nie mogę zapisać zmian do '%1'.</translation> + <translation>Nie można zapisać zmian w '%1'.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Dodaj ignorowany</translation> + <translation>Dodaj Wzór Ignorowania</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Dodaj nowy ignorowany:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Ten wpis jest podawany przez system w '%1' i nie może być zmieniony w tym widoku.</translation> + <translation>Dodaj nowy wzór ignorowania:</translation> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Nota prawna</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Zamknij</translation> @@ -1659,7 +1747,7 @@ Logi będą zapisane w %1</translation> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="338"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> - <translation><p>Nowa wersja klienta %1 jest dostępna.</p><p><b>%2</b>jest dostępna do pobrania. Zainstalowana wersja to %3.<p></translation> + <translation><p>Nowa wersja klienta %1 jest dostępna.</p><p><b>%2</b>jest dostępna do pobrania. Zainstalowana wersja to %3.</p></translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="352"/> @@ -1680,11 +1768,6 @@ Logi będą zapisane w %1</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Ustawienia proxy</translation> @@ -1757,7 +1840,7 @@ Logi będą zapisane w %1</translation> <location filename="../src/gui/networksettings.ui" line="253"/> <location filename="../src/gui/networksettings.ui" line="285"/> <source>Limit automatically</source> - <translation>Limit automatyczniy</translation> + <translation>Limit automatyczny</translation> </message> <message> <location filename="../src/gui/networksettings.cpp" line="37"/> @@ -1888,7 +1971,7 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="50"/> <source>Setup local folder options</source> - <translation>Ustawienia opcji lokalnych katalogów</translation> + <translation>Ustaw opcje folderu lokalnego</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="59"/> @@ -1898,7 +1981,7 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="157"/> <source>%1 folder '%2' is synced to local folder '%3'</source> - <translation>%1 katalog '%2' jest zsynchronizowany do katalogu lokalnego '%3'</translation> + <translation>%1 folder '%2' jest zsynchronizowany do folderu lokalnego '%3'</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="160"/> @@ -1908,7 +1991,7 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="165"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> - <translation><p><small><strong>Uwaga:</strong> katalog lokalny nie jest pusty. Bądź ostrożny !</small></p></translation> + <translation><p><small><strong>Uwaga:</strong> folder lokalny nie jest pusty. Bądź ostrożny !</small></p></translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/> @@ -1929,7 +2012,7 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> <source>There isn't enough free space in the local folder!</source> - <translation>W katalogu lokalnym nie ma wystarczającej ilości wolnego miejsca!</translation> + <translation>W folderze lokalnym nie ma wystarczającej ilości wolnego miejsca!</translation> </message> </context> <context> @@ -1993,12 +2076,7 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> <source>Login in your browser</source> - <translation>Zaloguj się w twojej przeglądarce</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Skopiuj odnośnik do schowka</translation> + <translation>Zaloguj się w przeglądarce</translation> </message> </context> <context> @@ -2021,17 +2099,17 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/> <source>Secure collaboration & file exchange</source> - <translation>Poufna współpraca & wymiana plików</translation> + <translation>Bezpieczna współpraca i wymiana plików</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/> <source>Easy-to-use web mail, calendaring & contacts</source> - <translation>Łatwy w użytkowaniu panel poczty internetowej, kalendarz & kontakty</translation> + <translation>Łatwy w użyciu klient poczty, kalendarz i kontakty</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/> <source>Screensharing, online meetings & web conferences</source> - <translation>Udostępnianie ekranu, rozmowy & konferencje w sieci</translation> + <translation>Udostępnianie ekranu, spotkania i konferencje online</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="180"/> @@ -2051,12 +2129,12 @@ Niezalecane jest jego użycie.</translation> <translation>Następny</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Błędny adres URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Nie udało się załadować certyfikatu. Być może hasło jest nieprawidłowe?</translation> </message> @@ -2134,79 +2212,79 @@ Niezalecane jest jego użycie.</translation> <translation>Nie udało się utworzyć lokalnego folderu %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> - <translation>Nie określono folderu zdalnego!</translation> + <translation>Nie określono katalogu zdalnego!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Błąd: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>tworzenie katalogu w Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> - <translation>Zdalny folder %1 został utworzony pomyślnie.</translation> + <translation>Zdalny katalog %1 został utworzony pomyślnie.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> - <translation>Zdalny folder %1 już istnieje. Podłączam go do synchronizowania.</translation> + <translation>Zdalny katalog %1 już istnieje. Podłączam go do synchronizowania.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> - <translation>Tworzenie folderu spowodowało kod błędu HTTP %1</translation> + <translation>Tworzenie katalogu spowodowało kod błędu HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> - <translation>Nie udało się utworzyć zdalnego folderu ponieważ podane dane dostępowe są nieprawidłowe!<br/>Wróć i sprawdź podane dane dostępowe.</p></translation> + <translation>Nie udało się utworzyć zdalnego katalogu ponieważ podane poświadczenia są nieprawidłowe!<br/>Wróć i sprawdź swoje poświadczenia.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Tworzenie folderu zdalnego nie powiodło się. Prawdopodobnie dostarczone poświadczenia są błędne.</font><br/>Wróć i sprawdź poświadczenia.</p></translation> + <translation><p><font color="red">Tworzenie katalogu zdalnego nie powiodło się. Prawdopodobnie dostarczone poświadczenia są błędne.</font><br/>Wróć i sprawdź poświadczenia.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> - <translation>Tworzenie folderu zdalnego %1 nie powiodło się z powodu błędu <tt>%2</tt>.</translation> + <translation>Tworzenie katalogu zdalnego %1 nie powiodło się z powodu błędu <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Połączenie synchronizacji z %1 do katalogu zdalnego %2 zostało utworzone.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Udane połączenie z %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Połączenie z %1 nie może być nawiązane. Sprawdź ponownie.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Zmiana nazwy folderu nie powiodła się</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Nie można usunąć i zarchiwizować folderu ponieważ znajdujący się w nim plik lub folder jest otwarty przez inny program. Proszę zamknąć folder lub plik albo kliknąć ponów lub anuluj setup.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Utworzenie lokalnego folderu synchronizowanego %1 zakończone pomyślnie!</b></font></translation> </message> @@ -2214,12 +2292,12 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Kreator połączeń</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Pomiń konfigurację folderów</translation> </message> @@ -2253,7 +2331,7 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Błąd podczas zapisu metadanych do bazy</translation> </message> @@ -2281,32 +2359,32 @@ Niezalecane jest jego użycie.</translation> <translation>Wolne miejsce na dysku jest mniejsze niż %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Plik został usunięty z serwera</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Ten plik nie mógł być całkowicie pobrany.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>Ściągnięty plik jest pusty mimo, że serwer twierdził, że powinien być %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Pliku %1 nie można zapisać z powodu lokalnego konfliktu nazw plików!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>W trakcie wyszukiwania plik uległ zmianie</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Błąd podczas zapisu metadanych do bazy</translation> </message> @@ -2319,7 +2397,7 @@ Niezalecane jest jego użycie.</translation> <translation>; Przywracanie nie powiodło się: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Plik lub folder został usunięty z udziału "tylko do odczytu". Odtwarzanie nie powiodło się: %1</translation> </message> @@ -2451,27 +2529,27 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Lokalny plik zmienił się podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Nieoczekiwana odpowiedź z serwera (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Na serwerze nie odnaleziono File ID</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Na serwerze nie odnaleziono ETag</translation> </message> @@ -2550,7 +2628,7 @@ Niezalecane jest jego użycie.</translation> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="79"/> <source>Deselect remote folders you do not wish to synchronize.</source> - <translation>Odznacz foldery zdalne, których nie chcesz synchronizować.</translation> + <translation>Odznacz katalogi zdalne, których nie chcesz synchronizować.</translation> </message> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="95"/> @@ -2680,22 +2758,22 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Udostępnij link</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Hasło:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Data wygaśnięcia:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>Etykieta</translation> </message> @@ -2768,22 +2846,22 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Współdziel z użytkownikami lub grupami</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Kopiuj link</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Brak wyników dla '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Udostępniłem/am ci coś</translation> </message> @@ -2801,22 +2879,27 @@ Niezalecane jest jego użycie.</translation> <translation>może edytować</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Pozwól na udostępnianie innym</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Cofnij udostępnienie</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Pozwól na utworzenie</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Pozwól na zmianę</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Pozwól na usunięcie</translation> </message> @@ -2843,8 +2926,8 @@ Niezalecane jest jego użycie.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>SSL Chipher widok debugowania</translation> + <source>SSL Cipher Debug View</source> + <translation>Widok debugowania szyfrowania SSL</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3029,11 +3112,6 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Zaufaj temu zaświadczeniu mimo wszystko.</translation> @@ -3062,44 +3140,49 @@ Niezalecane jest jego użycie.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organizacja: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Jednostka: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Kraj: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Odcisk (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Odcisk (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Odcisk (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>Odcisk (SHA-512): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Data wejścia w życie: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Data wygaśnięcia: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Wystawca: %1</translation> </message> @@ -3129,12 +3212,12 @@ Niezalecane jest jego użycie.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="165"/> <source>An error occurred while opening a folder</source> - <translation>Wystąpił błąd podczas otwierania katalogu</translation> + <translation>Wystąpił błąd podczas otwierania folderu</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="168"/> <source>Error while reading folder.</source> - <translation>Błąd podczas odczytu katalogu.</translation> + <translation>Błąd podczas odczytu folderu.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="244"/> @@ -3144,7 +3227,7 @@ Niezalecane jest jego użycie.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="516"/> <source>File/Folder is ignored because it's hidden.</source> - <translation>Plik / katalog zostanie zignorowany, ponieważ jest ukryty.</translation> + <translation>Plik/folder zostanie zignorowany, ponieważ jest ukryty.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="519"/> @@ -3390,11 +3473,11 @@ Niezalecane jest jego użycie.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Wersja %1. Aby uzyskać więcej informacji prosimy odwiedzić <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Wersja %1. Aby uzyskać więcej informacji, kliknij <a href='%2'>tutaj</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>To wydanie zostało dostarczone przez %1</p></translation> </message> @@ -3402,25 +3485,25 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Wykryto nieprawidłowy certyfikat</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> - <translation>Komputer "%1" przedstawia się nieważnym certyfikatem. Kontynuować?</translation> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation>Host "%1" podał nieprawidłowy certyfikat. Kontynuować?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> - <translation>Zostałeś wylogowany z %1 jako użytkownik %2. Zaloguj się ponownie</translation> + <translation>Zostałeś wylogowany z %1 jako użytkownik %2. Zaloguj się ponownie.</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Zaloguj się jako użytkownik: %1</translation> </message> @@ -3488,11 +3571,6 @@ Niezalecane jest jego użycie.</translation> <translation>Ustawienia…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Szczegóły…</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Pomoc</translation> @@ -3576,7 +3654,7 @@ Niezalecane jest jego użycie.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="418"/> <source>Pause all folders</source> - <translation>Wstrzymaj wszystkie katalogi</translation> + <translation>Wstrzymaj wszystkie foldery</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="694"/> @@ -3604,6 +3682,11 @@ Niezalecane jest jego użycie.</translation> <translation>Nowe konto…</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Wyświetl więcej aktywności...</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> @@ -3663,23 +3746,6 @@ Niezalecane jest jego użycie.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>Etykieta</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Serwer</translation> @@ -3692,7 +3758,7 @@ Niezalecane jest jego użycie.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="357"/> <source>Start a &clean sync (Erases the local folder!)</source> - <translation>Zacznij od &czystej synchronizacji (usuwa lokalny katalog !)</translation> + <translation>Zacznij od &czystej synchronizacji (usuwa lokalny folder!)</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="148"/> @@ -3708,7 +3774,7 @@ Niezalecane jest jego użycie.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="174"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> - <translation>Pytaj o potwierdzenie przed synchronizacją napędów zewnętrznych</translation> + <translation>Zapytaj o potwierdzenie przed synchronizacją z&ewnętrznych magazynów</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="198"/> @@ -3721,11 +3787,6 @@ Niezalecane jest jego użycie.</translation> <translation>&Lokalny folder</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbWybierzLokalnyFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Zachowaj dane lokalne</translation> @@ -3744,11 +3805,6 @@ Niezalecane jest jego użycie.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nazwa użytkownika</translation> @@ -3762,11 +3818,6 @@ Niezalecane jest jego użycie.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Aby kontynuować, przejdź do przeglądarki.</translation> @@ -3781,21 +3832,15 @@ Niezalecane jest jego użycie.</translation> <source>Re-open Browser</source> <translation>Otwórz przeglądarkę ponownie</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiuj link</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Etykieta tekstowa</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Hostuj swój własny serwer</span></a></translation> @@ -3829,26 +3874,9 @@ Niezalecane jest jego użycie.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Etykieta tekstowa</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> - <translation>Twoje całe konto zostało zsynchronizowane z twoim lokalnym folderem</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation> -Kliknij</translation> + <translation>Twoje całe konto zostało zsynchronizowane z folderem lokalnym</translation> </message> </context> <context> @@ -3904,7 +3932,7 @@ Kliknij</translation> <translation>Jakiś czas temu</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3987,14 +4015,6 @@ Kliknij</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Formularz</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> @@ -4030,7 +4050,7 @@ Kliknij</translation> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> <source>Server version downloaded, copied changed local file into conflict file</source> - <translation>Pobrano wersję z serwera, zmienona wersja lokalna została skopiowana do pliku konfliktu</translation> + <translation>Pobrano wersję z serwera, zmieniona wersja lokalna została skopiowana do pliku konfliktu</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="39"/> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index f28b1dd4c..b4be171a7 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation type="unfinished"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> - <translation>Formulário</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Escolha uma pasta local no seu computador para sincronizar</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecione uma pasta de destino remota</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espaço de armazenamento: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>As pastas não selecionadas serão <b>removidas</b> do seu sistema de ficheiros local e já não serão sincronizadas para este computador</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar todos</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Sincronizar nenhum</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar alterações manuais</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Ligado ao <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Nenhuma conta configurada.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Adicionar nova</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Remover</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Escolher o que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forçar a sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Retomar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Remover ligação de sincronização de pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Não foi possível criar a pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Não foi possível criar a pasta local<i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar Remoção da Ligação de Sincronização de Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Remover Ligação da Sincronização de Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Sincronização em Execução</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>A operação de sincronização está em execução.<br/>Deseja terminá-la?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 em utilização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>A versão %1 do servidor é antiga e não é suportada! Prossiga por sua conta e risco.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Ligado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>O servidor %1 está temporariamente indisponível.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>O Servidor %1 encontra-se em manutenção</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Terminou a sessão de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>A Conectar a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Sem ligação para %1 em %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Iniciar Sessão</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Existem pastas que não foram sincronizadas por serem demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Existem pastas que não foram sincronizadas por serem armazenamento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Existem pastas que não foram sincronizadas por serem demasiado grandes ou armazenamento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirmar Remoção da Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Deseja mesmo remover a ligação da conta <i>%1</i>?</p><p><b>Nota:</b> isto <b>não</b> irá eliminar quaisquer ficheiros.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Remover ligação</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Terminar sessão</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Retomar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Deseja mesmo parar a sincronização da pasta <i>%1</i>?</p><p><b>Nota:</b> isto <b>não</b> irá eliminar qualquer ficheiro.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 em utilização. Algumas pastas, incluindo a rede montada ou as pastas partilhadas, podem ter limites diferentes.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 em utilização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Atualmente não está disponível nenhuma informação da utilização do armazenamento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>%1 sem ligação configurada.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>EtiquetaTexto</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>A conta %1 não tem atividades ativadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Erro ao gravar os metadados para a base de dados</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 não é legível.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 foi removido.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 foi transferido.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 foi atualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 foi renomeado para %2</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 foi movido para %2</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>'%1' e %n outro(s) ficheiro(s) foram removidos</numerusform><numerusform>'%1' e %n outros ficheiros foram removidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> - <translation><numerusform>%1 e %n outro ficheiro foram transferidos.</numerusform><numerusform>%1 e %n outros ficheiros foram transferidos.</numerusform></translation> + <translation><numerusform>%1 e %n outro ficheiro foi transferido.</numerusform><numerusform>%1 e %n outros ficheiros foram transferidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 e %n outro ficheiro foram actualizados.</numerusform><numerusform>%1 e %n outros ficheiros foram actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 foi renomeado para %2 e %n outro ficheiro foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros ficheiros foram renomeados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 foi movido para %2 e %n outro ficheiro foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros ficheiros foram movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 tem e %n outro ficheiro têm problemas de sincronização.</numerusform><numerusform>%1 tem e %n outros ficheiros têm problemas de sincronização.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tem um problema de sincronização. Por favor, verifique o ficheiro com conflito!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 e %n outro ficheiro não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform><numerusform>%1 e %n outros ficheiros não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>Não foi possível sincronizar %1 devido a um erro. Consulte o registo para detalhes.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Atividade de Sincronização</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Não foi possível ler o ficheiro excluir do sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Foi adicionada uma nova pasta maior que %1 MB: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Foi adicionada uma pasta vinda de armazenamento externo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> - <translation>Por favor, vá às configurações para a selecionar se a desejar transferir.</translation> + <translation>Por favor, vá às definições para a selecionar, se desejar transferi-la.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> - <translation type="unfinished"/> + <translation>Transferir novos ficheiros?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> - <translation type="unfinished"/> + <translation>Transferir novos ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ Tem a certeza que deseja sincronizar essas ações com o servidor? Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados novamente apartir do servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -903,17 +998,17 @@ Isto pode ser porque um backup foi restaurado no servidor. Continuando a sincronização fará com que todos os seus ficheiros sejam substituídos por um ficheiro mais velho num estado anterior. Deseja manter os seus ficheiros locais mais recentes como ficheiros de conflito?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Detetada cópia de segurança</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronização Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Manter Ficheiros Locais como Conflito</translation> </message> @@ -1029,12 +1124,12 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi <translation>Adicionar Ligação de Sincronização de Pasta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Ficheiro</translation> </message> @@ -1064,7 +1159,7 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi <translation>Erro durante o carregamento da lista de pastas a partir do servidor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Sessão terminada</translation> </message> @@ -1079,107 +1174,107 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>A sincronizar %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>transferir %s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>enviar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restante, %1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>ficheiro %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>A aguardar...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>A aguardar por %n outra pasta...</numerusform><numerusform>A aguardar por %n outra(s) pasta(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>A preparar para sincronizar...</translation> </message> @@ -1310,11 +1405,6 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1463,83 +1553,79 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi <translation>Ficheiros Ignorados por Padrões</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Adicionar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entrada é fornecida pelo sistema em '%1' e não pode ser modificada nesta visualização.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Padrão</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Permitir Eliminação</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Remover</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>Os ficheiros ou pastas que correspondam a um padrão não serão sincronizadas. - -Os itens onde é permitido a eliminação serão eliminados se estes impedirem a remoção de uma diretoria. Isto é útil para os metadados.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Não foi possível abrir o ficheiro</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Não foi possível gravar as alterações para '%1'</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Adicione Padrão de ignorar</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Adicione um novo padrão de ignorar:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entrada é fornecida pelo sistema em '%1' e não pode ser modificada nesta visualização.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1648,7 +1734,7 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="338"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> - <translation><p>Está disponível uma nova versão do Cliente %1.</p><p><b>%2</b> está disponível para transferência. A versão instalada é a %3.</p></translation> + <translation><p>Está disponível uma nova versão do Cliente %1.</p><p><b>%2</b> está disponível para transferência. A versão instalada é %3.</p></translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="352"/> @@ -1669,11 +1755,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Definições de Proxy</translation> @@ -1984,11 +2065,6 @@ poderá pedir por privilégios adicionais durante o processo.</translation> <source>Login in your browser</source> <translation>Faça login através do browser</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2040,12 +2116,12 @@ Não é aconselhada a sua utilização.</translation> <translation>&Seguinte ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2123,79 +2199,79 @@ Não é aconselhada a sua utilização.</translation> <translation>Não foi possível criar a pasta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Não foi indicada a pasta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Criação da pasta remota %1 com sucesso!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>A pasta remota %1 já existe. Ligue-a para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A criação da pasta resultou num erro HTTP com o código %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.<br/>Por favor, verifique as suas credenciais.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.</font><br/>Por favor, verifique as suas credenciais.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>A criação da pasta remota %1 falhou com o erro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>A sincronização de %1 com a pasta remota %2 foi criada com sucesso.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Conectado com sucesso a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Não foi possível ligar a %1 . Por Favor verifique novamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Erro ao renomear a pasta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Não é possível remover e fazer backup à pasta porque a pasta ou um ficheiro nesta está aberto em outro programa. Por favor, feche a pasta ou o ficheiro e clique novamente ou cancele a configuração.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation> </message> @@ -2203,12 +2279,12 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>Assistente de ligação %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Saltar a configuração das pastas</translation> </message> @@ -2242,7 +2318,7 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Erro ao escrever a meta-informação par a base de dados</translation> </message> @@ -2262,7 +2338,7 @@ Não é aconselhada a sua utilização.</translation> <message> <location filename="../src/libsync/propagatedownload.cpp" line="484"/> <source>The download would reduce free local disk space below the limit</source> - <translation type="unfinished"/> + <translation>A transferência iria reduzir o espaço livre local acima do limite</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="488"/> @@ -2270,32 +2346,32 @@ Não é aconselhada a sua utilização.</translation> <translation>O Espaço livre no disco é inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>O ficheiro foi eliminado do servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Não foi possível transferir o ficheiro na totalidade.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>O ficheiro alterou-se desde a sua descoberta</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Erro ao gravar os metadados para a base de dados</translation> </message> @@ -2308,7 +2384,7 @@ Não é aconselhada a sua utilização.</translation> <translation>; Restauro Falhou: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Um ficheiro ou pasta foi removido de uma partilha só de leitura, mas o restauro falhou: %1</translation> </message> @@ -2440,27 +2516,27 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Ficheiro local alterado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Código de resposta inesperado do servidor (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>ID do ficheiro no servidor em falta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag do servidor em falta</translation> </message> @@ -2669,22 +2745,22 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -2757,22 +2833,22 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Partilhar com utilizadores ou grupos...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Sem resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation type="unfinished"/> </message> @@ -2790,22 +2866,27 @@ Não é aconselhada a sua utilização.</translation> <translation>pode editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2832,8 +2913,8 @@ Não é aconselhada a sua utilização.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Vista de depuramento SSL Cipher</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3018,11 +3099,6 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar na mesma neste certificado.</translation> @@ -3051,44 +3127,49 @@ Não é aconselhada a sua utilização.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organização: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidade: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Chave(MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Chave(SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Data efectiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Data de Expiração: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emissor: %1</translation> </message> @@ -3143,7 +3224,7 @@ Não é aconselhada a sua utilização.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="535"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> - <translation type="unfinished"/> + <translation>Conflito: versão do servidor transferida, cópia local renomeada e não enviada.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="801"/> @@ -3379,11 +3460,11 @@ Não é aconselhada a sua utilização.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versão %1. Para mais informações visite <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3391,25 +3472,25 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3477,11 +3558,6 @@ Não é aconselhada a sua utilização.</translation> <translation>Configurações...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalhes...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ajuda</translation> @@ -3593,6 +3669,11 @@ Não é aconselhada a sua utilização.</translation> <translation>Nova conta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3652,23 +3733,6 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3710,11 +3774,6 @@ Não é aconselhada a sua utilização.</translation> <translation>Pasta Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>Seleccione Pasta local</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Manter dados locais</translation> @@ -3733,11 +3792,6 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>Nome de &utilizador</translation> @@ -3751,11 +3805,6 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation type="unfinished"/> @@ -3770,21 +3819,15 @@ Não é aconselhada a sua utilização.</translation> <source>Re-open Browser</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3818,26 +3861,10 @@ Não é aconselhada a sua utilização.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>A sua conta está sincronizada na pasta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Botão</translation> - </message> </context> <context> <name>QObject</name> @@ -3892,7 +3919,7 @@ Não é aconselhada a sua utilização.</translation> <translation>Algum tempo atrás</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3975,14 +4002,6 @@ Não é aconselhada a sua utilização.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> @@ -4018,7 +4037,7 @@ Não é aconselhada a sua utilização.</translation> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> <source>Server version downloaded, copied changed local file into conflict file</source> - <translation>A versão do servidor transferida, o ficheiro local alterado foi copiado para o ficheiro de conflito</translation> + <translation>A versão transferida do servidor, o ficheiro local alterado foi copiado para o ficheiro de conflito</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="39"/> @@ -4059,7 +4078,7 @@ Não é aconselhada a sua utilização.</translation> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="66"/> <source>downloading</source> - <translation>A transferir</translation> + <translation>a transferir</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="68"/> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 25da08bfe..6d76d064a 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Diálogo</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etiqueta</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation>Formato</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor, mude para o seu navegador para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Erro ao conectar. Tente novamente.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Reabrir Navegador</translation> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar link</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Formulário</translation> + <translation>Formato</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Por favor, mude para o seu navegador para continuar.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Erro ao conectar. Tente novamente.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Reabrir Navegador</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Copiar link</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Selecione uma pasta do seu computador a ser sincronizada</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Selecionar uma pasta de destino remota</translation> @@ -181,18 +222,18 @@ <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="403"/> <source>Server replied "%1 %2" to "%3 %4"</source> - <translation>O servidor respondeu "%1 %2" to "%3 %4"</translation> + <translation>O servidor respondeu "%1 %2" para "%3 %4"</translation> </message> </context> <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Mnemônico da criptografia de ponta-a-ponta</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Para proteger sua Identidade Criptográfica, nós criptografamos com um mnemônico de 12 palavras de dicionário. Anote e mantenha-os em segurança. Eles serão necessários para adicionar outros dispositivos à sua conta (como seu celular ou laptop).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Espaço de armazenamento:...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Pastas não marcadas serão <b>removidas</b> de seu sistema de arquivos local e não serão mais sincronizadas com este computador</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Sincronizar tudo</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Não sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplicar alterações manuais</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Conectado com <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Nenhuma conta configurada.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Adicionar nova</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Remover</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Esta conta suporta criptografia de ponta-a-ponta</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Ativar criptografia</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Exibir mnemônico E2E</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Criptografar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Editar Arquivos a Ignorar</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Escolher o que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Forçar sincronização agora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reiniciar a sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Remover a conexão de sincronização de pastas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Falha na criação da pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Não foi possível criar a pasta local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar a Remoção da Sincronização de Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Remover a Conexão de Sincronização de pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> - <translation>Sincronização Ocorrendo</translation> + <translation>Sincronização ocorrendo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>A operação de sincronização está ocorrendo.<br/>Deseja finalizá-la?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 em uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>A versão do servidor %1 é antiga e não suportada! Prossiga por conta própria.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>O servidor %1 está temporariamente indisponível.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>O servidor %1 está em modo de manutenção.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Desconectado de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Obtendo autorização do navegador. <a href='%1'>Clique aqui</a> para reabrir o navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Sem conexão para %1 em %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Entrar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Existem pastas que não foram sincronizadas porque são muito grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Existem pastas que não foram sincronizadas porque são armazenamentos externos:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> - <translation>Existem pastas que não foram sincronizadas porque são muito grandes ou são armazenamentos externos:</translation> + <translation>Existem pastas que não foram sincronizadas porque são muito grandes ou são armazenamentos externos: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Confirmar a Remoção da Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Você realmente deseja remover a conexão desta conta<i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> irá excluir nenhum arquivo.</p></translation> + <translation><p>Deseja realmente remover a conexão desta conta<i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> irá excluir nenhum arquivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Remover conexão</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Abrir pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Sair</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Retomar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Você realmente deseja parar a sincronização desta pasta <i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> vai excluir qualquer arquivo.</p></translation> + <translation><p>Deseja realmente parar a sincronização desta pasta <i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> vai excluir qualquer arquivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 em uso. Algumas pastas, incluindo as montadas na rede ou pastas compartilhadas, podem ter limites diferentes.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 de %2 em uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Atualmente, não há informação disponível do uso de armazenamento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Nenhuma conexão %1 configurada.</translation> </message> @@ -504,7 +556,7 @@ <message> <location filename="../src/gui/accountstate.cpp" line="134"/> <source>Asking Credentials</source> - <translation>Solicitando Credenciais</translation> + <translation>Solicitando credenciais</translation> </message> <message> <location filename="../src/gui/accountstate.cpp" line="136"/> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>sincronizado</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Retentar todos os envios</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>A conta %1 não tem atividades ativadas.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Ocorreu um erro ao escrever metadados no banco de dados</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Insira a senha da criptografia de ponta-a-ponta:<br><br>Usuário: %2<br>Conta: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Digite a senha E2E</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Erro retornado do servidor: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Erro ao acessar o terminal 'token': <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Não foi possível analisar o JSON retornado do servidor: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>A resposta do servidor não continha todos os campos esperados</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Conectar ao %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Faça login no seu navegador (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>Não foi possível abrir o Navegador, copie o link para o seu Navegador.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>Não foi possível abrir o Navegador, copie o link para o seu Navegador.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 não pode ser lido.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 foi removido.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 foi baixado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 foi atualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 foi renomeado para %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 foi movido para %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 e %n outro arquivo foram removidos.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 e %n outro arquivo foram baixados.</numerusform><numerusform>%1 e %n outros arquivos foram baixados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 e %n outro arquivo foram atualizados.</numerusform><numerusform>%1 e %n outros arquivos foram atualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 foi renomeado para %2 e %n outro arquivo foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros arquivos foram renomeados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 foi movido para %2 e %n outro arquivo foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros arquivos foram movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 tem e %n outro arquivo têm conflitos na sincronização.</numerusform><numerusform>%1 tem e %n outros arquivos têm conflitos na sincronização.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tem um conflito na sincronização. Verifique o arquivo conflitante!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 e %n outro arquivo não puderam ser sincronizados devido a erros. Veja o log para detalhes.</numerusform><numerusform>%1 e %n outros arquivos não puderam ser sincronizados devido a erros. Veja o log para detalhes.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 não pôde ser sincronizado devido a um erro. Veja o log para obter detalhes.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Atividade de Sincronização</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Não foi possível ler o sistema de arquivo de exclusão</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Uma nova pasta maior que %1 MB foi adicionada: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Uma pasta de um armazenamento externo foi adicionada. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor, vá nas configurações para selecioná-lo se desejar baixá-lo.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>A pasta %1 foi criada, mas foi excluída da sincronização anteriormente. Dados dentro dela não serão sincronizados.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>O arquivo %1 foi criado, mas foi excluído da sincronização anteriormente. Não será sincronizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,7 +961,7 @@ Isso significa que o cliente de sincronização pode não fazer upload de altera %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -877,22 +972,22 @@ Se decidir manter os arquivos, eles serão re-sincronizados com o servidor se vo Se decidir excluir os arquivos eles ficarão indisponíveis, a menos que você seja o proprietário.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Baixar novos arquivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Baixar novos arquivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Manter arquivos locais</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -901,7 +996,7 @@ Tem certeza de que deseja sincronizar essas ações com o servidor? Se isso foi um acidente e você decidir manter seus arquivos, eles serão ressincronizados a partir do servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -910,17 +1005,17 @@ Isso pode ser porque um backup foi restaurado no servidor. Continuar a sincronização como normal fará com que todos os seus arquivos sejam substituídos por um arquivo antigo em um estado anterior. Deseja manter seus arquivos mais recentes locais como arquivos conflitantes?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Backup detectado</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Sincronização Normal</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Manter Arquivos Locais como Conflito</translation> </message> @@ -1036,12 +1131,12 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej <translation>Adicionar Conexão de Sincronização de pasta</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Sincronizado com a pasta local</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>Sincronizado com a pasta local (%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Arquivo</translation> </message> @@ -1071,7 +1166,7 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej <translation>Erro ao carregar a lista de pastas do servidor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Desconectado</translation> </message> @@ -1086,107 +1181,107 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej <translation>Existem conflitos não resolvidos. Clique para detalhes.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Reconciliando mudanças</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>baixar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>enviar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Checando por alterações no remoto '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Verificação de alterações no local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restando, %1 de %2, arquivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, arquivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>arquivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Esperando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando por %n outra pasta...</numerusform><numerusform>Esperando por %n outras pastas...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1317,11 +1412,6 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Nota legal</translation> @@ -1454,7 +1544,7 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> <source>Ignored Files Editor</source> - <translation>Editor de Arquivos Ignorado</translation> + <translation>Editor de Arquivos Ignorados</translation> </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="20"/> @@ -1464,7 +1554,7 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej <message> <location filename="../src/gui/ignorelisteditor.ui" line="26"/> <source>Sync hidden files</source> - <translation>Sincronizar arquivos escondidos</translation> + <translation>Sincronizar arquivos ocultos</translation> </message> <message> <location filename="../src/gui/ignorelisteditor.ui" line="36"/> @@ -1472,83 +1562,81 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej <translation>Arquivos Ignorados por Padrões</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Adicionar</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Esta entrada é fornecida pelo sistema em '%1' e não pode ser modificada aqui.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Remover todos</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation>IgnoreListTableWidget</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation>Padrão</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation>Permitir Exclusão</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>Adicionar</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Remover</translation> + <translation>Excluir</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation>Excluir tudo</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>Arquivos ou pastas que correspondam a um padrão não serão sincronizados. + <translation>Arquivos ou pastas correspondentes a um padrão não serão sincronizados. -Itens onde a exclusão é permitida serão excluídos se eles evitarem que um diretório seja removido. Isso é útil para metadados.</translation> +Os itens em que a exclusão é permitida serão excluídos se impedirem a remoção de um diretório. Isso é útil para metadados.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation>Não foi possível abrir o arquivo</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> <translation>Não é possível gravar as alterações em '%1'.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation>Adicionar Padrão a Ignorar</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> <translation>Adicionar um novo padrão a ignorar:</translation> </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Esta entrada é fornecida pelo sistema em '%1' e não pode ser modificada aqui.</translation> - </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Diálogo</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Nota legal</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Fechar</translation> @@ -1680,11 +1768,6 @@ Logs serão gravados em %1</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Configurações de Proxy</translation> @@ -1740,7 +1823,7 @@ Logs serão gravados em %1</translation> <location filename="../src/gui/networksettings.ui" line="203"/> <location filename="../src/gui/networksettings.ui" line="292"/> <source>No limit</source> - <translation>Sem Limite</translation> + <translation>Sem limite</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="250"/> @@ -1995,11 +2078,6 @@ pode solicitar por privilégios adicionais durante o processo.</translation> <source>Login in your browser</source> <translation>Faça login no seu navegador</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Copiar link para a área de transferência</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2021,7 +2099,7 @@ pode solicitar por privilégios adicionais durante o processo.</translation> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/> <source>Secure collaboration & file exchange</source> - <translation>Colaboração segura e troca de arquivo</translation> + <translation>Colaboração segura e troca de arquivos</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/> @@ -2051,12 +2129,12 @@ Não é aconselhável usá-la.</translation> <translation>&Próximo ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>URL inválida</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Não foi possível carregar o certificado. Senha errada?</translation> </message> @@ -2134,79 +2212,79 @@ Não é aconselhável usá-la.</translation> <translation>Não foi possível criar pasta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Nenhuma pasta remota foi especificada!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>criando pasta no Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Pasta remota %1 criada com sucesso.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>A pasta remota %1 já existe. Conectando-a para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A criação da pasta resultou em um erro HTTP de código %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>A criação da pasta remota falhou porque as credenciais fornecidas estão erradas!<br/>Por favor, volte e verifique suas credenciais.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">A criação da pasta remota falhou provavelmente devido a credenciais incorretas</font><br/>Por favor, volte e verifique suas credenciais.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>A criação da pasta remota %1 falhou com erro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Uma conexão de sincronização de %1 para o diretório remoto %2 foi realizada.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Conectado com sucesso a %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>A conexão a %1 não foi estabelecida. Por favor, verifique novamente.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Falha ao renomear pasta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Não é possível remover e fazer backup da pasta porque a pasta ou um arquivo estão abertos em outro programa. Feche a pasta ou arquivo e tente novamente ou cancele a operação.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation> </message> @@ -2214,12 +2292,12 @@ Não é aconselhável usá-la.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>Assistente de Conexão %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Pular a configuração de pastas</translation> </message> @@ -2253,7 +2331,7 @@ Não é aconselhável usá-la.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Ocorreu um erro ao escrever metadados no banco de dados</translation> </message> @@ -2281,32 +2359,32 @@ Não é aconselhável usá-la.</translation> <translation>O espaço livre no disco é inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>O arquivo foi excluído do servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>O arquivo não pôde ser baixado completamente.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>O arquivo baixado está vazio apesar do servidor ter anunciado que ele deveria ter %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>O arquivo %1 não pôde ser salvo devido a um conflito com um nome de arquivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>O arquivo foi alterado desde a descoberta</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Ocorreu um erro ao escrever metadados no banco de dados</translation> </message> @@ -2319,7 +2397,7 @@ Não é aconselhável usá-la.</translation> <translation>; Falha na Restauração: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Um arquivo ou pasta foi removido de um compartilhamento de somente leitura, mas a restauração falhou: %1</translation> </message> @@ -2451,27 +2529,27 @@ Não é aconselhável usá-la.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>O arquivo local foi modificado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno inesperado do servidor (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Falta ID do arquivo do servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Falta ETag do servidor</translation> </message> @@ -2680,22 +2758,22 @@ Não é aconselhável usá-la.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Compartilhar link</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Senha:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Data de expiração:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -2768,22 +2846,22 @@ Não é aconselhável usá-la.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Compartilhar com usuários ou grupos...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Copiar link</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Sem resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Eu compartilhei algo com você</translation> </message> @@ -2801,22 +2879,27 @@ Não é aconselhável usá-la.</translation> <translation>pode editar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Pode recompartilhar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Descompartilhar</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Pode criar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Pode alterar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Pode excluir</translation> </message> @@ -2843,8 +2926,8 @@ Não é aconselhável usá-la.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Ver depuração da criptografia SSL</translation> + <source>SSL Cipher Debug View</source> + <translation>Visão de Depuração de Criptografia SSL</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -2885,7 +2968,7 @@ Não é aconselhável usá-la.</translation> <location filename="../src/gui/socketapi.cpp" line="627"/> <location filename="../src/gui/socketapi.cpp" line="672"/> <source>Copy private link to clipboard</source> - <translation>Copiar o link privado para a área de transferência</translation> + <translation>Copiar link privado para a área de transferência</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="628"/> @@ -3029,11 +3112,6 @@ Não é aconselhável usá-la.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Confiar neste certificado mesmo assim</translation> @@ -3062,44 +3140,49 @@ Não é aconselhável usá-la.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organização: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Unidade: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>País: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Fingerprint (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingerprint (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Impressão Digital (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>Impressão Digital (SHA-512): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Data Efetiva: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Data de Expiração: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Emissor: %1</translation> </message> @@ -3390,11 +3473,11 @@ Não é aconselhável usá-la.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Versão %1. Para mais informações por favor visite <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Versão %1. Para mais informações por favor clique <a href='%2'>aqui</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Esta versão foi fornecida por %1</p></translation> </message> @@ -3402,25 +3485,25 @@ Não é aconselhável usá-la.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Certificado inválido detectado</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> - <translation>O host "%1" enviou um certificado inválido. Continuar?</translation> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> + <translation>O host "%1" forneceu um certificado inválido. Continuar?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Você foi deslogado de %1 como usuário %2. Logue-se novamente</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Por favor, faça o login com o usuário: %1</translation> </message> @@ -3460,7 +3543,7 @@ Não é aconselhável usá-la.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="523"/> <source>Recent Changes</source> - <translation>Alterações Recentes</translation> + <translation>Alterações recentes</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="402"/> @@ -3488,11 +3571,6 @@ Não é aconselhável usá-la.</translation> <translation>Configurações...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detalhes...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Ajuda</translation> @@ -3596,7 +3674,7 @@ Não é aconselhável usá-la.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="706"/> <source>Pause synchronization</source> - <translation>Dar uma pausa na sincronização</translation> + <translation>Pausar a sincronização</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="781"/> @@ -3604,6 +3682,11 @@ Não é aconselhável usá-la.</translation> <translation>Nova conta...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Ver mais atividade...</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> @@ -3663,23 +3746,6 @@ Não é aconselhável usá-la.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Servidor</translation> @@ -3721,11 +3787,6 @@ Não é aconselhável usá-la.</translation> <translation>&Pasta Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Manter dados locais</translation> @@ -3744,11 +3805,6 @@ Não é aconselhável usá-la.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Nome do Usuário</translation> @@ -3762,11 +3818,6 @@ Não é aconselhável usá-la.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Mude para o seu navegador para prosseguir.</translation> @@ -3781,24 +3832,18 @@ Não é aconselhável usá-la.</translation> <source>Re-open Browser</source> <translation>Reabrir o navegador</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Copiar link</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> - <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Hospeda teu próprio servidor</span></a></translation> + <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Hospede seu próprio servidor</span></a></translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="143"/> @@ -3829,26 +3874,10 @@ Não é aconselhável usá-la.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Toda a sua conta está sincronizada com a pasta local</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3903,7 +3932,7 @@ Não é aconselhável usá-la.</translation> <translation>Algum tempo atrás</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3986,14 +4015,6 @@ Não é aconselhável usá-la.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Formulário</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index d8cdc2473..ae5374bfa 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Диалог</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Метка</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Форма</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Выберите папку для синхронизации</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Выберите папку на сервере, с которой будет выполняться синхронизация</translation> @@ -187,279 +228,290 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Мнемофраза сквозного шифрования</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> - <translation type="unfinished"/> + <translation>Для защиты личного идентификатора сквозного шифрования используется мнемофраза, состоящая из двенадцати слов. Мнемофразу следует записать и сохранить запись в надёжном месте, она потребуется для подключения к учётной записи ваших дополнительных устройств.</translation> </message> </context> <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>…</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Размер хранилища: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Синхронизировать всё</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Не синхронизировать ничего</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Применить ручные изменения</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Применить</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Установлено соединение с <server> с учётной записью <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Учётная запись не настроена.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Добавить новую</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Учётная запись</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Эта учетная запись поддерживает сквозное шифрование</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Включить шифрование</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Показать мнемофразу E2E</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Зашифровать</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Выбрать объекты для синхронизации</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Принудительно запустить синхронизацию</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Перезапустить синхронизацию</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Отключить синхронизацию папки</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Ошибка создания папки</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Не удалось создать локальную папку: <i>«%1»</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Подтверждение отключения синхронизации папки</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Отключить синхронизацию папки</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Синхронизация запущена</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <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="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>Используется %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 под именем <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <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="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Соединен с %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Сервер %1 временно недоступен.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Сервер %1 в настоящее время находится в режиме технического обслуживания.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Успешно вышли из %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <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="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Соединение с %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Нет соединения с %1 в %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Войти</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <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="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <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="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <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="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Подтверждение удаления учетной записи</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Удалить подключение</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Открыть папку</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Выйти</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Возобновить синхронизацию</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Приостановить синхронизацию</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <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="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>Используется %1 из %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>В данный момент информация о заполненности хранилища недоступна.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Нет настроенного подключения %1.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Синхронизировано</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Повторить передачу файлов на сервер</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>У учетной записи %1 не включены события.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Ошибка записи метаданных в базу данных</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Введите свою парольную фразу сквозного шифрования: <br><br> Пользователь: %2<br>Учётная запись: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Введите парольную фразу сквозного шифрования</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>«%1» не может быть прочитан.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>«%1» удалён.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>«%1» загружен с сервера.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>«%1» обновлён.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>«%1» переименован в «%2».</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>«%1» перемещён в «%2».</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>Удалены «%1» и ещё %n файл.</numerusform><numerusform>Удалены «%1» и ещё %n файла.</numerusform><numerusform>Удалены «%1» и ещё %n файлов.</numerusform><numerusform>Удалены «%1» и ещё %n файлов.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>Скачаны «%1» и ещё один файл.</numerusform><numerusform>Скачаны «%1» и ещё %n файла.</numerusform><numerusform>Скачаны «%1» и ещё %n файлов.</numerusform><numerusform>Скачаны «%1» и ещё %n файлов.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>Обновлёны «%1» и ещё один файл.</numerusform><numerusform>Обновлёны «%1» и ещё %n файла.</numerusform><numerusform>Обновлёны «%1» и ещё %n файлов.</numerusform><numerusform>Обновлёны «%1» и ещё %n файлов.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>«%1» переименован в «%2», ещё переименован один файл.</numerusform><numerusform>«%1» переименован в «%2», ещё переименованы %n файла.</numerusform><numerusform>«%1» переименован в «%2», ещё переименованы %n файлов.</numerusform><numerusform>«%1» переименован в «%2», ещё переименованы %n файлов.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 был перемещён в %2, и ещё %n другой файл был перемещён.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>У %1 и ещё у %n другого файла есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>У %1 есть конфликт синхронизации. Пожалуйста, проверьте конфликтный файл!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 и ещё %n другой файл не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файла не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файлов не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файлов не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 не может быть синхронизирован из-за ошибки. Подробности смотрите в журнале.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Журнал синхронизации</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Невозможно прочесть системный файл исключений</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Добавлена новая папка «%2», размер которой превышает %1 МБ. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Добавлена папка внешнего хранилища. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <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="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <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="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <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="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -865,7 +960,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -876,22 +971,22 @@ 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="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Скачать новые файлы?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Загрузка новых файлов</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Сохранить локальные файлы</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -900,24 +995,24 @@ If this was an accident and you decide to keep your files, they will be re-synce Если это произошло случайно, и вы решите сохранить файлы, они будут повторно скачаны с сервера.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation>Эта синхронизация собирается сбросить файлы в катлоге '%1' в более ранее состояние. Такое может случиться, если на сервере восстановлена резервная копия. Если продолжать синхронизацию как обычно, то ваши файлы будут перетёрты более старыми версиями. Хотите сохранить ваши локальные свежие файлы в качестве конфликтных?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Обнаружена резервная копия</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Обычная синхронизация</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Сохранить локальные файлы как конфликтующие</translation> </message> @@ -1033,12 +1128,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Добавить папку для синхронизации</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Синхронизировано с локальной папкой</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Файл</translation> </message> @@ -1068,7 +1163,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Ошибка загрузки списка папок с сервера.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Выполнен выход из учётной записи</translation> </message> @@ -1083,107 +1178,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Имеются неразрешенные конфликты, нажмите для просмотра подробных сведений.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Согласование изменений</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>«%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Синхронизация «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>получение с сервера %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>передача на сервер %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Проверка наличия изменений на сервере: «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Проверка наличия изменений в локальной папке «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 из %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Синхронизировано файлов %3 из %4 (%1 из %2), до завершения %5</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 из %2, %3 из %4 файлов(а)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>%1 из %2 файлов(а)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Ожидание…</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> - <translation><numerusform>Ожидание %n директории...</numerusform><numerusform>Ожидание %n директорий...</numerusform><numerusform>Ожидание %n директорий...</numerusform><numerusform>Ожидание %n директорий...</numerusform></translation> + <translation><numerusform>Ожидание %n папки…</numerusform><numerusform>Ожидание %n папок…</numerusform><numerusform>Ожидание %n папок…</numerusform><numerusform>Ожидание %n папок…</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Подготовка к синхронизации...</translation> </message> @@ -1314,11 +1409,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Официальное уведомление</translation> @@ -1469,82 +1559,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Шаблоны для исключения файлов из синхронизации</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Добавить</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Эта запись сделана системой в '%1' и не может быть изменена в этом представлении.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Убрать все</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Шаблон</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Разрешить удаление</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Удалить</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> + </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>Файлы или папки, подходящие под шаблон, не будут синхронизироваться. -В случае, если исключаемые их синхронизации объекты помешают удалению папки, они будут удалены. Использование исключений файлов из синхронизации может полезно, в том числе, для исключения из синхронизации метаданных, сохраняемых в отдельных файлах.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Невозможно открыть файл</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Невозможно записать изменения в '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Добавление шаблона</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Введите шаблон для исключения файлов из синхронизации:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Эта запись сделана системой в '%1' и не может быть изменена в этом представлении.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Диалог</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Официальное уведомление</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Закрыть</translation> @@ -1674,11 +1761,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Настройки прокси</translation> @@ -1923,7 +2005,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> <source>There isn't enough free space in the local folder!</source> - <translation type="unfinished"/> + <translation>Недостаточно свободного места в локальной папке.</translation> </message> </context> <context> @@ -1989,11 +2071,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>Выполнить вход в браузере</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Скопировать ссылку в буфер обмена</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2045,12 +2122,12 @@ It is not advisable to use it.</source> <translation>&Далее > </translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Неверная ссылка</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Невозможно загрузить сертификат. Возможно неверный пароль?</translation> </message> @@ -2128,79 +2205,79 @@ It is not advisable to use it.</source> <translation>Не удалось создать локальный каталог синхронизации %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Не указан удалённый каталог!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>создание папки на сервере Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Папка «%1» на сервере успешно создана.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Папка «%1» уже существует на сервере. Выполняется подключение для синхронизации.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Создание каталога завершилось с HTTP-ошибкой %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <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="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <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="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <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="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Соединение с %1 успешно установлено.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Не удалось соединиться с %1. Попробуйте снова.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Ошибка переименования папки</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локальная папка синхронизации «%1» успешно создана.</b></font></translation> </message> @@ -2208,12 +2285,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>Мастер подключения %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Пропустить настройку папок</translation> </message> @@ -2247,7 +2324,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Ошибка записи метаданных в базу данных</translation> </message> @@ -2267,7 +2344,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/propagatedownload.cpp" line="484"/> <source>The download would reduce free local disk space below the limit</source> - <translation>Скачивание сократит доступное пространство на локальном диске ниже допустимого предела</translation> + <translation>Загрузка файлов с сервера уменьшит доступное пространство на локальном диске ниже допустимого предела</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="488"/> @@ -2275,32 +2352,32 @@ It is not advisable to use it.</source> <translation>Свободного места на диске меньше чем %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Файл удалён с сервера</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Невозможно полностью загрузить файл.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <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="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <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="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>После обнаружения файл был изменен</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Ошибка записи метаданных в базу данных</translation> </message> @@ -2313,7 +2390,7 @@ It is not advisable to use it.</source> <translation>; Восстановление не удалось: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Файл или папка была удалена из доступа только для чтения, восстановление завершилось с ошибкой: %1</translation> </message> @@ -2445,27 +2522,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Локальный файл был удалён в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Локальный файл изменился в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Неожиданный код завершения от сервера (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Отсутствует код файла от сервера</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Отсутствует ETag с сервера</translation> </message> @@ -2674,24 +2751,24 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>Доступ по &ссылке</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Пароль:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Срок действия:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> - <translation>TextLabel</translation> + <translation>Название</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="409"/> @@ -2762,22 +2839,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <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="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Скопировать ссылку</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Нет результатов для '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Я поделился с тобой</translation> </message> @@ -2795,22 +2872,27 @@ It is not advisable to use it.</source> <translation>разрешить редактировать</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>разрешить делиться</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Закрыть доступ</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>разрешить создавать</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>разрешить вносить изменения</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>разрешить удалять</translation> </message> @@ -2837,7 +2919,7 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation>Отладочный просмотр шифра SSL</translation> </message> <message> @@ -3023,11 +3105,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Доверять этому сертификату в любом случае</translation> @@ -3056,44 +3133,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Организация: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Подразделение: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Страна: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Отпечаток (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Отпечаток (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Дата вступления в силу: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Дата окончания: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Издатель: %1</translation> </message> @@ -3384,11 +3466,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Версия %1. Для получения дополнительной информации посетите <a href='%2'>%3</a>.</p></translation> + <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="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Этот выпуск подготовлен %1</p></translation> </message> @@ -3396,25 +3478,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Обнаружен недействительный сертификат</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>Хост «%1» предоставил недействительный сертификат. Продолжить?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Выполнен выход пользователя %2 из системы %1. Войдите заново</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Войдите в систему под именем %1</translation> </message> @@ -3482,11 +3564,6 @@ It is not advisable to use it.</source> <translation>Параметры...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Детали...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Помощь</translation> @@ -3598,6 +3675,11 @@ It is not advisable to use it.</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="794"/> <source>Crash now</source> <comment>Only shows in debug mode to allow testing the crash handler</comment> @@ -3657,23 +3739,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Сервер</translation> @@ -3715,11 +3780,6 @@ It is not advisable to use it.</source> <translation>&Локальная папка</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Сохранить локальные данные</translation> @@ -3738,11 +3798,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Имя пользователя</translation> @@ -3756,11 +3811,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Пожалуйста, перейдите в браузер, чтобы продолжить.</translation> @@ -3775,21 +3825,15 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation>Повторно открыть браузер</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Развернуть собственный сервер</span></a></translation> @@ -3823,26 +3867,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Все объекты на стороне сервера полностью синхронизированы с локальной папкой</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3897,7 +3925,7 @@ It is not advisable to use it.</source> <translation>Некоторое время назад</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3980,14 +4008,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Форма</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 56c1be3f0..c90743491 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialóg</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Štítok</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> <translation>Formulár</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Ak chcete pokračovať, prepnite sa prosím do svojho prehliadača.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Pri pripájaní sa vyskytla chyba. Prosím skúste znova.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Znovu otvoriť prehliadač</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopírovať odkaz</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation>Formulár</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Ak chcete pokračovať, prepnite sa prosím do svojho prehliadača.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Pri pripájaní sa vyskytla chyba. Prosím skúste znova.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Znovu otvoriť prehliadač</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Kopírovať odkaz</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Vyberte lokálny priečinok v počítači pre synchronizáciu</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formulár</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Vyberte vzdialený cieľový priečinok</translation> @@ -187,279 +228,290 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>End-to-end kódovanie mnemotechnické</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> - <translation type="unfinished"/> + <translation>Aby sme chránili vašu kryptografickú identitu, zašifrujeme ju pomocou mnemotechnického pomeru 12 slov slovníka. Poznačte si ich a uschovajte ich. Budú potrebné na pridanie ďalších zariadení do vášho účtu (napríklad mobilného telefónu alebo notebooku).</translation> </message> </context> <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulár</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Úložný priestor: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Neoznačené priečinky budú <b>odstránené</b> z lokálneho systému a nebudú už synchronizované na tento počítač</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Synchronizovať všetky</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Synchronizovať žiadny</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Aplikovať manuálne zmeny</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Aplikovať</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Spojené z <server> ako <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Žiadny účet nie je nastavený.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Pridať nový účet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Odobrať</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Účet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Tento účet podporuje šifrovanie end-to-end</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Zapnúť šifrovanie</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> - <translation type="unfinished"/> + <translation>Zobaziť E2E mnemotechnické</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Zašifrovať</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Upraviť ignorované súbory</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Vybrať čo synchronizovať</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Vynútiť synchronizáciu teraz</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Reštartovať synchronizáciu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Odstrániť prepojenie priečinka</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Vytvorenie priečinka zlyhalo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Nemožno vytvoriť lokálny priečinok <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Potvrdiť odstránenie prepojenia priečinka</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Odstrániť prepojenie priečinka</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Prebiehajúca synchronizácia</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 sa používa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 ako <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Verzia servera %1 je stará a nepodporovaná. Pokračujte na vlastné nebezpečenstvo.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Pripojené k %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 je dočasne nedostupný.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 je momentálne v režime údržby.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Odhlásený z %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Získavam autorizáciu z prehliadača. <a href='%1'>Kliknite sem</a> na opätovné otvorenie prehliadača.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Pripája sa k %1…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Žiadne pripojenie k %1 na %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Prihlásiť sa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Tieto priečinky neboli synchronizované pretože sú príliš veľké:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Niektoré priečinky neboli synchronizované, pretože sú na externom úložisku</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Niektoré priečinky neboli synchronizované, pretože sú príliš veľké alebo sú na externom úložisku</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Potvrďte ostránenie účtu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Naozaj chcete odstrániť pripojenie k účtu <i>%1</i>?</p><p><b>Poznámka:</b> Tým sa <b>nevymažú</b> žiadne súbory.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Vymazať pripojenie</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Otvoriť priečinok</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Odhlásiť</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Obnoviť synchronizáciu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pozastaviť synchronizáciu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Naozaj si prajete zastaviť synchronizácu priečinka <i>%1</i>?</p><p><b>Poznámka:</b> Toto <b>nevymaže</b> žiadne súbory.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) z %2 je využitých. Niektoré priečinky, vrátane sieťových a zdieľaných, môžu mať iné limity.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 z %2 je využitých</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Teraz nie sú k dispozícii žiadne informácie o využití úložiska.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Žiadne nakonfigurované %1 spojenie</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Formulár</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Štítok</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Prijať</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Zosynchronizované</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Zopakovať všetky nahrávania</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Účet %1 nemá zapnuté aktivity.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Chyba pri zápise metadát do databázy</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> - <translation type="unfinished"/> + <translation>Zadajte svoju prístupovú frázu pre šifrovanie medzi koncovými bodmi: <br><br>Používateľ: %2<br>Účet: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Zadajte E2E prístupovú frázu</translation> </message> @@ -719,7 +761,60 @@ <message> <location filename="../src/libsync/discoveryphase.cpp" line="392"/> <source>The server file discovery reply is missing data.</source> - <translation type="unfinished"/> + <translation>V odpovedi zo servera na objavovanie súboru chýbajú dáta.</translation> + </message> +</context> +<context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Chyba vrátená zo servera: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Chyba pri prístupe k 'tokenu' endpoint: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Nie je možné spracovať JSON odpoveď zo servera: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Odpoveď zo servera neobsahuje všetky očakávané polia</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Pripojiť sa k %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Prihlásenie sa v prehliadači (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>Nedarí sa otvoriť prehliadač, je preto potrebné skopírovať do neho odkaz ručne.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>Nedarí sa otvoriť prehliadač, je preto potrebné skopírovať do neho odkaz ručne.</translation> </message> </context> <context> @@ -740,152 +835,159 @@ <translation>%1 nie je čitateľný.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 bol zmazaný.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 bol stiahnutý.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 bol aktualizovaný.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 bol premenovaný na %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 bol presunutý do %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 a %n iný súbor bol odstránený.</numerusform><numerusform>%1 a %n iné súbory boli odstránené.</numerusform><numerusform>%1 a %n iných súborov bolo odstránených.</numerusform><numerusform>%1 a %n iných súborov bolo odstránených.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 a %n iný súbor bol stiahnutý.</numerusform><numerusform>%1 a %n iné súbory boli stiahnuté.</numerusform><numerusform>%1 a %n iných súborov bolo stiahnutých.</numerusform><numerusform>%1 a %n iných súborov bolo stiahnutých.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 a %n iný súbor bol nahratý.</numerusform><numerusform>%1 a %n iné súbory boli nahraté.</numerusform><numerusform>%1 a %n iných súborov bolo nahratých.</numerusform><numerusform>%1 a %n iných súborov bolo nahratých.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 bol premenovaný na %2 a %n iný súbor bol premenovaný.</numerusform><numerusform>%1 bol premenovaný na %2 a %n iné súbory boli premenované.</numerusform><numerusform>%1 bol premenovaný na %2 a %n iných súborov bolo premenovaných.</numerusform><numerusform>%1 bol premenovaný na %2 a %n iných súborov bolo premenovaných.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 bol presunuý do %2 a %n iných súbor bol presunutý.</numerusform><numerusform>%1 bol presunuý do %2 a %n iné súbory boli presunuté.</numerusform><numerusform>%1 bol presunuý do %2 a %n iných súborov bolo presunutých.</numerusform><numerusform>%1 bol presunuý do %2 a %n iných súborov bolo presunutých.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 má a %n iný súbor má synchronizačný konflikt.</numerusform><numerusform>%1 má a %n iné súbory majú synchronizačný konflikt.</numerusform><numerusform>%1 má a %n iných súborov má synchronizačný konflikt.</numerusform><numerusform>%1 má a %n iných súborov má synchronizačný konflikt.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 má synchronizačný konflikt. Prosím skontrolujte konfliktný súbor!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 a %n iný súbor nie je možné synchronizovať kvôli chybe. Skontrolujte log pre podrobnosti.</numerusform><numerusform>%1 a %n iné súbory nie je možné synchronizovať kvôli chybe. Skontrolujte log pre podrobnosti.</numerusform><numerusform>%1 a %n iných súborov nie je možné synchronizovať kvôli chybe. Skontrolujte log pre podrobnosti.</numerusform><numerusform>%1 a %n iných súborov nie je možné synchronizovať kvôli chybe. Skontrolujte log pre podrobnosti.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 nemôže byť synchronizovaný kvôli chybe. Pozrite sa do logu pre podrobnosti.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Aktivita synchronizácie</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Nemožno čítať systémový exclude file</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Bol pridaný nový priečinok väčší ako %1 MB: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Bol pridaný priečinok z externého úložiska. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> - <translation type="unfinished"/> + <translation>Ak si to prajete prevziať, tak prejdite do nastavení a vyberte to.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> - <translation type="unfinished"/> + <translation>Priečinok %1 bol vytvorený, ale bol už skôr vylúčený zo synchronizácie. Nebude preto synchronizovaný.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> - <translation type="unfinished"/> + <translation>Súbor %1 bol vytvorený, ale bol už skôr vylúčený zo synchronizácie. Nebude preto synchronizovaný.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). %1</source> - <translation type="unfinished"/> + <translation>Zmeny v synchronizovaných priečinkoch nebolo možné spoľahlivo sledovať. + +To znamená, že klient synchronizácie nemusí okamžite odovzdať lokálne zmeny a namiesto toho bude len vyhľadávať miestne zmeny a odovzdávať len príležitostne (štandardne každé dve hodiny) . + +% 1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep 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>Všetky súbory v synchronizačnom priečinku „%1“ boli na serveri vymazané. +Tieto zmeny budú synchronizované do lokálneho synchronizačného priečinka, takže už tieto vymazané súbory nebudú dostupné (ak nemáte oprávnenie pre ich obnovu). +Ak sa rozhodnete lokálne súbory ponechať, budú znovu synchronizované so serverom (ak na to máte oprávnenie). +Ak sa rozhodnete súbory vymazať tak následne už nebudú dostupné (ak nie ste vlastník).</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Stiahnuť nové súbory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Stiahnuť nové súbory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Ponechať lokálne súbory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,24 +996,26 @@ Ste si istí, že chcete tieto akcie synchronizovať so serverom? Ak to bol omyl a chcete si tieto súbory ponechať, budú opäť synchronizované zo servera.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> - <translation type="unfinished"/> + <translation>Táto synchronizácia nastaví súbory na skorší čas v synchronizačnom priečinku „%1“. +Toto môže byť spôsobené obnovením zálohy na strane servera. +Pokračovaním v synchronizácii spôsobí prepísanie všetkých vašich súborov staršími súbormi z predchádzajúceho stavu. Chcete ponechat svoje lokálne najaktuálnejšie súbory ako konfliktné súbory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Záloha je dostupná</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Bežná synchronizácia</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Ponechať lokálne súbory ako konfliktné</translation> </message> @@ -1006,17 +1110,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderman.cpp" line="1318"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> - <translation type="unfinished"/> + <translation>Do tohto lokálneho priečinka sa už synchronizuje. Vyberte prosím iný priečinok.</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1298"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> - <translation type="unfinished"/> + <translation>Lokálny priečinok %1 už obsahuje podpriečinok použitý pre synchronizáciu. Vyberte prosím iný priečinok.</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1304"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> - <translation type="unfinished"/> + <translation>Lokálny priečinok %1 už obsahuje podpriečinok použitý pre synchronizáciu. Vyberte prosím iný priečinok.</translation> </message> </context> <context> @@ -1027,12 +1131,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Pridať prepojenie synchronizačného priečinka</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Synchronizované s lokálnym priečinkom</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>Synchronizované s lokálnym priečinkom (%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Súbor</translation> </message> @@ -1047,7 +1151,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderstatusmodel.cpp" line="146"/> <source>Click this button to add a folder to synchronize.</source> - <translation type="unfinished"/> + <translation>Kliknutím na toto tlačidlo pridáte priečinok na synchronizáciu.</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> @@ -1062,7 +1166,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Pri načítavní zoznamu priečinkov zo servera nastala chyba.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Odhlásený</translation> </message> @@ -1077,107 +1181,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Existujú nevyriešené konflikty. Podrobnosti zobrazíte kliknutím.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Zosúladenie zmien</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronizuje sa %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>stiahnuť %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>nahrať %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Kontrolujú sa zmeny vo vzdialenom '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Kontrolujú sa zmeny v lokálnom '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 of %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 zostáva, %1 z %2, súbor %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 z %2, súbor %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>súbor %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Čakajte...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Čaká sa na %n ďalší priečinok...</numerusform><numerusform>Čaká sa na %n ďalšie priečinky...</numerusform><numerusform>Čaká sa na %n ďalších priečinkov...</numerusform><numerusform>Čaká sa na %n ďalších priečinkov...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Príprava na synchronizáciu...</translation> </message> @@ -1187,7 +1291,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/> <source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source> - <translation type="unfinished"/> + <translation>Obvykle k tomuto problému prichádza vtedy, keď sa prekročia kapacity sledovania zmien na súborovom systéme (inotify). Podrobnosti nájdete v často kladených otázkach FAQ.</translation> </message> </context> <context> @@ -1308,11 +1412,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Formulár</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Právne upozornenie</translation> @@ -1371,7 +1470,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.ui" line="250"/> <source>Show sync folders in &Explorer's Navigation Pane</source> - <translation type="unfinished"/> + <translation>Zobraziť synchronizované priečinky v paneli navigáci&e Prieskumníka</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="267"/> @@ -1463,32 +1562,45 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Ignorovať súbory podľa masky</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Pridať</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Táto položka je poskytovaná systémom na '%1' a nesmie byť modifikovaná v tomto zobrazení.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Odstrániť všetko</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation>IgnoreListTableWidget</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation>Vzor</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Povoliť vymazanie</translation> + <translation>Povoliť vymazávanie</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>Pridať</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Odobrať</translation> + <translation>Odstrániť</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation>Odstániť všetko</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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> @@ -1497,49 +1609,34 @@ Items where deletion is allowed will be deleted if they prevent a directory from Položky u ktorých je povolené mazanie sa vymažú ak by bránili odstráneniu priečinka. Toto je užitočne napr. pre matadáta.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Nemožno otvoriť súbor</translation> + <translation>Súbor sa nepodarilo otvoriť</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Nemožno zapísať zmeny do '%1'.</translation> + <translation>Nie je možné zapísať zmeny do '%1'.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation>Pridať vzor ignorovaného súboru</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> <translation>Pridať nový vzor ignorovaného súboru:</translation> </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Táto položka je poskytovaná systémom na '%1' a nesmie byť modifikovaná v tomto zobrazení.</translation> - </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialóg</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Právne upozornenie</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>TextovýŠtítok</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Zatvoriť</translation> @@ -1547,12 +1644,12 @@ Položky u ktorých je povolené mazanie sa vymažú ak by bránili odstráneniu <message> <location filename="../src/gui/legalnotice.cpp" line="27"/> <source><p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></source> - <translation type="unfinished"/> + <translation><p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></translation> </message> <message> <location filename="../src/gui/legalnotice.cpp" line="30"/> <source><p>Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.</p></source> - <translation type="unfinished"/> + <translation><p>Licencované pod GNU General Public LIcense (GPL) verzie 2.0 alebo akejkoľvek vyššej.</p></translation> </message> </context> <context> @@ -1575,19 +1672,21 @@ Položky u ktorých je povolené mazanie sa vymažú ak by bránili odstráneniu <message> <location filename="../src/gui/logbrowser.cpp" line="89"/> <source>&Capture debug messages</source> - <translation type="unfinished"/> + <translation>&Zachytávať ladiace správy</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="101"/> <source>Permanently save logs</source> - <translation type="unfinished"/> + <translation>Ukladať záznamy udalostí trvalo</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="103"/> <source>When this option is enabled and no other logging is configured, logs will be written to a temporary folder and expire after a few hours. This setting persists across client restarts. Logs will be written to %1</source> - <translation type="unfinished"/> + <translation>Keďje táto voľba zapnutá a nie je nastavené žiadne ďalšie zaznamenávanie udalostí, záznam udalostí sa bude zapisovať do dočasného priečinka a po niekoľkých hodinách sa jeho platnosť skončí. Toto nastavenie sa zachová aj napriek reštartom klienta. + +Záznamy udalostí sa budú zapisovať do %1</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="115"/> @@ -1669,11 +1768,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Formulár</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Nastavenia proxy</translation> @@ -1784,17 +1878,17 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/creds/oauth.cpp" line="115"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> - <translation type="unfinished"/> + <translation>Chyba pri prístupe k 'tokenu' endpoint: <br><em>%1</em></translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="118"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation type="unfinished"/> + <translation>Nie je možné spracovať JSON odpoveď zo servera: <br><em>%1</em></translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="121"/> <source>The reply from the server did not contain all expected fields</source> - <translation type="unfinished"/> + <translation>Odpoveď zo servera neobsahovala všetky očakávané polia</translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="125"/> @@ -1804,7 +1898,7 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/creds/oauth.cpp" line="131"/> <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source> - <translation type="unfinished"/> + <translation><h1>Chybný používateľ</h1><p>Prihlásili ste sa ako používateľ <em>%1</em>, ale je potrebné sa prihlásiť ako <em>%2</em>.<br>Odhláste %3 v inej karte, potom <a href='%4'>kliknite sem</a> a prihláste sa ako používateľ %2</p></translation> </message> </context> <context> @@ -1839,12 +1933,12 @@ môžu byť vyžadované dodatočné oprávnenia.</translation> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="145"/> <source>%1 version %2 available. Restart application to start the update.</source> - <translation type="unfinished"/> + <translation>Je dostupná %1 verzie %2. Pre spustenie aktualizácie reštartujte aplikáciu.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="151"/> <source>New %1 version %2 available. Please use the system's update tool to install it.</source> - <translation type="unfinished"/> + <translation>Je dostupná nová %1 verzia %2. Pre inštaláciu použite systémového správcu aktualizácií.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="153"/> @@ -1897,7 +1991,7 @@ môžu byť vyžadované dodatočné oprávnenia.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="165"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> - <translation type="unfinished"/> + <translation><p><small><strong>Varovanie:</strong> Lokálny priečion nie je prázdny. Vyberte ďalší postup</small></p></translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/> @@ -1984,11 +2078,6 @@ môžu byť vyžadované dodatočné oprávnenia.</translation> <source>Login in your browser</source> <translation>Prihlásenie sa v prehliadači</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Kopírovať odkaz do schránky</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2040,12 +2129,12 @@ Nie je vhodné ju používať.</translation> <translation>&Ďalšia ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Neplatná URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Nie je možné načítať certifikát. Možno zlé heslo?</translation> </message> @@ -2123,79 +2212,79 @@ Nie je vhodné ju používať.</translation> <translation>Nemožno vytvoriť lokálny priečinok %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Vzdialený priečinok nie je nastavený!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>Vytvára sa priečinok v Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Vzdialený priečinok %1 bol úspešne vytvorený.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Vzdialený priečinok %1 už existuje. Prebieha jeho pripájanie pre synchronizáciu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Vytváranie priečinka skončilo s HTTP chybovým kódom %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Proces vytvárania vzdialeného priečinka zlyhal, lebo použité prihlasovacie údaje nie sú správne!<br/>Prosím skontrolujte si vaše údaje a skúste to znovu.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Vytvorenie vzdialeného priečinka pravdepodobne zlyhalo kvôli nesprávnym prihlasovacím údajom.</font><br/>Prosím choďte späť a skontrolujte ich.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Vytvorenie vzdialeného priečinka %1 zlyhalo s chybou <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Synchronizačné spojenie z %1 do vzdialeného priečinka %2 bolo práve nastavené.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Úspešne pripojené s %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Pripojenie k %1 nemohlo byť iniciované. Prosím skontrolujte to znovu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Premenovanie priečinka zlyhalo</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Nemožno odstrániť a zazálohovať priečinok, pretože priečinok alebo súbor je otvorený v inom programe. Prosím zatvorte priečinok nebo súbor a skúste to znovu alebo zrušte akciu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokálny synchronizačný priečinok %1 bol úspešne vytvorený!</b></font></translation> </message> @@ -2203,12 +2292,12 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Asistent pripojenia</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Preskočiť konfiguráciu priečinkov</translation> </message> @@ -2242,7 +2331,7 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Chyba pri zápise metadát do databázy</translation> </message> @@ -2252,7 +2341,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/libsync/propagatedownload.cpp" line="364"/> <source>File %1 can not be downloaded because encryption information is missing.</source> - <translation type="unfinished"/> + <translation>Súbor %1 nie je možné prevziať, pretože chýbajú informácie o šifrovaní.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="434"/> @@ -2270,32 +2359,32 @@ Nie je vhodné ju používať.</translation> <translation>Voľné miesto na disku je menej ako %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Súbor bol vymazaný zo servera</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Súbor sa nedá stiahnuť úplne.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> - <translation type="unfinished"/> + <translation>Prebratý súbor je prázdny napriek tomu, že server oznámil, že mal mať %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Súbor sa medzitým zmenil</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Chyba pri zápise metadát do databázy</translation> </message> @@ -2308,9 +2397,9 @@ Nie je vhodné ju používať.</translation> <translation>; Obnovenie zlyhalo: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation type="unfinished"/> + <translation>Súbor alebo adresár bol odobratý zo sprístupnenia len na čítanie, ale jeho obnovenie zlyhalo: %1</translation> </message> </context> <context> @@ -2318,7 +2407,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="170"/> <source>could not delete file %1, error: %2</source> - <translation type="unfinished"/> + <translation>nie je možné vymazať súbor %1, chyba: %2</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="185"/> @@ -2408,7 +2497,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/libsync/propagateupload.cpp" line="214"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> - <translation type="unfinished"/> + <translation>Súbor %1 nie je možné nahrať, pretože existuje iný súbor s rovnakým názvom, ktorý sa líši len veľkostou písmen</translation> </message> <message> <location filename="../src/libsync/propagateupload.cpp" line="348"/> @@ -2424,12 +2513,12 @@ Nie je vhodné ju používať.</translation> <location filename="../src/libsync/propagateupload.cpp" line="225"/> <location filename="../src/libsync/propagateupload.cpp" line="602"/> <source>Upload of %1 exceeds the quota for the folder</source> - <translation type="unfinished"/> + <translation>Nahranie %1 prekračuje kvótu, ktorá je pre priečinok nastavená</translation> </message> <message> <location filename="../src/libsync/propagateupload.cpp" line="334"/> <source>File Removed (start upload) %1</source> - <translation type="unfinished"/> + <translation>Súbor odobratý (spustiť nahrávanie) %1</translation> </message> <message> <location filename="../src/libsync/propagateupload.cpp" line="684"/> @@ -2440,29 +2529,29 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Lokálny súbor bol odstránený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Lokálny súbor bol zmenený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Neočakávaný návratový kód zo servera (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> - <translation type="unfinished"/> + <translation>Chýba ID (identifikátor) súboru zo servera</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> - <translation type="unfinished"/> + <translation>Chýba ETag zo servera</translation> </message> </context> <context> @@ -2485,7 +2574,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> - <translation type="unfinished"/> + <translation>Server nepotvrdil poslednú časť dát (nenašiel sa e-tag).</translation> </message> </context> <context> @@ -2539,7 +2628,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="79"/> <source>Deselect remote folders you do not wish to synchronize.</source> - <translation type="unfinished"/> + <translation>Zrušte výber vzdialených priečinkov, ktoré nechcete synchronizovať.</translation> </message> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="95"/> @@ -2560,7 +2649,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> <source>An error occurred while loading the list of sub folders.</source> - <translation type="unfinished"/> + <translation>Počas načítavania zoznamu podpriečinkov sa vyskytla chyba.</translation> </message> </context> <context> @@ -2669,22 +2758,22 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> - <translation type="unfinished"/> + <translation>Odkaz pre &sprístupnenie</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Heslo:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Dátum vypršania:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>Štítok</translation> </message> @@ -2741,7 +2830,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="403"/> <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 type="unfinished"/> + <translation><p>Naozaj chcete vymazať odkaz pre verejné sprístupnenie <i>%1</i>?</p><p>Pozn.: túto akciu nie je možné vrátiť späť.</p></translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="410"/> @@ -2757,22 +2846,22 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Zdieľať s používateľmi alebo skupinami ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Kopírovať odkaz</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Žiadne výsledky pre '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Niečo som vám sprístupnil</translation> </message> @@ -2790,22 +2879,27 @@ Nie je vhodné ju používať.</translation> <translation>môže upraviť</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Môže sprístupniť aj iným</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Zneprístupniť</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Môže vytvárať</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Môže meniť</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Môže odstraňovať</translation> </message> @@ -2832,7 +2926,7 @@ Nie je vhodné ju používať.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation>Debug zobrazenie šifrovania SSL</translation> </message> <message> @@ -3018,11 +3112,6 @@ Nie je vhodné ju používať.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Formulár</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Dôverovať danému certifikátu v každom prípade</translation> @@ -3051,44 +3140,49 @@ Nie je vhodné ju používať.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organizácia: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Jednotka: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Krajina: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Odtlačok (MD5 hash): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Odtlačok (SHA1 hash): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Odtlačok (SHA-256 hash): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation>Odtlačok (SHA-512 hash): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Dátum účinnosti: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Koniec platnosti: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Vydavateľ: %1</translation> </message> @@ -3128,7 +3222,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="244"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> - <translation type="unfinished"/> + <translation>%1 (vynechané kvôli predchádzajúcej chybe, ďalší pokus za %2)</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="516"/> @@ -3154,27 +3248,27 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="836"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> - <translation type="unfinished"/> + <translation>Nie je možné otvoriť alebo vytvoriť miestnu synchronizačnú databázu. Skontrolujte či máte právo na zápis do synchronizačného priečinku.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="1350"/> <source>Not allowed because you don't have permission to add parent folder</source> - <translation type="unfinished"/> + <translation>Nie je možné, pretože nemáte oprávnenie vytvoriť nadradený priečinok</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="1357"/> <source>Not allowed because you don't have permission to add files in that folder</source> - <translation type="unfinished"/> + <translation>Nie je možné, pretože nemáte oprávnenie pridávať súbory do tohto priečinka</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="1690"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> - <translation type="unfinished"/> + <translation>Na disku dochádza voľné miesto. Sťahovanie, ktoré by zmenšilo voľné miesto pod %1 bude vynechané.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="1697"/> <source>There is insufficient space available on the server for some uploads.</source> - <translation type="unfinished"/> + <translation>Na serveri nie je pre niektoré z nahrávaných súborov dostatok voľného miesta.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="150"/> @@ -3189,32 +3283,32 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="125"/> <source>Failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source> - <translation type="unfinished"/> + <translation>Nepodarilo sa načítať alebo vytvoriť súbor žurnálu. Overte, že máte právo pre čítanie a zápis do miestneho synchronizačného priečinka.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="129"/> <source>Discovery step failed.</source> - <translation type="unfinished"/> + <translation>Krok objavovania sa nepodaril</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="138"/> <source>Permission denied.</source> - <translation type="unfinished"/> + <translation>Oprávnenie zamietnuté.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="141"/> <source>File or directory not found:</source> - <translation type="unfinished"/> + <translation>Súbor alebo adresár sa nenašiel:</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="144"/> <source>Tried to create a folder that already exists.</source> - <translation type="unfinished"/> + <translation>Pokus o vytvorenie priečinka, ktorý už existuje.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="147"/> <source>No space on %1 server available.</source> - <translation type="unfinished"/> + <translation>Na serveri %1 nie je žiadne voľné miesto.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="156"/> @@ -3244,22 +3338,22 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="492"/> <source>File names ending with a period are not supported on this file system.</source> - <translation type="unfinished"/> + <translation>Názvy súborov končiacich bodkou nie sú na tomto súborovom systéme podporované.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="502"/> <source>File names containing the character '%1' are not supported on this file system.</source> - <translation type="unfinished"/> + <translation>Názvy súborov obsahujúce znak "%1" nie sú na tomto súborovom systéme podporované.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="505"/> <source>The file name is a reserved name on this file system.</source> - <translation type="unfinished"/> + <translation>Názov súboru je na tomto súborovom systéme rezervovaným názvom (nie je možné ho použiť).</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="510"/> <source>Filename contains trailing spaces.</source> - <translation type="unfinished"/> + <translation>Názov súboru obsahuje medzery na konci.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="513"/> @@ -3269,7 +3363,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="522"/> <source>The filename cannot be encoded on your file system.</source> - <translation type="unfinished"/> + <translation>Názov súboru nemôže byť na tomto súborovom systéme enkódovaný.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="531"/> @@ -3279,7 +3373,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="539"/> <source>Stat failed.</source> - <translation type="unfinished"/> + <translation>Nepodarilo sa získať informácie o súbore.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="566"/> @@ -3294,7 +3388,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="864"/> <source>Unable to read the blacklist from the local database</source> - <translation type="unfinished"/> + <translation>Nepodarilo sa načítať čiernu listinu z miestnej databázy</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="905"/> @@ -3379,37 +3473,37 @@ Nie je vhodné ju používať.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Verzia %1. Pre viac informácií choďte na <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Verzia %1. Viac informácií získate <a href='%2'>kliknutím sem</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> - <translation type="unfinished"/> + <translation><p>Toto vydanie bolo poskytnuté %1</p></translation> </message> </context> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Bol zistený neplatný certifikát</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>Hostiteľ "%1" poskytol neplatný certifikát. Chcete pokračovať?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Boli ste odhlásení z %1 ako používateľ %2. Znovu sa prihláste</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Prihláste sa pomocou používateľa: %1</translation> </message> @@ -3477,11 +3571,6 @@ Nie je vhodné ju používať.</translation> <translation>Nastavenia...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Podrobnosti...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Pomoc</translation> @@ -3504,7 +3593,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="234"/> <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 type="unfinished"/> + <translation>Server na účte %1 používa starú a nepodporovanú verziu %2. Používanie tohto klienta s nepodporovanými verziami servera nie je testované a môže byť nebezpečné. Pokračujte len na vlastné riziko.</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="273"/> @@ -3514,7 +3603,7 @@ Nie je vhodné ju používať.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="275"/> <source>Disconnected from some accounts</source> - <translation type="unfinished"/> + <translation>Odpojené od niektorých účtov</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="286"/> @@ -3593,6 +3682,11 @@ Nie je vhodné ju používať.</translation> <translation>Nový účet…</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Zobraziť ďalšiu aktivitu...</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> @@ -3652,23 +3746,6 @@ Nie je vhodné ju používať.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Formulár</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>Štítok</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Server</translation> @@ -3710,11 +3787,6 @@ Nie je vhodné ju používať.</translation> <translation>&Lokálny priečinok</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Nechať lokálne dáta</translation> @@ -3733,11 +3805,6 @@ Nie je vhodné ju používať.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulár</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Používateľské meno</translation> @@ -3751,11 +3818,6 @@ Nie je vhodné ju používať.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Formulár</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Ak chcete pokračovať, prepnite sa prosím do svojho prehliadača.</translation> @@ -3770,21 +3832,15 @@ Nie je vhodné ju používať.</translation> <source>Re-open Browser</source> <translation>Znovu otvoriť prehliadač</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopírovať odkaz</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formulár</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Štítok</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Prevádzkujte svoj vlastný server</span></a></translation> @@ -3818,26 +3874,10 @@ Nie je vhodné ju používať.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formulár</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Štítok</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Celý váš účet bol zosynchronizovaný z lokálnym priečinkom</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Tlačidlo</translation> - </message> </context> <context> <name>QObject</name> @@ -3892,7 +3932,7 @@ Nie je vhodné ju používať.</translation> <translation>Pred istým časom</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3975,14 +4015,6 @@ Nie je vhodné ju používať.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Formulár</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index da3aa1f8c..1affca53a 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -4,78 +4,78 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="107"/> <source>%1 (%2, %3)</source> - <translation type="unfinished"/> + <translation>%1 (%2, %3)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/> <source>Checking for changes in '%1'</source> - <translation type="unfinished"/> + <translation>Preverjanje sprememb v »%1«</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/> <source>Syncing %1 of %2 (%3 left)</source> - <translation type="unfinished"/> + <translation>Poteka usklajevanje %1 od %2 (preostaja %3)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/> <source>Syncing %1 of %2</source> - <translation type="unfinished"/> + <translation>Poteka usklajevanje %1 od %2</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/> <source>Syncing %1 (%2 left)</source> - <translation type="unfinished"/> + <translation>Usklajevanje %1 (%2 do konca)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/> <source>Syncing %1</source> - <translation type="unfinished"/> + <translation>Usklajevanje %1</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation type="unfinished"/> + <translation>Ni nedavno spremenjenih datotek</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> <source>Sync paused</source> - <translation type="unfinished"/> + <translation>Usklajevanje v premoru</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="184"/> <source>Syncing</source> - <translation type="unfinished"/> + <translation>Usklajevanje</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>Odpri spletišče</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>Nedavno spremenjeno</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>Ustavi usklajevanje</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>Pomoč</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>Nastavitve</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>Odjava</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> @@ -86,14 +86,9 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> - <translation type="unfinished"/> + <translation>Oznaka</translation> </message> </context> <context> @@ -107,7 +102,7 @@ <location filename="../src/common/filesystembase.cpp" line="459"/> <location filename="../src/common/filesystembase.cpp" line="465"/> <source>Could not move '%1' to '%2'</source> - <translation type="unfinished"/> + <translation>Premik '%1' v '%2' ni uspel</translation> </message> <message> <location filename="../src/common/filesystembase.cpp" line="502"/> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation>Obrazec</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Preklopite na brskalnik za nadaljevanje.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Med vzpostavljanjem povezave je prišlo do napake. Poskusite znova.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Ponovno odpri brskalnik</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiraj povezavo</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> <translation>Obrazec</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Preklopite na brskalnik za nadaljevanje.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Med vzpostavljanjem povezave je prišlo do napake. Poskusite znova.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Ponovno odpri brskalnik</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Kopiraj povezavo</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Izberite krajevno mapo za usklajevanje.</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Izbor oddaljene ciljne mape</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Prostor: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Neizbrane mape bodo <b>odstranjene</b> iz krajevnega datotečnega sistema in s tem računalnikom ne bodo več usklajevane!</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Uskladi vse</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Ne uskladi ničesar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Uveljavi ročno narejene spremembe</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Uveljavi</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Prekliči</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Vzpostavljena je povezava s strežnikom <server> kot <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Ni nastavljenega računa.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Dodaj nov račun</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Odstrani račun</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Račun</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Omogoči šifriranje</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> - <translation type="unfinished"/> + <translation>Šifriraj</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Uredi neusklajevane datoteke</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Izbor predmetov za usklajevanje</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Vsili takojšnje usklajevanje</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Ponovno zaženi usklajevanje</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Odstrani povezavo za usklajevanje mape</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Ustvarjanje mape je spodletelo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Ni mogoče ustvariti krajevne mape <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Potrdi odstranjevanje povezave usklajevanja mape</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Odstrani povezavo za usklajevanje mape</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Usklajevanje je v teku</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 v uporabi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 kot <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Različica strežnika %1 je zastarela in ni več podprta! Nadaljujete na lastno odgovornost.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Vzpostavljena je povezava z %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Strežnik %1 trenutno ni dosegljiv.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Strežnik %1 je trenutno v načinu vzdrževanja.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Uspešno odjavljeno iz %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Poteka pridobitev overitve prek brskalnika. <a href='%1'>Kliknite</a> to za ponovno odpiranje brskalnika.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Poteka vzpostavljanje povezave s strežnikom %1 ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>S strežnikom %1 ni vzpostavljene povezave (%2).</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Prijava</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Zaznane so mape, ki zaradi omejitve velikosti niso bile usklajene: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Zaznane so mape, ki zaradi pripadnosti zunanji shrambi niso bile usklajene: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Zaznane so mape, ki zaradi omejitve velikosti ali pripadnosti zunanji shrambi niso bile usklajene: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Potrdi odstranjevanje računa</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Ali res želite odstraniti povezavo z računom <i>%1</i>?</p><p><b>Opomba:</b> odstranitev ovezave <b>ne izbriše</b> nobene datoteke.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Odstrani povezavo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Odpri mapo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Odjavi račun</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Nadaljuj z usklajevanjem</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Premor usklajevanja</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Ali res želite zaustaviti usklajevanje mape <i>%1</i>?</p><p><b>Opomba:</b> s tem datoteke iz odjemalca <b>ne bodo</b> odstranjene.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) od %2 v uporabi. Nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 od %2 v uporabi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Ni nastavljene povezave %1.</translation> </message> @@ -517,17 +569,17 @@ <message> <location filename="../src/gui/activityitemdelegate.cpp" line="131"/> <source>%1</source> - <translation type="unfinished"/> + <translation>%1</translation> </message> <message> <location filename="../src/gui/activityitemdelegate.cpp" line="179"/> <source>More information</source> - <translation type="unfinished"/> + <translation>Več podrobnosti</translation> </message> <message> <location filename="../src/gui/activityitemdelegate.cpp" line="180"/> <source>Accept</source> - <translation type="unfinished"/> + <translation>Sprejmi</translation> </message> <message> <location filename="../src/gui/activityitemdelegate.cpp" line="181"/> @@ -537,38 +589,28 @@ <message> <location filename="../src/gui/activityitemdelegate.cpp" line="198"/> <source>Open Browser</source> - <translation type="unfinished"/> + <translation>Odpri brskalnik</translation> </message> </context> <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Besedilna oznaka</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> - <translation type="unfinished"/> + <translation>Sprejmi</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> - <translation type="unfinished"/> + <translation>Usklajeno</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> - <translation type="unfinished"/> + <translation>Ponovi vsa nalaganja</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Za račun %1 možnosti opravil niso omogočene.</translation> </message> @@ -603,12 +645,12 @@ <message> <location filename="../src/gui/addcertificatedialog.cpp" line="38"/> <source>Select a certificate</source> - <translation>Izberi potrdilo</translation> + <translation>Izbor potrdila</translation> </message> <message> <location filename="../src/gui/addcertificatedialog.cpp" line="38"/> <source>Certificate files (*.p12 *.pfx)</source> - <translation>Vrste potrdil (*.p12 *.pfx)</translation> + <translation>Datoteke potrdil (*.p12 *.pfx)</translation> </message> </context> <context> @@ -621,12 +663,12 @@ <message> <location filename="../src/gui/application.cpp" line="193"/> <source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source> - <translation type="unfinished"/> + <translation>Med dostopom do nastavitvene datoteke na %1 je prišlo do napake. Preverite, da je dostopna vašemu uporabniku.</translation> </message> <message> <location filename="../src/gui/application.cpp" line="196"/> <source>Quit %1</source> - <translation type="unfinished"/> + <translation>Končaj %1</translation> </message> </context> <context> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Vzpostavi povezavo z %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Prijava v brskalniku (Prijavni Tok 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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 ni mogoče brati.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>Datoteka %1 je odstranjena.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>Datoteka %1 je prejeta.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>Datoteka %1 je posodobljena.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>Datoteka %1 je preimenovana v %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>Datoteka %1 je premaknjena v %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>Datoteka %1 in še %n druga datoteka je bila izbrisana.</numerusform><numerusform>Datoteka %1 in še %n drugi datoteki sta bili izbrisani.</numerusform><numerusform>Datoteka %1 in še %n druge datoteke so bile izbrisane.</numerusform><numerusform>Datoteka %1 in še %n drugih datotek je bilo izbrisanih.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>Datoteka %1 in še %n druga datoteka je bila shranjena na disk.</numerusform><numerusform>Datoteka %1 in še %n drugi datoteki sta bili shranjeni na disk.</numerusform><numerusform>Datoteka %1 in še %n druge datoteke so bile shranjene na disk.</numerusform><numerusform>Datoteka %1 in še %n drugih datotek je bilo shranjenih na disk.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>Datoteka %1 in še %n druga datoteka je bila posodobljena.</numerusform><numerusform>Datoteka %1 in še %n drugi datoteki sta bili posodobljeni.</numerusform><numerusform>Datoteka %1 in še %n druge datoteke so bile posodobljene.</numerusform><numerusform>Datoteka %1 in še %n drugih datotek je bilo posodobljenih.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n druga datoteka je bila preimenovana.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n drugi datoteki sta bili preimenovani.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n druge datoteke so bile preimenovane.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n drugih datotek je bilo preimenovanih.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n druga datoteka je bila premaknjena.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n drugi datoteki sta bili premaknjeni.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n druge datoteke so bile premaknjene.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n drugih datotek je bilo premaknjenih.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>Pri datoteki %1 in še %n drugi datoteki je zaznan spor usklajevanja.</numerusform><numerusform>Pri datoteki %1 in še %n drugih datotekah je zaznan spor usklajevanja.</numerusform><numerusform>Pri datoteki %1 in še %n drugih datotekah je zaznan spor usklajevanja.</numerusform><numerusform>Pri datoteki %1 in še %n drugih datotekah je zaznan spor usklajevanja.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>Pri datoteki %1 je zaznan spor usklajevanja. Preverite datoteko!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>Datoteke %1 in še %n druge datoteke ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform><numerusform>Datoteke %1 in še %n drugih datotek ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform><numerusform>Datoteke %1 in še %n drugih datotek ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform><numerusform>Datoteke %1 in še %n drugih datotek ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>Datoteke %1 zaradi napake ni mogoče uskladiti. Več podrobnosti je zabeleženih v dnevniški datoteki.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Dejavnost usklajevanja</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Ni mogoče prebrati sistemske izločitvene datoteke</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Dodana je nova mapa, ki presega %1 MB: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Dodana je mapa iz zunanje shrambe. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Med nastavitvami jo lahko izberete in označite za prejem.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> - <translation type="unfinished"/> + <translation>Ohrani krajevne datoteke</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -894,7 +989,7 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? Če je prišlo do napake in se odločite datoteke ohraniti, bodo te ponovno usklajene s strežnika.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -903,17 +998,17 @@ To se lahko zgodi, če je na strežniku na primer obnovljena varnostna kopija. Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi različicami. Ali želite ohraniti trenutne krajevne datoteke kot preimenovane datoteke v usklajevalnem sporu?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Varnostna kopija je zaznana</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Običajno usklajevanje</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Ohrani krajevne datoteke kot datoteke v sporu</translation> </message> @@ -1029,12 +1124,12 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi <translation>Dodaj povezavo za usklajevanje mape</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Datoteka</translation> </message> @@ -1064,7 +1159,7 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi <translation>Prišlo je do napake med nalaganjem datotek s strežnika.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Odjavljeno</translation> </message> @@ -1079,107 +1174,107 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi <translation>Zaznani so nerazrešeni spori. Kliknite za prikaz podrobnosti.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Usklajevanje %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>prejemanje %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>pošiljanje %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> - <translation type="unfinished"/> + <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> - <translation type="unfinished"/> + <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 od %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Preostalo še %5, %1 od %2, datoteka %3 od %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 od %2, datoteka %3 od %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>datoteka %1 od %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Čakanje na povezavo ...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>V pripravi je %n druga map ...</numerusform><numerusform>V pripravi sta %n drugi mapi ...</numerusform><numerusform>V pripravi so %n druge mape ...</numerusform><numerusform>V pripravi je %n drugih map ...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Priprava na usklajevanje ...</translation> </message> @@ -1310,14 +1405,9 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> - <translation type="unfinished"/> + <translation>Pravno obvestilo</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="66"/> @@ -1463,86 +1553,82 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi <translation>Maske neusklajevanih datotek</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Dodaj</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Ta vnos je ponujen pri '%1' in ga v tem pogledu ni mogoče spreminjati.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Maska</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Dovoli brisanje</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Odstrani</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>Datoteke in mape, ki so skladne z masko, ne bodo usklajevane. - -Predmeti v mapah, ki jih je dovoljeno izbrisati, bodo odstranjeni, če preprečujejo brisanje mape. Možnost je uporabna pri odstranjevanju metapodatkov.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Datoteke ni mogoče odpreti</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Ni mogoče zapisati sprememb v '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Dodaj masko za neusklajevanje</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Dodaj novo masko za neusklajevanje:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Ta vnos je ponujen pri '%1' in ga v tem pogledu ni mogoče spreminjati.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> + <translation>Pravno obvestilo</translation> </message> <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> - <translation type="unfinished"/> + <translation>Zapri</translation> </message> <message> <location filename="../src/gui/legalnotice.cpp" line="27"/> @@ -1669,11 +1755,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Nastavitve posredniškega strežnika</translation> @@ -1902,7 +1983,7 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/> <source>Free space: %1</source> - <translation type="unfinished"/> + <translation>Prostor: %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> @@ -1918,7 +1999,7 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> <source>There isn't enough free space in the local folder!</source> - <translation type="unfinished"/> + <translation>V krajevni mapi ni dovolj prostora!</translation> </message> </context> <context> @@ -1984,11 +2065,6 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation> <source>Login in your browser</source> <translation>Prijava v brskalniku</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2010,7 +2086,7 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/> <source>Secure collaboration & file exchange</source> - <translation type="unfinished"/> + <translation>Varno sodelovanje in izmenjava datotek</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/> @@ -2040,12 +2116,12 @@ Uporaba ni priporočljiva.</translation> <translation>&Naslednja ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> - <translation type="unfinished"/> + <translation>Neveljaven naslov URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2123,79 +2199,79 @@ Uporaba ni priporočljiva.</translation> <translation>Krajevne mape %1 ni mogoče ustvariti.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Ni navedenega oddaljenega strežnika!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Napaka: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> - <translation type="unfinished"/> + <translation>ustvarjanje mape v oblaku Nextcoud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Oddaljena mapa %1 je uspešno ustvarjena.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Oddaljena mapa %1 že obstaja. Vzpostavljena bo povezava za usklajevanje.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Ustvarjanje mape je povzročilo napako HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Ustvarjanje mape na oddaljenem naslovu je spodletelo zaradi napačnih poveril. <br/>Vrnite se in preverite zahtevana gesla.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Ustvarjanje oddaljene mape je spodletelo. Najverjetneje je vzrok v neustreznih poverilih.</font><br/>Vrnite se na predhodno stran in jih preverite.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Ustvarjanje oddaljene mape %1 je spodletelo z napako <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Povezava za usklajevanje med %1 in oddaljeno mapo %2 je vzpostavljena.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Povezava z %1 je uspešno vzpostavljena!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Povezave z %1 ni mogoče vzpostaviti. Preveriti je treba nastavitve.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Preimenovanje mape je spodletelo</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Mape ni mogoče odstraniti niti ni mogoče ustvariti varnostne kopije, ker je mapa, oziroma dokument v njej, odprt v drugem programu. Zaprite mapo oziroma dokument, ali pa prekinite namestitev.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Krajevno usklajena mapa %1 je uspešno ustvarjena!</b></font></translation> </message> @@ -2203,12 +2279,12 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>Čarovnik za povezavo %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Preskoči nastavitve map</translation> </message> @@ -2242,7 +2318,7 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> @@ -2270,32 +2346,32 @@ Uporaba ni priporočljiva.</translation> <translation>Na disku je prostora manj kot %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Datoteka je izbrisana s strežnika</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Datoteke ni mogoče prejeti v celoti.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Datoteka je bila spremenjena po usklajevanju seznama datotek</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> @@ -2308,7 +2384,7 @@ Uporaba ni priporočljiva.</translation> <translation>; obnovitev je spodletela: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Datoteka ali mapa je bila odstranjena iz mesta v souporabi, ki je nastavljeno le za branje, obnavljanje pa je spodletelo: %1</translation> </message> @@ -2440,27 +2516,27 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem odstranjena.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Napaka: nepričakovan odziv s strežnika (%1).</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Na strežniku manjka ID datoteke</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Na strežniku manjka ETag datoteke</translation> </message> @@ -2643,7 +2719,7 @@ Uporaba ni priporočljiva.</translation> <message> <location filename="../src/gui/sharedialog.ui" line="123"/> <source>Icon</source> - <translation type="unfinished"/> + <translation>Ikona</translation> </message> <message> <location filename="../src/gui/sharedialog.cpp" line="104"/> @@ -2669,22 +2745,22 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> - <translation type="unfinished"/> + <translation>Geslo:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> - <translation type="unfinished"/> + <translation>Datum preteka:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>Besedilna oznaka</translation> </message> @@ -2696,47 +2772,47 @@ Uporaba ni priporočljiva.</translation> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="149"/> <source>Allow Editing</source> - <translation type="unfinished"/> + <translation>Dovoli urejanje</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="155"/> <source>Read only</source> - <translation type="unfinished"/> + <translation>Samo branje</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Allow Upload && Editing</source> - <translation type="unfinished"/> + <translation>Dovoli pošiljanje in urejanje</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> <source>File Drop (Upload Only)</source> - <translation type="unfinished"/> + <translation>Povleci datoteke (samo nalaganje)</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="183"/> <source>Password Protect</source> - <translation type="unfinished"/> + <translation>Zaščiti z geslom</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="200"/> <source>Expiration Date</source> - <translation type="unfinished"/> + <translation>Datum preteka</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="219"/> <source>Unshare</source> - <translation type="unfinished"/> + <translation>Prekini souporabo</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="224"/> <source>Add another link</source> - <translation type="unfinished"/> + <translation>Dodaj novo povezavo</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="402"/> <source>Confirm Link Share Deletion</source> - <translation type="unfinished"/> + <translation>Potrdi brisanje povezave za deljenje</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="403"/> @@ -2757,22 +2833,22 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Souporaba z uporabniki ali skupinami ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> - <translation type="unfinished"/> + <translation>Kopiraj povezavo</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Ni zadetkov za '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation type="unfinished"/> </message> @@ -2782,7 +2858,7 @@ Uporaba ni priporočljiva.</translation> <message> <location filename="../src/gui/shareuserline.ui" line="66"/> <source>User name</source> - <translation type="unfinished"/> + <translation>Uporabniško ime</translation> </message> <message> <location filename="../src/gui/shareuserline.ui" line="82"/> @@ -2790,24 +2866,29 @@ Uporaba ni priporočljiva.</translation> <translation>lahko ureja</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> - <translation type="unfinished"/> + <translation>Lahko deli naprej</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Prekini souporabo</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> - <translation type="unfinished"/> + <translation>Lahko ustvari</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> - <translation type="unfinished"/> + <translation>Lahko spremeni</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> - <translation type="unfinished"/> + <translation>Lahko briše</translation> </message> </context> <context> @@ -2832,7 +2913,7 @@ Uporaba ni priporočljiva.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation>Pogled razhroščevalnika šifer SSL</translation> </message> <message> @@ -2852,7 +2933,7 @@ Uporaba ni priporočljiva.</translation> <location filename="../src/gui/socketapi.cpp" line="457"/> <source>Share with %1</source> <comment>parameter is Nextcloud</comment> - <translation type="unfinished"/> + <translation>Omogoči souporabo z %1</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="491"/> @@ -3018,11 +3099,6 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Vseeno zaupaj digitalnemu potrdilu</translation> @@ -3051,44 +3127,49 @@ Uporaba ni priporočljiva.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Ustanova: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Enota: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Država: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Prstni odtis (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Prstni odtis (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Prstni odtis (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>Prstni odtis (SHA-512): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Začetek veljavnosti: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Datum preteka: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Izdajatelj: %1</translation> </message> @@ -3204,7 +3285,7 @@ Uporaba ni priporočljiva.</translation> <message> <location filename="../src/libsync/syncengine.cpp" line="141"/> <source>File or directory not found:</source> - <translation type="unfinished"/> + <translation>Datoteke ali mape ni mogoče najti</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="144"/> @@ -3379,11 +3460,11 @@ Uporaba ni priporočljiva.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Različica %1. Podrobnosti so na voljo na spletišču <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3391,25 +3472,25 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> - <translation type="unfinished"/> + <translation>Zaznano neveljavno potrdilo</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3477,11 +3558,6 @@ Uporaba ni priporočljiva.</translation> <translation>Nastavitve ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Podrobnosti ...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Pomoč</translation> @@ -3545,7 +3621,7 @@ Uporaba ni priporočljiva.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="356"/> <source>Unresolved conflicts</source> - <translation type="unfinished"/> + <translation>Nerazrešeni spori</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="363"/> @@ -3593,6 +3669,11 @@ Uporaba ni priporočljiva.</translation> <translation>Nov račun ...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3601,7 +3682,7 @@ Uporaba ni priporočljiva.</translation> <message> <location filename="../src/gui/owncloudgui.cpp" line="841"/> <source>Apps</source> - <translation type="unfinished"/> + <translation>Programi</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="898"/> @@ -3652,23 +3733,6 @@ Uporaba ni priporočljiva.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>Besedilna oznaka</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Strežnik</translation> @@ -3710,11 +3774,6 @@ Uporaba ni priporočljiva.</translation> <translation>&Krajevna mapa</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Ohrani krajevno shranjene podatke</translation> @@ -3733,11 +3792,6 @@ Uporaba ni priporočljiva.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Uporabniško ime</translation> @@ -3751,11 +3805,6 @@ Uporaba ni priporočljiva.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Preklopite na brskalnik za nadaljevanje.</translation> @@ -3770,21 +3819,15 @@ Uporaba ni priporočljiva.</translation> <source>Re-open Browser</source> <translation>Ponovno odpri brskalnik</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiraj povezavo</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Besedilna oznaka</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3797,12 +3840,12 @@ Uporaba ni priporočljiva.</translation> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="165"/> <source>Log in</source> - <translation type="unfinished"/> + <translation>Prijava</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="288"/> <source>Server Address</source> - <translation type="unfinished"/> + <translation>Naslov strežnika</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="304"/> @@ -3818,26 +3861,10 @@ Uporaba ni priporočljiva.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Besedilna oznaka</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Naveden račun je v celoti usklajen s krajevno mapo</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Potisni gumb</translation> - </message> </context> <context> <name>QObject</name> @@ -3849,22 +3876,22 @@ Uporaba ni priporočljiva.</translation> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="437"/> <source>%n day ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>pred %n dnem</numerusform><numerusform>pred %n dnevoma</numerusform><numerusform>pred %n dnevi</numerusform><numerusform>pred %n dnevi</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="439"/> <source>%n days ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>pred %n dnevom</numerusform><numerusform>pred %n dnevoma</numerusform><numerusform>pred %n dnevi</numerusform><numerusform>pred %n dnevi</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="449"/> <source>%n hour ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>pred %n uro</numerusform><numerusform>pred %n urama</numerusform><numerusform>pred %n urami</numerusform><numerusform>pred %n urami</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="451"/> <source>%n hours ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>pred %n uro</numerusform><numerusform>pred %n urama</numerusform><numerusform>pred %n urami</numerusform><numerusform>pred %n urami</numerusform></translation> </message> <message> <location filename="../src/common/utility.cpp" line="458"/> @@ -3879,7 +3906,7 @@ Uporaba ni priporočljiva.</translation> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="464"/> <source>%n minute ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>pred %n minuto</numerusform><numerusform>pred %n minutama</numerusform><numerusform>pred %n minutami</numerusform><numerusform>pred %n minutami</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="466"/> @@ -3892,7 +3919,7 @@ Uporaba ni priporočljiva.</translation> <translation>Pred nekaj časa</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3975,14 +4002,6 @@ Uporaba ni priporočljiva.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 9cfaf3b79..4facf2592 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Дијалог</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Ознака</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</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 type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> <translation>Образац</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Пребаците се на веб читач да наставите.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Догодила се грешка при повезивању. Покушајте поново.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Изаберите локалну фасциклу за синхронизацију</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Образац</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Изаберите удаљену одредишну фасциклу</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Мнемоник шифровања са краја на крај</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Да бисте заштитили Ваш криптографски идентитет, шифровали смо га са лако памтљивих 12 речи из речника. Запишите их и добро их чувајте. Биће Вам потребне да додате нове уређаје на Ваш налог (као нпр. мобилни или лаптоп).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Образац</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Простор у складишту: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Синхронизуј све</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Ништа не синхронизуј</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Примени ручне измене</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Примени</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Одустани</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Повезан са <server> као <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Није подешен налог.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Додај нови</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Уклони</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Налог</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Овај налог подржава шифровање са краја на крај</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Укључи шифровање</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Прикажи E2E мнемоник</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Шифруј</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Изаберите шта синхронизовати</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Форсирај синхронизацију сада</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Поново покрени синхронизацију</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Уклони везу на синхронизацију фасцикле</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Прављење фасцикле није успело</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Не могу да направим локалну фасциклу <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Потврдите уклањање конекције на синхронизацију фасцикле</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Уклони везу на синхронизацију фасцикле</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Синхронизација у току</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <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="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 искоришћено</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 као <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <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="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Повезан са %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Сервер %1 је привремено недоступан.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Сервер %1 је тренутно у режиму одржавања.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Одјављен са %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <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="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Повезујем се на %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Нема конекције на %1 са %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Пријава</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <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="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <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="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <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="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Потврда уклањања налога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Уклони везу</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Отвори фасциклу</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Одјава</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Настави синхронизацију</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Паузирај синхронизацију</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <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="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1% од %2 искоришћено</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Тренутно нема доступних података о заузећу складишта.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Нема подешене %1 везе.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Образац</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Текст ознака</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Прихвати</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Синхронизовано</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Понови сва отпремања</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Налог %1 нема укључене активности.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Грешка приликом уписивања метаподатака у базу</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Унесите Вашу лозинку за шифровање са краја на крај:<br><br>Корисник: %2<br>Налог: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Унесите E2E лозинку</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <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="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <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="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <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="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Одговор са сервера није садржао сва очекивана поља</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Повежи се са %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 није читљив.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 је уклоњен.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 је преузет.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 је ажуриран.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 је преименован у %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 је премештен у %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 и још %n други фајл је уклоњен.</numerusform><numerusform>%1 и још %n друга фајла су уклоњени.</numerusform><numerusform>%1 и још %n других фајлова су уклоњени.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 и још %n други фајл је преузет.</numerusform><numerusform>%1 и још %n друга фајла су преузети.</numerusform><numerusform>%1 и још %n других фајлова су преузети.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 и још %n други фајл је ажуриран.</numerusform><numerusform>%1 и још %n друга фајла су ажурирани.</numerusform><numerusform>%1 и још %n других фајлова су ажурирани.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 је преименован у %2, а још %n фајл је такође преименован.</numerusform><numerusform>%1 је преименован у %2, а још %n фајла су такође преименована.</numerusform><numerusform>%1 је преименован у %2, а још %n фајлова је такође преименовано.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 је померен у %2, а још %n фајл је такође померен.</numerusform><numerusform>%1 је померен у %2, а још %n фајла су такође померена.</numerusform><numerusform>%1 је померен у %2, а још %n фајлова је такође померено.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 и још %n фајл имају конфликте.</numerusform><numerusform>%1 и још %n друга фајла имају конфликте.</numerusform><numerusform>%1 и још %n других фајлова имају конфликте.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 има конфликт приликом синхронизације. Проверите конфликтни фајл!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 и још %n фајл није синхронизован због грешке. Погледајте записник за детаље.</numerusform><numerusform>%1 и још %n фајла нису синхронизовани због грешке. Погледајте записник за детаље.</numerusform><numerusform>%1 и још %n фајлова нису синхронизовани због грешке. Погледајте записник за детаље.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 није синхронизован због грешке. Погледајте записник за детаље.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Активност синхронизације</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Не могу да прочитам системски списак за игнорисање</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <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="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Додата је фасцикла са спољног складишта. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <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="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <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="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <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="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,7 +961,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -877,22 +972,22 @@ 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="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Преузети нове фајлове?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Преузми нове фајлове</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Задржи локалне фајлове</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -901,7 +996,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Ако је ово била грешка и желите да задржите фајлове, они ће се поновно синхронизовати са сервера.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -910,17 +1005,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="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Детектован бекап</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Нормална синхронизација</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Чувај локалне фајлове као конфликтне</translation> </message> @@ -1036,12 +1131,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Додај везу синхронизације фасцикле</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Синхронизовано са локалном фасциклом</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Фајл</translation> </message> @@ -1071,7 +1166,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Грешка у учитавању листе фолдера са сервера.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Одјављен</translation> </message> @@ -1086,107 +1181,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Постоје неразрешени конфликти. Кликните за детаље.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Сакупљам измене</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>„%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Синхронизујем %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>преузми %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>отпреми %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Проверавам измене удаљено у „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Проверавам измене локално у „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 од %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Преостало %5, %1 од %2, фајл %3 од %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 од %2, фајл %3 од %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>фајл %1 од %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Чекам...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Чекам на преосталу %n фасциклу...</numerusform><numerusform>Чекам на преостале %n фасцикле...</numerusform><numerusform>Чекам на преосталих %n фасцикли...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Припремам синхронизацију...</translation> </message> @@ -1317,11 +1412,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Образац</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Правно обавештење</translation> @@ -1472,83 +1562,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Фајлови игнорисани шаблонима</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Додај</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Овај унос је системски из „%1“ и не може се овде изменити.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Обриши све</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>шаблон</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>брисање</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Уклони</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>Фајлови или фасцикле које одговарају шаблону неће бити синхронизоване. - -Ставке над којима је дозвољено брисања ће бити избрисане уколико ометају да се директоријум избрише. Ово је корисно за мета податке.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Не могу да отворим фајл</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Не могу да упишем измене у „%1“</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Додавање шаблона за игнорисање</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Додајте нови шаблон за игнорисање:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Овај унос је системски из „%1“ и не може се овде изменити.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Дијалог</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Правно обавештење</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>Текст ознака</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Затвори</translation> @@ -1680,11 +1766,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Образац</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Поставке проксија</translation> @@ -1995,11 +2076,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>Пријавите се из веб читача</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Копирај везу у оставу</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2051,12 +2127,12 @@ It is not advisable to use it.</source> <translation>&Следеће ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Неисправна адреса</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Не могу да учитам сертификат. Можда је лозинка погрешна?</translation> </message> @@ -2134,79 +2210,79 @@ It is not advisable to use it.</source> <translation>Не могу да направим локалну фасциклу %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Није наведена удаљена фасцикла!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Грешка: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>правим фасциклу на Некстклауду: % 1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Удаљена фасцикла %1 је успешно направљена.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Удаљена фасцикла %1 већ постоји. Повезујем се ради синхронизовања.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Прављење фасцикле довело је до ХТТП грешке са кодом %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <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="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <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="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <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="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Успешно повезан са %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Не може се успоставити веза са %1. Проверите поново.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Преименовање није успело</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локална фасцикла за синхронизовање %1 је успешно направљена!</b></font></translation> </message> @@ -2214,12 +2290,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 чаробњак повезивања</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Прескочи подешавање фасцикли</translation> </message> @@ -2253,7 +2329,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Грешка приликом упису мета података у базу података</translation> </message> @@ -2281,32 +2357,32 @@ It is not advisable to use it.</source> <translation>Слободан простор на диску је мањи од %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Фајл је обрисан са сервера</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Фајл није могао бити преузет у потпуности.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <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="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <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="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Фајл је измењен у међувремену</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Грешка приликом упису мета података у базу података</translation> </message> @@ -2319,7 +2395,7 @@ It is not advisable to use it.</source> <translation>; Враћање није успело: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Фајл или фасцикла је уклоњена из дељења које је само за читање, али повраћај није успео: %1</translation> </message> @@ -2451,27 +2527,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Локални фајл је уклоњен током синхронизације.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Локални фајл измењен током синхронизације.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Неочекивани повратни код са сервера (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>ID фајла недостаје са сервера</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag фајла недостаје са сервера</translation> </message> @@ -2680,22 +2756,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Подели везу</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Лозинка:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Датум истека:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>Текст ознака</translation> </message> @@ -2768,22 +2844,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <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="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Копирај везу</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Нема резултата за '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Поделио сам нешто са Вама</translation> </message> @@ -2801,22 +2877,27 @@ It is not advisable to use it.</source> <translation>може да мења</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Може да дели даље</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Укини дељење</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Може да креира унутар дељења</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Може да мења садржај унутар дељења</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Може да брише садржај унутар дељења</translation> </message> @@ -2843,7 +2924,7 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation>SSL Chipher поглед за отклањање грешака</translation> </message> <message> @@ -3029,11 +3110,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Образац</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Ипак веруј сертификату</translation> @@ -3062,44 +3138,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Организација: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Јединица: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Држава: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Отисак (МД5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Отисак (СХА1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Важи од: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Истиче : %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Издавач: %1</translation> </message> @@ -3390,11 +3471,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Верзија %1. За више информација посетите <a href='%2'>%3</a>.</p></translation> + <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="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Ово издање је обезбедио %1</p></translation> </message> @@ -3402,25 +3483,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Детектован неисправан сертификат</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>Сервер „%1“ је понудио неисправан сертификат. Наставити?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <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="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Пријавите се са корисником: %1</translation> </message> @@ -3488,11 +3569,6 @@ It is not advisable to use it.</source> <translation>Поставке...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Детаљи...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Помоћ</translation> @@ -3604,6 +3680,11 @@ It is not advisable to use it.</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="794"/> <source>Crash now</source> <comment>Only shows in debug mode to allow testing the crash handler</comment> @@ -3663,23 +3744,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Образац</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>Текст ознака</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Сервер</translation> @@ -3721,11 +3785,6 @@ It is not advisable to use it.</source> <translation>&Локална фасцикла</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>Избор локалне фасцикле</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Остави локалне податке</translation> @@ -3744,11 +3803,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Образац</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Корисничко име</translation> @@ -3762,11 +3816,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Образац</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Пребаците се на веб читач да наставите.</translation> @@ -3781,21 +3830,15 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation>Отворите веб читач поново</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Образац</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Текст ознака</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Хостујте Ваш сопствени сервер</span></a></translation> @@ -3829,26 +3872,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Образац</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Текст ознака</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Целокупан налог је синхронизован са локалном фасциклом</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>Тастер</translation> - </message> </context> <context> <name>QObject</name> @@ -3903,7 +3930,7 @@ It is not advisable to use it.</source> <translation>пре неког времена</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3986,14 +4013,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Образац</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 1cb122369..e4dac5357 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etikett</translation> @@ -116,12 +111,63 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Växla till din webbläsare för att fortsätta.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Ett fel inträffade vid anslutning. Försök igen.</translation> + </message> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Öppna webbläsaren igen</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiera länk</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Formulär</translation> + <translation>Form</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Växla till din webbläsare för att fortsätta.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Ett fel inträffade vid anslutning. Försök igen.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Öppna webbläsaren igen</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Kopiera länk</translation> </message> +</context> +<context> + <name>FolderWizardSourcePage</name> <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Formulär</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Välj en fjärr målmapp</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>End to end krypteringsord</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>För att skydda din krypteringsidentitet, krypterar vi den med en mnemoteknisk av 12 ord. Notera dessa ord och håll dem säkra. De kommer behövas för att lägga till andra enheter till ditt konto (t.ex. mobiltelefon eller laptop).</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Lagringsutrymme: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>De mappar som inte väljs kommer att <b>raderas</b> från det lokala filsystemet och kommer inte att synkroniseras till den här datorn längre.</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Synkronisera alla</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Synkronisera inga</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Spara manuella ändringar</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Tillämpa</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Ansluten till <server> som <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Inget konto är konfigurerat.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Lägg till ny</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Radera</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Detta konto stödjer ändpunkt-till-ändpunkt-kryptering</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Aktivera kryptering</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Visa E2E krypteringsord</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Kryptera</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Redigera ignorerade filer</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Välj vad som ska synkas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Tvinga synkning</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Starta om synkning</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Ta bort anslutning till mappsynkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Kunde inte skapa mappen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Kunde inte skapa lokal mapp <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bekräfta radering av anslutning till mappsynkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Ta bort anslutning till mappsynkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Synkronisering pågår</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>En synkronisering pågår.<br/>Vill du avbryta den?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 används</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 som <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>Serverversion %1 är gammal och stöds inte längre! Fortsätt på egen risk.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Ansluten till %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Servern %1 är för tillfället inte tillgänglig.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Servern %1 är för närvarande i underhållsläge.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>Utloggad från %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Anskaffar autentisering från webbläsaren. <a href='%1'>Klicka här </a> för att öppna webbläsaren igen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>Ansluter till %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>Ingen anslutning till %1 vid %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Logga in</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Dessa mappar har inte synkroniserats för att de är för stora:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Det finns mappar som inte synkroniserats för att de är externa lagringsytor:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Det finns mappar som inte blivit synkroniserade på grund av att de är för stora eller är externa lagringsytor: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Bekräfta radering an kontot</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Vill du verkligen avsluta anslutningen till kontot <i>%1</i>?</p><p><b>Observera:</b> Detta kommer <b>inte</b> radera några filer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Radera anslutning</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Öppna mapp</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Logga ut</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Återuppta synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Pausa synkronisering</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Vill du verkligen avbryta synkronisering av mappen <i>%1</i>?</p><p><b>Observera:</b> Detta kommer <b>inte</b> radera några filer.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) av %2 används. Vissa mappar, inklusive nätverks- eller delade mappar, kan ha andra begränsningar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 av %2 används</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Just nu finns ingen utrymmes information tillgänglig</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Ingen %1 anslutning konfigurerad.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Textetikett</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Acceptera</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Synkroniserad</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Försök ladda upp igen</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Kontot %1 har inte aktiviteter aktiverade</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Fel vid skrivning av metadata till databasen</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Ange dina end to end krypteringsord:<br><br>Användare: %2<br>Konto: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Ange E2E krypteringsord</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Fel returnerat från server: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>Fel uppstod vid åtkomst till 'token' endpoint: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Kunde inte analysera JSON som returnerades från servern: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Svaret från servern innehöll inte alla förväntade fält</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>Anslut till %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Logga in i din webbläsare (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>Det går inte att öppna webbläsaren, kopiera länken till din webbläsare.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>Det går inte att öppna webbläsaren, kopiera länken till din webbläsare.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 är inte läsbar.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 har tagits bort.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 har laddats ned.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 har uppdaterats.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 har döpts om till %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 har flyttats till %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 och %n andra filer har tagits bort.</numerusform><numerusform>%1 och %n andra filer har tagits bort.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 och %n andra filer har laddats ner.</numerusform><numerusform>%1 och %n andra filer har laddats ned.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 och %n andra filer har uppdaterats.</numerusform><numerusform>%1 och %n andra filer har uppdaterats.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 har döpts om till %2 och %n andra filer har döpts om.</numerusform><numerusform>%1 har döpts om till %2 och %n andra filer har döpts om.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 har flyttats till %2 och %n andra filer har flyttats.</numerusform><numerusform>%1 har flyttats till %2 och %n andra filer har flyttats.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 och %n andra filer har synk-konflikter.</numerusform><numerusform>%1 och %n andra filer har synk-konflikter.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 har en synk-konflikt. Vänligen kontrollera konfliktfilen!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 och %n andra filer kunde inte synkas på grund av fel. Se loggen för detaljer.</numerusform><numerusform>%1 och %n andra filer kunde inte synkas på grund av fel. Se loggen för detaljer.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 kunde inte synkroniseras på grund av ett fel. Kolla loggen för ytterligare detaljer.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Synk aktivitet</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Kunde inte läsa systemets exkluderings-fil</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>En ny mapp större än %1 MB har lagts till: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>En mapp från en extern lagringsyta har lagts till. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Vänligen gå till inställningar och välj den om du önskar att ladda ned den.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Mappen %1 skapades men var tidigare exkluderad från synkronisering. Data i denna mapp kommer inte att synkroniseras.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Filen %1 skapades men var tidigare exkluderad från synkronisering. Den kommer inte att synkroniseras.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,7 +961,7 @@ Det betyder att synkroniseringsklienten inte kan ladda upp lokala ändringar ome %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -877,22 +972,22 @@ Om du vill behålla dessa filer kommer de att synkroniseras till servern på nyt Om du raderar filerna kommer de att vara otillgängliga för dig, om du inte är ägaren.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Ladda ned nya filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Ladda ned nya filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Behåll lokala filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -901,7 +996,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Om detta var ett misstag och du vill behålla dina filer, kommer de att synkroniseras på nytt från servern.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -910,17 +1005,17 @@ Detta kan vara för att en säkerhetskopia har återställts på servern. Om du fortsätter synkningen kommer alla dina filer återställas med en äldre version av filen. Vill du behålla dina nyare lokala filer som konfliktfiler?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Backup upptäckt</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Normal synkronisation</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Behåll lokala filer som konflikt</translation> </message> @@ -1036,12 +1131,12 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre <translation>Lägg till mapp att synka.</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Synkroniserad med lokal mapp</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>Synkroniserad med lokal mapp (%1)</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Fil</translation> </message> @@ -1071,7 +1166,7 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre <translation>Ett fel uppstod när mapplistan försökte laddas från servern.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Utloggad</translation> </message> @@ -1086,107 +1181,107 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre <translation>Det finns olösta konflikter. Klicka för detaljer.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>slå ihop förärändringar</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synkroniserar %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ladda ned %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ladda upp %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Söker efter ändringar i fjärrmappen '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Söker efter ändringar i lokal mapp '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 av %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 kvar, %1 av %2, fil %3 av %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 av %2, fil %3 av %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>fil %1 av %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Väntar...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Väntat på %n annan mapp...</numerusform><numerusform>Väntat på %n andra mappar...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Förbereder för att synkronisera...</translation> </message> @@ -1317,11 +1412,6 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Rättsligt meddelande</translation> @@ -1472,83 +1562,81 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre <translation>Filer ignorerade av mönster</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Lägg till</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Denna post hanteras av systemet på '%1' och kan inte ändras här.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Ta bort alla</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Mönster</translation> + <translation>Filter</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation>Tillåt radering</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>Lägg till</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Radera</translation> + <translation>Ta bort</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation>Ta bort alla</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>Filer eller mappar som matchar ett möster kommer inte synkroniseras. + <translation>Filer eller mappar som matchar ett mönster kommer inte att synkroniseras. -Objekt som tillåter radering kommer tas bort om de förhindrar en mapp att tas bort. Det är användbart för meta-data.</translation> +Objekt där radering är tillåtet raderas om de förhindrar att en mapp tas bort. Detta är användbart för metadata.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation>Kunde inte öppna fil</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> <translation>Kan inte skriva förändringar till '%1'.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation>Lägg till synk-filter</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> <translation>Lägg till ett nytt synk-filter:</translation> </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Denna post hanteras av systemet på '%1' och kan inte ändras här.</translation> - </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Rättsligt meddelande</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>Textetikett</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Stäng</translation> @@ -1680,11 +1768,6 @@ Loggar kommer att skrivas till %1</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Proxyinställningar</translation> @@ -1995,11 +2078,6 @@ ytterligare rättigheter under processen.</translation> <source>Login in your browser</source> <translation>Logga in i din webbläsare</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Kopiera länk till urklipp</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2051,12 +2129,12 @@ Det är inte lämpligt använda den.</translation> <translation>&Nästa ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Ogiltig URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Kunde inte ladda certifikatet. Felaktigt lösenord?</translation> </message> @@ -2134,79 +2212,79 @@ Det är inte lämpligt använda den.</translation> <translation>Kunde inte skapa lokal mapp %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Ingen fjärrmapp specificerad! </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Fel: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>skapar mapp på Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Fjärrmapp %1 har skapats.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Fjärrmappen %1 finns redan. Ansluter den för synkronisering.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Skapande av mapp resulterade i HTTP felkod %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Det gick inte att skapa mappen efter som du inte har tillräckliga rättigheter!<br/>Vänligen återvänd och kontrollera dina rättigheter.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Misslyckades skapa fjärrmappen, troligen p.g.a felaktiga inloggningsuppgifter.</font><br/>Kontrollera dina inloggningsuppgifter.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Misslyckades skapa fjärrmapp %1 med fel <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>En synkroniseringsanslutning från %1 till fjärrmappen %2 har skapats.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Ansluten till %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Anslutningen till %1 kunde inte etableras. Var god kontrollera och försök igen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Omdöpning av mapp misslyckades</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Kan inte ta bort och göra en säkerhetskopia av mappen på grund av att mappen eller en fil i den används av ett annat program. Vänligen stäng mappen eller filen och försök igen eller avbryt installationen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokal synkmapp %1 skapad!</b></font></translation> </message> @@ -2214,12 +2292,12 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Anslutningsguiden</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Hoppa över konfiguration av mappar</translation> </message> @@ -2253,7 +2331,7 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Fel vid skrivning av metadata till databasen</translation> </message> @@ -2281,32 +2359,32 @@ Det är inte lämpligt använda den.</translation> <translation>Ledigt utrymme är under %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Filen har tagits bort från servern</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Filen kunde inte laddas ned fullständigt.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>Den nedladdade filen är tom men servern sa att den skulle vara %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Filen har ändrats sedan upptäckten</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Fel vid skrivning av metadata till databasen</translation> </message> @@ -2319,7 +2397,7 @@ Det är inte lämpligt använda den.</translation> <translation>; Återställning misslyckades: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>En fil eller mapp togs bort från en skrivskyddad delning, men återställning misslyckades: %1</translation> </message> @@ -2451,27 +2529,27 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Den lokala filen togs bort under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Lokal fil ändrades under synk.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Oväntad svarskod från servern (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Saknar Fil-ID från servern</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Saknar ETag från servern</translation> </message> @@ -2680,22 +2758,22 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Dela länk</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Lösenord:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Utgångsdatum:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>Textetikett</translation> </message> @@ -2768,22 +2846,22 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Dela med användare eller grupper ...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Kopiera länk</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>Inga resultat för '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Jag delade något med dig</translation> </message> @@ -2801,22 +2879,27 @@ Det är inte lämpligt använda den.</translation> <translation>kan redigera</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Kan dela vidare</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Sluta dela</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Kan skapa</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Kan ändra</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Kan radera</translation> </message> @@ -2843,8 +2926,8 @@ Det är inte lämpligt använda den.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>Debugvy SSL-kryptering</translation> + <source>SSL Cipher Debug View</source> + <translation>SSL-kryptering Debugvy</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3029,11 +3112,6 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Lita på detta certifikat i alla fall</translation> @@ -3062,44 +3140,49 @@ Det är inte lämpligt använda den.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Organisation: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Enhet: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Land: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Fingeravtryck (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Fingeravtryck (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Fingeravtryck (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>Fingeravtryck (SHA-512): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Giltigt datum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Utgångsdatum: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Utfärdare: %1</translation> </message> @@ -3390,11 +3473,11 @@ Det är inte lämpligt använda den.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Version %1. För mer information vänligen besök <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Version %1. För mer information klicka <a href='%2'>här</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Denna release levererades av %1</p></translation> </message> @@ -3402,25 +3485,25 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Ogiltigt certifikat upptäckt</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>Servern "%1" tillhandahöll ett ogiltigt certifikat. Fortsätt?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>Du har loggats ut från %1 som användare %2. Logga in igen</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Logga in som: %1</translation> </message> @@ -3488,11 +3571,6 @@ Det är inte lämpligt använda den.</translation> <translation>Inställningar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Detaljer...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Hjälp</translation> @@ -3604,6 +3682,11 @@ Det är inte lämpligt använda den.</translation> <translation>Nytt konto...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Visa mer aktivitet...</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> @@ -3663,23 +3746,6 @@ Det är inte lämpligt använda den.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>Textetikett</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Server</translation> @@ -3721,11 +3787,6 @@ Det är inte lämpligt använda den.</translation> <translation>&Lokal mapp</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbVäljLokalMapp</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Behåll lokal data</translation> @@ -3744,11 +3805,6 @@ Det är inte lämpligt använda den.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Användarnamn</translation> @@ -3762,11 +3818,6 @@ Det är inte lämpligt använda den.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Vänligen växla till webbläsaren för att fortsätta.</translation> @@ -3781,21 +3832,15 @@ Det är inte lämpligt använda den.</translation> <source>Re-open Browser</source> <translation>Återöppna webbläsaren</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Kopiera länk</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Formulär</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Textetikett</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Använd din egen server</span></a></translation> @@ -3829,26 +3874,10 @@ Det är inte lämpligt använda den.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Formulär</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Textetikett</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Hela ditt konto är synkroniserat mot den lokala mappen</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>PushButton</translation> - </message> </context> <context> <name>QObject</name> @@ -3903,7 +3932,7 @@ Det är inte lämpligt använda den.</translation> <translation>En stund sedan</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3986,14 +4015,6 @@ Det är inte lämpligt använda den.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Formulär</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_th.ts b/translations/client_th.ts index 6a63f09a1..5b5e683b7 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -4,96 +4,91 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="107"/> <source>%1 (%2, %3)</source> - <translation type="unfinished"/> + <translation>%1 (%2, %3)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/> <source>Checking for changes in '%1'</source> - <translation type="unfinished"/> + <translation>กำลังตรวจสอบการเปลี่ยนแปลงใน '%1'</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/> <source>Syncing %1 of %2 (%3 left)</source> - <translation type="unfinished"/> + <translation>กำลังประสานข้อมูล %1 จาก %2 (เหลือ %3)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/> <source>Syncing %1 of %2</source> - <translation type="unfinished"/> + <translation>กำลังประสานข้อมูล %1 จากทั้งหมด %2</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/> <source>Syncing %1 (%2 left)</source> - <translation type="unfinished"/> + <translation>กำลังประสานข้อมูล %1 (เหลือ %2)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/> <source>Syncing %1</source> - <translation type="unfinished"/> + <translation>กำลังประสานข้อมูล %1</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation type="unfinished"/> + <translation>ไม่มีไฟล์ที่ถูกเปลี่ยนแปลงล่าสุด</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> <source>Sync paused</source> - <translation type="unfinished"/> + <translation>การประสานข้อมูลถูกหยุดชั่วคราว</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="184"/> <source>Syncing</source> - <translation type="unfinished"/> + <translation>กำลังประสานข้อมูล</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>เปิดเว็บไซต์</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>การเปลี่ยนแปลงล่าสุด</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>หยุดการประสานข้อมูลชั่วคราว</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>ช่วยเหลือ</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>ตั้งค่า</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>ออกจากระบบ</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> <source>Quit sync client</source> - <translation type="unfinished"/> + <translation>ปิดการประสานข้อมูลไคลเอนต์</translation> </message> </context> <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> - <translation type="unfinished"/> + <translation>ป้ายกำกับ</translation> </message> </context> <context> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>แบบฟอร์ม</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>เลือกโฟลเดอร์ต้นทางในเครื่องคอมพิวเตอร์ของคุณเพื่อประสานข้อมูล</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>เลือกรีโมทโฟลเดอร์ปลายทาง</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>พื้นที่จัดเก็บข้อมูล: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>ประสานข้อมูลทั้งหมด</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>ไม่ต้องประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>ใช้การเปลี่ยนแปลงด้วยตนเอง</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>นำไปใช้</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>ยกเลิก</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>เชื่อมต่อกับ <server> ด้วยผู้ใช้ <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>ไม่มีการกำหนดค่าบัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>เพิ่มใหม่</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>ลบออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>บัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>เปิดใช้งานการเข้ารหัส</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> + <translation>เข้ารหัส</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>เลือกข้อมูลที่ต้องการประสาน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>บังคับประสานข้อมูลเดี๋ยวนี้</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>ประสานข้อมูลอีกครั้ง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>ลบโฟลเดอร์ที่ประสานข้อมูลออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>สร้างโฟลเดอร์ล้มเหลว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>ไม่สามารถสร้างโฟลเดอร์ต้นทาง <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>ยืนยันการลบโฟลเดอร์ที่ประสานข้อมูลออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>ลบโฟลเดอร์ที่ประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>กำลังประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <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="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 กำลังถูกใช้งาน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 เช่น <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <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="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>เชื่อมต่อกับ %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>เซิร์ฟเวอร์ %1 ไม่สามารถใช้ได้ชั่วคราว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>เซิร์ฟเวอร์ %1 กำลังอยู่ในโหมดการบำรุงรักษา</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>ลงชื่อออกจาก %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <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="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>กำลังเชื่อมต่อไปยัง %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>ไม่มีการเชื่อมต่อไปยัง %1 ที่ %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>เข้าสู่ระบบ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <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="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <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="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <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="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>ยืนยันการลบบัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>ลบการเชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>เปิดโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>ประสานข้อมูลอีกครั้ง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>หยุดประสานข้อมูลชั่วคราว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <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="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>มีการใช้งาน %1 จาก %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>ขณะนี้ไม่มีพื้นที่จัดเก็บข้อมูลที่ใช้งานได้</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>ไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>ป้ายข้อความ</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br />บัญชี %1 ไม่มีกิจกรรมที่เปิดใช้งาน</translation> </message> @@ -626,7 +668,7 @@ <message> <location filename="../src/gui/application.cpp" line="196"/> <source>Quit %1</source> - <translation type="unfinished"/> + <translation>ออก %1</translation> </message> </context> <context> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ได้ถูกลบออก</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 ได้ถูกดาวน์โหลด</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ได้ถูกอัพเดทเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ได้ถูกเปลี่ยนชื่อเป็น %2</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 ได้ถูกย้ายไปยัง %2</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 และ %n ไฟล์อื่นๆได้ถูกลบออก</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 และ %n ไฟล์อื่นๆ ได้ถูกดาวน์โหลดเรียบร้อยแล้ว</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 และ %n ไฟล์อื่นๆ ได้รับการอัพเดท</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 และไฟล์อื่นๆอีก %n ไฟล์ได้ถูกเปลี่ยนชื่อเป็น %2</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 และไฟล์อื่นๆอีก %n ไฟล์ได้ถูกย้ายไปยัง %2</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 และ %n ไฟล์อื่นๆ เกิดปัญหาขณะประสานข้อมูล</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 มีปัญหาขณะประสานข้อมูล กรุณาตรวจสอบไฟล์ที่มีปัญหานั้น</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 และไฟล์อื่นๆอีก %n ไฟล์ไม่สามารถประสานข้อมูลเนื่องจากเกิดข้อผิดพลาด กรุณาดูไฟล์ log สำหรับรายละเอียดเพิ่มเติม</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 ไม่สามารถประสานข้อมูลเนื่องจากมีข้อผิดพลาด สามารถดูไฟล์ log สำหรับรายละเอียดเพิ่มเติม</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>ความเคลื่อนไหวของการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>โฟลเดอร์ใหม่มีขนาดใหญ่กว่า %1 เมกะไบต์ ได้ถูกเพิ่ม: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>โฟลเดอร์ที่มีพื้นที่จัดเก็บข้อมูลภายนอกได้ถูกเพิ่ม </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <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="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -862,7 +957,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -870,22 +965,22 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -895,7 +990,7 @@ If this was an accident and you decide to keep your files, they will be re-synce ถ้าเรื่องนี้เป็นอุบัติเหตุและคุณตัดสินใจที่จะเก็บไฟล์ของคุณ ไฟล์ของคุณก็จะถูกประสานข้อมูลใหม่อีกครั้ง</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -904,17 +999,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="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>ตรวจพบการสำรองข้อมูล</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>ประสานข้อมูลปกติ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>เก็บไฟล์ต้นทางเป็นไฟล์ที่มีปัญหา</translation> </message> @@ -1030,12 +1125,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>เพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>ไฟล์</translation> </message> @@ -1065,7 +1160,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>ข้อผิดพลาดในขณะที่โหลดรายชื่อโฟลเดอร์จากเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>ออกจากระบบ</translation> </message> @@ -1080,107 +1175,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>มีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข คลิกเพื่อดูรายละเอียด</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>คืนค่าการเปลี่ยนแปลง</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>กำลังประสานข้อมูล %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>หรือ</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ดาวน์โหลด %1/วินาที</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>อัพโหลด</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 ของ %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>เหลืออีก %5 ไฟล์, %1 ไฟล์จาก %2, %3 ไฟล์จาก %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 จาก %2, %3 จาก %4 ไฟล์</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>ไฟล์ %1 จาก %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>กรุณารอซักครู่...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>กำลังรออีก (%n) โฟลเดอร์...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>กำลังเตรียมพร้อมในการประสานข้อมูล</translation> </message> @@ -1311,11 +1406,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1464,83 +1554,79 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>ข้ามไฟล์โดยรูปแบบ</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>เพิ่ม</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>รายการนี้ถูกระบุโดยระบบที่ '%1' และไม่สามารถแก้ไขได้ในมุมมองนี้</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>รูปแบบ</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>อนุญาตให้ลบ</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>ลบออก</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>ไฟล์หรือโฟลเดอร์ที่เหมือนกันจะไม่ถูกประสานข้อมูล - -รายการที่ลบจะถูกอนุญาตให้ลบถ้าพวกเขาป้องกันไม่ให้ไดเรกทอรีถูกลบออก นี้จะเป็นประโยชน์สำหรับข้อมูล meta</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>ไม่สามารถเปิดไฟล์</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>ไม่สามารถเขียนเปลี่ยนเป็น '%1'</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>เพิ่มการละเว้นรูปแบบ</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>เพิ่มการละเว้นรูปแบบใหม่:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>รายการนี้ถูกระบุโดยระบบที่ '%1' และไม่สามารถแก้ไขได้ในมุมมองนี้</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation type="unfinished"/> @@ -1670,11 +1756,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>ตั้งค่าพร็อกซี่</translation> @@ -1984,11 +2065,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>เข้าสู่ระบบในเบราเซอร์ของคุณ</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2040,12 +2116,12 @@ It is not advisable to use it.</source> <translation>และถัดไป ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2123,79 +2199,79 @@ It is not advisable to use it.</source> <translation>ไม่สามารถสร้างผสานข้อมูลโฟลเดอร์ต้นทาง %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>ไม่มีโฟลเดอร์รีโมทที่ระบุ!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>ข้อผิดพลาด: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>โฟลเดอร์รีโมท %1 ถูกสร้างเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>โฟลเดอร์รีโมทมี %1 อยู่แล้ว กำลังเชื่อมต่อเพื่อถ่ายโอนข้อมูล</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>การสร้างโฟลเดอร์ดังกล่าวส่งผลให้เกิดรหัสข้อผิดพลาด HTTP error code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>สร้างโฟลเดอร์ระยะไกลล้มเหลวเนื่องจากมีข้อมูลผิดพลาด!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <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="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <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="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>เชื่อมต่อไปที่ %1! สำเร็จ</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>การเชื่อมต่อกับ %1 ไม่สามารถดำเนินการได้ กรุณาตรวจสอบอีกครั้ง</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>เปลี่ยนชื่อโฟลเดอร์ล้มเหลว</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>ประสานข้อมูลโฟลเดอร์ต้นทาง %1 ได้ถูกสร้างขึ้นเรียบร้อยแล้ว!</b></font></translation> </message> @@ -2203,12 +2279,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 ตัวช่วยสร้างการเชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>ข้ามการกำหนดค่าโฟลเดอร์</translation> </message> @@ -2242,7 +2318,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation> </message> @@ -2270,32 +2346,32 @@ It is not advisable to use it.</source> <translation>พื้นที่ว่างในดิสก์น้อยกว่า %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>ไฟล์ถูกลบออกจากเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>ดาวน์โหลดไฟล์ไม่สำเร็จ</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <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="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation> </message> @@ -2308,7 +2384,7 @@ It is not advisable to use it.</source> <translation>; ฟื้นฟูล้มเหลว: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>ไฟล์หรือโฟลเดอร์ที่ถูกลบออกจากส่วนการอ่านเพียงอย่างเดียว แต่ล้มเหลวในการฟื้นฟู: %1</translation> </message> @@ -2440,27 +2516,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>ไฟล์ต้นทางถูกลบออกในระหว่างการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>มีรหัสข้อผิดพลาดตอบกลับมาจากเซิร์ฟเวอร์ (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>ไฟล์ไอดีได้หายไปจากเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>ETag ได้หายไปจากเซิร์ฟเวอร์</translation> </message> @@ -2669,22 +2745,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>ป้ายข้อความ</translation> </message> @@ -2757,22 +2833,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <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="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>ไม่มีผลลัพธ์สำหรับ '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>ฉันแชร์บางอย่างกับคุณ</translation> </message> @@ -2790,22 +2866,27 @@ It is not advisable to use it.</source> <translation>สามารถแก้ไข</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2832,8 +2913,8 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>ดู SSL Chipher Debug</translation> + <source>SSL Cipher Debug View</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3016,11 +3097,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>เชื่อถือในใบรับรองความปลอดภัยนี้ไม่ว่าอย่างไร</translation> @@ -3049,44 +3125,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>หน่วยงาน: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>หน่วย: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>ประเทศ: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>ลายนิ้วมือ (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>ลายนิ้วมือ (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>วันที่บังคับใช้: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>หมดอายุวันที่: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>ผู้รับรอง: %1</translation> </message> @@ -3378,11 +3459,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>รุ่น %1 สำหรับข้อมูลเพิ่มเติมกรุณาเยี่ยมชม <a href='%2'>%3</a></p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3390,25 +3471,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3476,11 +3557,6 @@ It is not advisable to use it.</source> <translation>ตั้งค่า...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>รายละเอียด...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>ช่วยเหลือ</translation> @@ -3592,6 +3668,11 @@ It is not advisable to use it.</source> <translation>สร้างบัญชีใหม่...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3651,23 +3732,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>ป้ายข้อความ</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>เซิร์ฟเวอร์</translation> @@ -3709,11 +3773,6 @@ It is not advisable to use it.</source> <translation>และโฟลเดอร์ต้นทาง</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>และเก็บข้อมูลต้นทาง</translation> @@ -3732,11 +3791,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>และชื่อผู้ใช้</translation> @@ -3750,11 +3804,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>โปรดเปลี่ยนไปใช้เบราว์เซอร์เพื่อดำเนินการต่อ</translation> @@ -3769,21 +3818,15 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation>เปิดเบราเซอร์อีกครั้ง</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>ป้ายข้อความ</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3817,26 +3860,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>ป้ายข้อความ</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>ทั้งบัญชีของคุณจะถูกประสานข้อมูลกับโฟลเดอร์ต้นทาง</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>ปุ่มกด</translation> - </message> </context> <context> <name>QObject</name> @@ -3891,7 +3918,7 @@ It is not advisable to use it.</source> <translation>บางเวลาที่ผ่านมา</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3974,14 +4001,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 2eb553c51..fcf2c4f88 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>Pencere</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>Etiket</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> <source>Form</source> <translation>Form</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation>Lütfen işlemi yapmak için web tarayıcınıza geçin</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Bağlantı kurulurken bir sorun çıktı. Lütfen yeniden deneyin.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation>Tarayıcıyı Yeniden Aç</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Bağlantıyı kopyala</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>Lütfen işlemi yapmak için web tarayıcınıza geçin</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>Bağlantı kurulurken bir sorun çıktı. Lütfen yeniden deneyin.</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>Tarayıcıyı Yeniden Aç</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>Bağlantıyı kopyala</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>Bilgisayarınızdan eşitlenecek yerel klasörü seçin</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Bir uzak hedef klasörü seçin</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>Uçtan uca şifreleme anımsatıcısı</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>Şifreli kimliğiniz korunmak için 12 sözlük sözcüğünden oluşan bir anımsatıcı ile şifrelendi. Lütfen bu sözcükleri not ederek güvenli bir yerde saklayın. Bu bilgi hesabınıza başka aygıtlar (cep telefonu ya da bilgisayar) eklemek istediğinizde gerekir.</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Depolama alanı: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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>Seçilmemiş klasörler yerel dosya sisteminizden <b>kaldırılacak</b> ve bir daha bu bilgisayar ile eşitlenmeyecek</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Tümünü eşitle</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Hiçbirini eşitleme</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>El ile yapılan değişiklikleri uygula</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Uygula</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>İptal</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation><server> ile <user> olarak bağlantı kuruldu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Herhangi bir hesap yapılandırılmamış.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Yeni ekle</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Sil</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Hesap</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>Bu hesap uçtan uca şifrelemeyi destekliyor</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>Şifreleme kullanılsın</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>Uçtan uca şifreleme anımsatıcı görüntülensin:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>Şifrele</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>Yok Sayılan Dosyaları Düzenle</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Eşitlenecek ögeleri seçin</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Şimdi eşitlemeye zorla</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Eşitlemeyi yeniden başlat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>Klasör eşitleme bağlantısını sil</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Klasör oluşturulamadı</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p><i>%1</i> yerel klasörü oluşturulamadı.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Klasör Eşitleme Bağlantısını Silmeyi Onaylayın</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>Klasör Eşitleme Bağlantısını Sil</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Eşitleme Çalışıyor</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Eşitleme işlemi sürüyor.<br/>Durdurmak istiyor musunuz?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 kullanılıyor</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 <i>%2</i> olarak</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation>%1 sunucu sürümü eski ve desteklenmiyor! Riski üstlenerek devam edebilirsiniz.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>%1 ile bağlı.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>%1 sunucusu geçici olarak kullanılamıyor.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>%1 sunucusu bakım kipinde.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>%1 oturumu kapatıldı.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation>Kimlik web tarayıcısı üzerinden doğrulanıyor. Web tarayıcıyı yeniden açmak için <a href='%1'>buraya tıklayın</a>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>%1 bağlantısı kuruluyor...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>%1 ile %2 üzerinde bağlantı yok.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Oturum Aç</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Çok büyük oldukları için eşitlenmeyen klasörler var:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Dış depolama alanlarında bulundukları için eşitlenmeyen klasörler var:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Çok büyük oldukları için ya da dış depolama alanında bulundukları için eşitlenmeyen klasörler var:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Hesap Silmeyi Onaylayın</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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>Gerçekten <i>%1</i> hesabının bağlantısını kaldırmayı istiyor musunuz?</p><p><b>Not:</b> Bu işlem herhangi bir dosyayı <b>silmez</b>.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>Bağlantıyı kaldır</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>Klasörü aç</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Oturumu Kapat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Eşitlemeyi sürdür</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Eşitlemeyi duraklat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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>Gerçekten <i>%1</i> klasörünün eşitlemesini durdurmayı istiyor musunuz?</p><p><b>Not:</b> Bu işlem herhangi bir dosyayı <b>silmez</b>.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) / %2 kullanımda. Ağ üzerinden bağlanmış ya da paylaşılmış klasörlerin sınırları farklı olabilir.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>%1 / %2 kullanılıyor</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>Şu anda depolama kullanımı ile ilgili bir bilgi yok.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Henüz bir %1 bağlantısı yapılandırılmamış.</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>MetinEtiketi</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>Onayla</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>Eşitlenmiş</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>Tüm yüklemeleri yinele</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>%1 hesabının etkinleştirilmiş bir işlemi yok.</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>Üst veri veritabanına yazılırken sorun çıktı</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>Lütfen uçtan uca şifreleme parolasını yazın:<br><br>Kullanıcı:%2<br>Hesap:%3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>Uçtan uca şifreleme parolasını yazın</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>Sunucudan hata yanıtı alındı: <em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation>'token' uç noktasına erişilirken bir sorun çıktı: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation>Sunucudan alınan JSON işlenemedi: <br><em>%1</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>Sunucudan alınan yanıtta beklenen tüm alanlar yok</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>%1 ile bağlantı kur</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation>Web tarayıcınızda oturum açın (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>Web tarayıcı açılamadı. Lütfen bağlantıyı kopyalayıp tarayıcınıza yapıştırın.</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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>Web tarayıcı açılamadı. Lütfen bağlantıyı kopyalayıp tarayıcınıza yapıştırın.</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 okunabilir değil.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 kaldırıldı.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 indirildi.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 güncellendi.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1, %2 olarak adlandırıldı.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1, %2 konumuna taşındı.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 ve diğer %n dosya kaldırıldı.</numerusform><numerusform>%1 ve diğer %n dosya kaldırıldı.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 ve diğer %n dosya indirildi.</numerusform><numerusform>%1 ve diğer %n dosya indirildi.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 ve diğer %n dosya güncellendi.</numerusform><numerusform>%1 ve diğer %n dosya güncellendi.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1, %2 olarak yeniden adlandırıldı ve diğer %n dosyanın adı değiştirildi.</numerusform><numerusform>%1, %2 olarak yeniden adlandırıldı ve diğer %n dosyanın adı değiştirildi.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1, %2 konumuna taşındı ve diğer %n dosya taşındı.</numerusform><numerusform>%1, %2 konumuna taşındı ve diğer %n dosya taşındı.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 ve diğer %n dosya için eşitleme çakışması var.</numerusform><numerusform>%1 ve diğer %n dosya için eşitleme çakışması var.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 için eşitleme çakışması var. Lütfen çakışan dosyayı denetleyin!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 ve diğer %n dosya sorunlar nedeniyle eşitlenemedi. Ayrıntılı bilgi almak için günlük dosyasına bakın.</numerusform><numerusform>%1 ve diğer %n dosya sorunlar nedeniyle eşitlenemedi. Ayrıntılı bilgi almak için günlük dosyasına bakabilirsiniz.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 bir sorun nedeniyle eşitlenemedi. Ayrıntılı bilgi almak için günlük dosyasına bakabilirsiniz.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Eşitleme İşlemi</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Sistem katılmayacaklar dosyası okunamadı</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>%1 MB boyutundan büyük yeni bir klasör eklendi: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>Dış depolama alanından bir klasör eklendi. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>İndirmek istiyorsanız seçmek için lütfen ayarlar bölümüne gidin.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>%1 klasörü oluşturulmuş ancak daha önce eşitleme dışı bırakılmış. Bu klasördeki veriler eşitlenmeyecek.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>%1 dosyası oluşturulmuş ancak daha önce eşitleme dışı bırakılmış. Bu dosyadaki veriler eşitlenmeyecek.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -864,7 +959,7 @@ This means that the synchronization client might not upload local changes immedi Bunun sonucunda eşitleme istemcisi yerel değişiklikleri anında yükleyemez. Onun yerine yalnız yerel değişiklikleri tarar ve aralıklarla yükler (varsayılan olarak iki saatte bir).</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -875,22 +970,22 @@ Bu dosyaları tutmak isterseniz ve yeterli izinleriniz varsa sunucu ile yeniden Bu dosyaları silmek isterseniz ve sahibi değilseniz artık erişemeyeceksiniz.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>Yeni dosyalar indirilsin mi?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>Yeni dosyaları indir</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>Yerel dosyalar korunsun</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -900,7 +995,7 @@ Sunucuda bu eşitleme işlemlerinin yapılmasını istediğinizden emin misiniz? Bu işlemi yanlışlıkla yaptıysanız ve dosyalarınızı korumak istiyorsanız dosyalar sunucudan yeniden eşitlenecek.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -909,17 +1004,17 @@ Bunun nedeni sunucuya bir yedeğin geri yüklenmiş olması olabilir. Eşitlemeye normal şekilde devam edilirse tüm dosyalar daha eski bir dosya ile değiştirilebilir. Çakışma için daha yeni yerel dosyaları korumak ister misiniz?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Yedek bulundu</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>Normal Eşitleme</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>Çakıştığında Yerel Dosyalar Korunsun</translation> </message> @@ -1035,12 +1130,12 @@ Eşitlemeye normal şekilde devam edilirse tüm dosyalar daha eski bir dosya ile <translation>Klasör Eşitleme Bağlantısı Ekle</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>Yerel klasör ile eşitleniyor</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Dosya</translation> </message> @@ -1070,7 +1165,7 @@ Eşitlemeye normal şekilde devam edilirse tüm dosyalar daha eski bir dosya ile <translation>Klasör listesi sunucudan yüklenirken sorun çıktı.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Oturum kapatıldı</translation> </message> @@ -1085,107 +1180,107 @@ Eşitlemeye normal şekilde devam edilirse tüm dosyalar daha eski bir dosya ile <translation>Çözümlenmemiş çakışmalar var. Ayrıntılı bilgi için tıklayın.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>Değişiklikler denkleştiriliyor</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>%1 eşitleniyor</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>indirme %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>yükleme %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>Uzak '%1' üzerindeki değişiklikler denetleniyor</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>Yerel '%1' üzerindeki değişiklikler denetleniyor</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 / %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Kalan %5, %1/ %2, dosya %3 / %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 / %2, %3 / %4 dosya</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>dosya %1 / %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Bekleniyor...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Diğer %n klasör bekleniyor...</numerusform><numerusform>Diğer %n klasör bekleniyor...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>Eşitlemeye hazırlanıyor...</translation> </message> @@ -1316,11 +1411,6 @@ Eşitlemeye normal şekilde devam edilirse tüm dosyalar daha eski bir dosya ile <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>Yasal bildirim</translation> @@ -1471,32 +1561,45 @@ Eşitlemeye normal şekilde devam edilirse tüm dosyalar daha eski bir dosya ile <translation>Modele Göre Yok Sayılacak Dosyalar</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Ekle</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>'%1' üzerindeki bu kayıt sistem tarafından sağlanıyor ve bu görünümde düzenlenemez.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>Tümünü kaldır</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation>YoksayilanListesiTabloAraci</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation>Model</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation>Silinebilsin</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>Ekle</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Sil</translation> + <translation>Kaldır</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation>Tümünü kaldır</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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> @@ -1505,49 +1608,34 @@ Items where deletion is allowed will be deleted if they prevent a directory from Silme izni verildiğinde bir klasörün silinmesini engelleyen ögeler silinir. Bu özellik üst veriler için kullanışlıdır.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation>Dosya açılamadı</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Değişiklikler '%1' üzerine yazılamıyor.</translation> + <translation>Değişiklikler '%1' üzerine yazılamadı.</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> <translation>Yok Sayma Modeli Ekle</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> <translation>Yeni bir yok sayma modeli ekle:</translation> </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>'%1' üzerindeki bu kayıt sistem tarafından sağlanıyor ve bu görünümde düzenlenemez.</translation> - </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>Pencere</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>Yasal bildirim</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>MetinEtiketi</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>Kapat</translation> @@ -1679,11 +1767,6 @@ Günlükler %1 üzerine yazılacak</translation> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Vekil Sunucu Ayarları</translation> @@ -1951,7 +2034,7 @@ güncelleyici başka izinler isteyebilir.</translation> <message> <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="62"/> <source>Retry unencrypted over HTTP (insecure)</source> - <translation>HTTP ile şifrelenmemiş olarak yeniden dene (güvenliksiz)</translation> + <translation>HTTP ile şifrelenmemiş olarak yeniden dene (güvenli değil)</translation> </message> <message> <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="69"/> @@ -1994,11 +2077,6 @@ güncelleyici başka izinler isteyebilir.</translation> <source>Login in your browser</source> <translation>Web tarayıcınızda oturum açın</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Bağlantıyı panoya kopyala</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2050,12 +2128,12 @@ Kullanmanız önerilmez.</translation> <translation>&Sonraki ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Adres Geçersiz</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Sertifika yüklenemedi. Parola yanlış olabilir mi?</translation> </message> @@ -2133,79 +2211,79 @@ Kullanmanız önerilmez.</translation> <translation>%1 yerel klasörü oluşturulamadı</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Uzak klasör belirtilmemiş!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Hata: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>Nextcloud üzerinde klasör oluşturuluyor: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>%1 uzak klasörü oluşturuldu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Uzak klasör %1 zaten var. Eşitlemek için bağlantı kuruluyor.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Klasör oluşturma işlemi %1 HTTP hata kodu ile sonuçlandı</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Geçersiz kimlik doğrulama bilgileri nedeniyle uzak klasör oluşturulamadı!<br/>Lütfen geri giderek kimlik doğrulama bilgilerinizi denetleyin.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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">Büyük olasılıkla belirtilen kimlik doğrulama bilgileri hatalı olduğundan uzak klasör oluşturulamadı.</font><br/>Lütfen geri giderek kimlik doğrulama bilgilerinizi doğrulayın.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>%1 uzak klasörü <tt>%2</tt> hatası nedeniyle oluşturulamadı.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>%1 ile %2 uzak klasörü arasında bir eşitleme bağlantısı ayarlandı.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>%1 ile bağlantı kuruldu!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>%1 ile bağlantı kurulamadı. Lütfen yeniden denetleyin.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Klasör yeniden adlandırılamadı</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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>Klasör ya da içindeki bir dosya başka bir program tarafından kullanıldığından, bu klasör üzerinde silme ya da yedekleme işlemleri yapılamıyor. Lütfen klasör ya da dosyayı kapatıp yeniden deneyin ya da kurulumu iptal edin.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>%1 yerel eşitleme klasörü oluşturuldu!</b></font></translation> </message> @@ -2213,12 +2291,12 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 Bağlantı Yardımcısı</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Klasör yapılandırmasını atla</translation> </message> @@ -2252,7 +2330,7 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>Üst veri veritabanına yazılırken sorun çıktı</translation> </message> @@ -2280,32 +2358,32 @@ Kullanmanız önerilmez.</translation> <translation>Boş disk alanı %1 değerinin altında</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Dosya sunucudan silindi</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Dosya tam olarak indirilemedi.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation>Sunucu tarafından boyutu %1 olarak bildirilmesine rağmen indirilen dosya boş.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>%1 dosyası, adının yerel bir dosya ile çakışması nedeniyle kaydedilemedi!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Dosya taramadan sonra değiştirilmiş</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>Üst veri veritabanına yazılırken sorun çıktı</translation> </message> @@ -2318,7 +2396,7 @@ Kullanmanız önerilmez.</translation> <translation>; Geri Yüklenemedi: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>Bir dosya ya da klasör salt okunur bir paylaşımdan kaldırılmış ancak geri yüklenemedi: %1</translation> </message> @@ -2450,27 +2528,27 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Yerel dosya eşitleme sırasında silinmiş.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Yerel dosya eşitleme sırasında değişmiş.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>Sunucudan bilinmeyen bir yanıt kodu alındı (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>Sunucudan Dosya Kodu alınamadı</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>Sunucudan E-Tag alınamadı</translation> </message> @@ -2679,22 +2757,22 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&Dosyayı paylaş</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>Parola:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>Son kullanma tarihi:</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>MetinEtiketi</translation> </message> @@ -2767,22 +2845,22 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <location filename="../src/gui/shareusergroupwidget.ui" line="59"/> <source>Share with users or groups ...</source> <translation>Kullanıcı ya da gruplarla paylaş...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>Bağlantıyı kopyala</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>'%1' için bir sonuç bulunamadı</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>Sizinle bir şey paylaştım</translation> </message> @@ -2800,22 +2878,27 @@ Kullanmanız önerilmez.</translation> <translation>düzenleyebilir</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>Yeniden paylaşabilsin</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>Paylaşımdan Kaldır</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>Ekleyebilsin</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>Değiştirebilsin</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>Silebilsin</translation> </message> @@ -2842,7 +2925,7 @@ Kullanmanız önerilmez.</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation>SSL Şifreleme Hata Ayıklama Görünümü</translation> </message> <message> @@ -3028,11 +3111,6 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Bu sertifikaya yine de güven</translation> @@ -3061,44 +3139,49 @@ Kullanmanız önerilmez.</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Kuruluş: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Birim: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Ülke: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Parmak izi (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Parmak izi (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation>Parmak izi (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>Parmak izi (SHA-512): <tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Geçerlilik Tarihi: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Son Kullanım Tarihi: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Veren: %1</translation> </message> @@ -3389,11 +3472,11 @@ Kullanmanız önerilmez.</translation> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>%1. sürümü Ayrıntılı bilgi almak için <a href='%2'>%3</a> adresine bakabilirsiniz.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation><p>Sürüm %1. Ayrıntılı bilgi almak için <a href='%2'>buraya tıklayabilirsiniz</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>Bu sürüm %1 tarafından hazırlanmıştır</p></translation> </message> @@ -3401,25 +3484,25 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>Sertifika geçersiz</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>"%1" sunucusunun sertifikası geçersiz. Devam etmek ister misiniz?</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>%1 üzerindeki %2 kullanıcısı oturumunuzu kapattınız. Lütfen yeniden oturum açın</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>Lütfen şu kullanıcı ile oturum açın: %1</translation> </message> @@ -3487,11 +3570,6 @@ Kullanmanız önerilmez.</translation> <translation>Ayarlar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Ayrıntılar...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Yardım</translation> @@ -3603,6 +3681,11 @@ Kullanmanız önerilmez.</translation> <translation>Hesap ekle...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation>Diğer işlemleri görüntüle...</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> @@ -3662,23 +3745,6 @@ Kullanmanız önerilmez.</translation> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>MetinEtiketi</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Sunucu</translation> @@ -3720,11 +3786,6 @@ Kullanmanız önerilmez.</translation> <translation>&Yerel Klasör</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbYerelKlasörüSeçin</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>Yerel veriler &korunsun</translation> @@ -3743,11 +3804,6 @@ Kullanmanız önerilmez.</translation> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>K&ullanıcı Adı</translation> @@ -3761,11 +3817,6 @@ Kullanmanız önerilmez.</translation> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>Lütfen işlemi yapmak için web tarayıcınıza geçin</translation> @@ -3780,21 +3831,15 @@ Kullanmanız önerilmez.</translation> <source>Re-open Browser</source> <translation>Tarayıcıyı Yeniden Aç</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>Bağlantıyı kopyala</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>MetinEtiketi</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Kendi sunucunuzu işletin</span></a></translation> @@ -3828,26 +3873,10 @@ Kullanmanız önerilmez.</translation> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>MetinEtiketi</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Tüm hesabınız yerel klasör ile eşitlendi</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>BasBırakDüğme</translation> - </message> </context> <context> <name>QObject</name> @@ -3902,7 +3931,7 @@ Kullanmanız önerilmez.</translation> <translation>Bir süre önce</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3985,14 +4014,6 @@ Kullanmanız önerilmez.</translation> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>Form</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 233f2074e..5d40e3a07 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -9,91 +9,86 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/> <source>Checking for changes in '%1'</source> - <translation type="unfinished"/> + <translation>Перевірка на зміни у '%1'</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/> <source>Syncing %1 of %2 (%3 left)</source> - <translation type="unfinished"/> + <translation>Синхронізую %1 з %2 (залишилося %3)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/> <source>Syncing %1 of %2</source> - <translation type="unfinished"/> + <translation>Синхронізую %1 з %2</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/> <source>Syncing %1 (%2 left)</source> - <translation type="unfinished"/> + <translation>Синхронізую %1 (залишилося %2)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/> <source>Syncing %1</source> - <translation type="unfinished"/> + <translation>Синхронізую %1</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation type="unfinished"/> + <translation>Файли не змінювалися останнім часом</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> <source>Sync paused</source> - <translation type="unfinished"/> + <translation>Синхронізацію призупинено</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="184"/> <source>Syncing</source> - <translation type="unfinished"/> + <translation>Синхронізація</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>Відкрити вебсайт</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>Останні зміни</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>Призупинити синхронізацію</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>Допомога</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>Налаштування</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>Вийти</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> <source>Quit sync client</source> - <translation type="unfinished"/> + <translation>Вийти з клієнта синхронізації</translation> </message> </context> <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> - <translation type="unfinished"/> + <translation>Мітка</translation> </message> </context> <context> @@ -101,31 +96,82 @@ <message> <location filename="../src/common/filesystembase.cpp" line="445"/> <source>Could not make directories in trash</source> - <translation type="unfinished"/> + <translation>Неможливо створити каталог у смітнику</translation> </message> <message> <location filename="../src/common/filesystembase.cpp" line="459"/> <location filename="../src/common/filesystembase.cpp" line="465"/> <source>Could not move '%1' to '%2'</source> - <translation type="unfinished"/> + <translation>Неможливо перемістити '%1' до '%2'</translation> </message> <message> <location filename="../src/common/filesystembase.cpp" line="502"/> <source>Moving to the trash is not implemented on this platform</source> + <translation>Ця платформа не дозволяє переміщення до смітника</translation> + </message> +</context> +<context> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> <translation type="unfinished"/> </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>Форма</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> - <translation>Оберіть локальний каталог на Вашому ПК для синхронізації:</translation> + <translation>Оберіть локальну теку на Вашому ПК для синхронізації:</translation> </message> <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>Оберіть віддалену теку для зберігання даних</translation> @@ -176,23 +217,23 @@ <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="251"/> <source>Unknown error: network reply was deleted</source> - <translation type="unfinished"/> + <translation>Незнайома помилка: відповідь мережі вилучено</translation> </message> <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="403"/> <source>Server replied "%1 %2" to "%3 %4"</source> - <translation type="unfinished"/> + <translation>Відповідь сервера: "%1 %2" до "%3 %4"</translation> </message> </context> <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>Простір сховища: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>Синхронізувати все</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>Не синхронізувати нічого</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>Застосувати ручні зміни</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>Застосувати</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>Скасувати</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>Підключено до <server> як <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>Обліковий запис не налаштовано.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>Додати</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>Видалити</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>Обліковий запис</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> + <translation>Шифрувати</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>Оберіть, що хочете синхронізувати</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>Примусово синхронізувати зараз</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>Перезапустити синхронізацію</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>Не вдалося створити теку</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> - <translation type="unfinished"/> + <translation><p>Неможливо створити локальну теку <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>Виконується синхронізація</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <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="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 використовується</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 як <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <source>The server version %1 is old and unsupported! Proceed at your own risk.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>Підключено до %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>Сервер %1 тимчасово недоступний.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>Увійти</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <source>There are folders that were not synchronized because they are too big: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>Підтвердіть видалення облікового запису</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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/accountsettings.cpp" line="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> - <translation>Відкрити каталог</translation> + <translation>Відкрити теку</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>Вихід</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>Відновити синхронізацію</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>Призупинити синхронізацію</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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 type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <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="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>Використовується %1 з %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>На даний час немає відомостей про наповнення сховища.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>Жодного %1 підключення не налаштовано.</translation> </message> @@ -489,7 +541,7 @@ <message> <location filename="../src/gui/accountstate.cpp" line="128"/> <source>Maintenance mode</source> - <translation type="unfinished"/> + <translation>Режим обслуговування</translation> </message> <message> <location filename="../src/gui/accountstate.cpp" line="130"/> @@ -522,53 +574,43 @@ <message> <location filename="../src/gui/activityitemdelegate.cpp" line="179"/> <source>More information</source> - <translation type="unfinished"/> + <translation>Докладно</translation> </message> <message> <location filename="../src/gui/activityitemdelegate.cpp" line="180"/> <source>Accept</source> - <translation type="unfinished"/> + <translation>Прийняти</translation> </message> <message> <location filename="../src/gui/activityitemdelegate.cpp" line="181"/> <source>Join</source> - <translation type="unfinished"/> + <translation>Приєднатися</translation> </message> <message> <location filename="../src/gui/activityitemdelegate.cpp" line="198"/> <source>Open Browser</source> - <translation type="unfinished"/> + <translation>Відкрити бравзер</translation> </message> </context> <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>Мітка</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> - <translation type="unfinished"/> + <translation>Прийняти</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> - <translation type="unfinished"/> + <translation>Синхронізовано</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> - <translation type="unfinished"/> + <translation>Повторно завантажити все</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation type="unfinished"/> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,118 +835,118 @@ <translation>%1 не читається.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 видалено.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 завантажено.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 оновлено.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 перейменовано на %2</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 переміщено в %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 не може синхронізуватися через помилки. Дивіться деталі в журналі.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>Журнал синхронізації</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>Неможливо прочитати виключений системний файл</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -860,7 +955,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -868,46 +963,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> - <translation type="unfinished"/> + <translation>Звантажити нові файли?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> - <translation type="unfinished"/> + <translation>Звантажити нові файли</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> - <translation type="unfinished"/> + <translation>Зберегти локальні файли</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>Резервну копію знайдено</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation type="unfinished"/> </message> @@ -1023,12 +1118,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>Файл</translation> </message> @@ -1038,7 +1133,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>You need to be connected to add a folder</source> - <translation type="unfinished"/> + <translation>Ви маєте мати з'єднання з мережею, щоб додати теку</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="146"/> @@ -1058,7 +1153,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>Вийшов</translation> </message> @@ -1073,109 +1168,109 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> - <translation type="unfinished"/> + <translation>Синхронізую %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>завантаження %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>відвантаження %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 of %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>файл %1 з %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>Очікування...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> - <translation type="unfinished"/> + <translation>Підготовка до синхронізації...</translation> </message> </context> <context> @@ -1304,11 +1399,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation type="unfinished"/> @@ -1321,7 +1411,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.ui" line="72"/> <source>For System Tray</source> - <translation type="unfinished"/> + <translation>Для системного трею</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="89"/> @@ -1401,7 +1491,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/socketapi.cpp" line="520"/> <source>Sharing error</source> - <translation type="unfinished"/> + <translation>Помилка під час надання доступу</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="521"/> @@ -1457,84 +1547,82 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>Файли ігноровані за шаблоном</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>Додати</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>Цей запис створено системою в '%1', тут змінити його не можна.</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>Шаблон</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>Дозволити видалення</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>Видалити</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>Не вдалося відкрити файл</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>Неможливо запиасати зміни до '%1'.</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>Додати шаблон ігнорування</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>Додати новий шаблон ігнорування:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>Цей запис створено системою в '%1', тут змінити його не можна.</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> - <translation type="unfinished"/> + <translation>Закрити</translation> </message> <message> <location filename="../src/gui/legalnotice.cpp" line="27"/> @@ -1661,11 +1749,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>Налаштування проксі</translation> @@ -1855,7 +1938,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="178"/> <source>Update Check</source> - <translation type="unfinished"/> + <translation>Перевірити оновлення</translation> </message> </context> <context> @@ -1878,7 +1961,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="157"/> <source>%1 folder '%2' is synced to local folder '%3'</source> - <translation>%1 тека '%2' синхронізована з локальним каталогом '%3'</translation> + <translation>%1 тека '%2' синхронізована з локальною текою '%3'</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="160"/> @@ -1893,7 +1976,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/> <source>Free space: %1</source> - <translation type="unfinished"/> + <translation>Вільне місце: %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/> @@ -1909,7 +1992,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/> <source>There isn't enough free space in the local folder!</source> - <translation type="unfinished"/> + <translation>Недостатньо вільного місця у локальній теці!</translation> </message> </context> <context> @@ -1975,11 +2058,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>Авторизуйтеся у вашому браузері</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>Зберегти посилання до буферу обміну</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2031,12 +2109,12 @@ It is not advisable to use it.</source> <translation>&Наступний></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>Недійсна URL адреса</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Не вдалося завантажити сертифікат. Можливо був введений неправильний пароль?</translation> </message> @@ -2114,79 +2192,79 @@ It is not advisable to use it.</source> <translation>Не вдалося створити локальну теку $1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>Не вказано віддалену теку!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>Помилка: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>створення теки на Nextcloud: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>Віддалена тека %1 успішно створена.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Віддалена тека %1 вже існує. Під'єднання для синхронізації.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Створення теки завершилось HTTP помилкою %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <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="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <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="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <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="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>Успішно під'єднано до %1!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Підключення до %1 встановити не вдалося. Будь ласка, перевірте ще раз.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>Не вдалося перейменувати теку</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локальна тека синхронізації %1 успішно створена!</b></font></translation> </message> @@ -2194,12 +2272,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>Майстер з'єднання %1 </translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>Пропустити налаштування теки</translation> </message> @@ -2233,7 +2311,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -2261,32 +2339,32 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>Файл видалено з сервера</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>Файл не може бути завантажений повністю.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <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="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>Файл змінився з моменту знаходження</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -2299,7 +2377,7 @@ It is not advisable to use it.</source> <translation>; Відновлення не вдалося: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation type="unfinished"/> </message> @@ -2319,7 +2397,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="191"/> <source>could not create folder %1</source> - <translation type="unfinished"/> + <translation>неможливо створити теку %1</translation> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="203"/> @@ -2431,27 +2509,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>Локальний файл було видалено під час синхронізації.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>Локальний файл змінився під час синхронізації.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -2660,22 +2738,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>Мітка</translation> </message> @@ -2692,7 +2770,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="155"/> <source>Read only</source> - <translation type="unfinished"/> + <translation>Тільки для читання</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> @@ -2707,22 +2785,22 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="183"/> <source>Password Protect</source> - <translation type="unfinished"/> + <translation>Захищено паролем</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="200"/> <source>Expiration Date</source> - <translation type="unfinished"/> + <translation>Дійсно до</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="219"/> <source>Unshare</source> - <translation type="unfinished"/> + <translation>Скасувати загальний доступ</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="224"/> <source>Add another link</source> - <translation type="unfinished"/> + <translation>Додати ще одне посилання</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="402"/> @@ -2742,30 +2820,30 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="428"/> <source>Public link</source> - <translation type="unfinished"/> + <translation>Публічне посилання</translation> </message> </context> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <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="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> - <translation type="unfinished"/> + <translation>Скопіювати посилання</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> - <translation type="unfinished"/> + <translation>Відсутні результати для '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> - <translation type="unfinished"/> + <translation>Я поділився з вами документами</translation> </message> </context> <context> @@ -2773,7 +2851,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/shareuserline.ui" line="66"/> <source>User name</source> - <translation type="unfinished"/> + <translation>Ім'я користувача</translation> </message> <message> <location filename="../src/gui/shareuserline.ui" line="82"/> @@ -2781,22 +2859,27 @@ It is not advisable to use it.</source> <translation>може редагувати</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2823,7 +2906,7 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> @@ -2843,7 +2926,7 @@ It is not advisable to use it.</source> <location filename="../src/gui/socketapi.cpp" line="457"/> <source>Share with %1</source> <comment>parameter is Nextcloud</comment> - <translation type="unfinished"/> + <translation>Поділитися з %1</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="491"/> @@ -2859,7 +2942,7 @@ 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...</source> - <translation type="unfinished"/> + <translation>Поділитися...</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="627"/> @@ -2886,7 +2969,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/socketapi.cpp" line="722"/> <source>Open in browser</source> - <translation type="unfinished"/> + <translation>Відкрити у бравзері</translation> </message> </context> <context> @@ -3009,11 +3092,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>Все одно довіряти цьому сертифікату</translation> @@ -3042,44 +3120,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>Організація: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>Підрозділ: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>Країна: %1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>Відбиток (MD5): <tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>Відбиток (SHA1): <tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>Дата введення в дію: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>Термін Дії: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>Емітент: %1</translation> </message> @@ -3205,7 +3288,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/syncengine.cpp" line="147"/> <source>No space on %1 server available.</source> - <translation type="unfinished"/> + <translation>На сервері %1 більше немає місця.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="156"/> @@ -3265,7 +3348,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/syncengine.cpp" line="531"/> <source>Unresolved conflict.</source> - <translation type="unfinished"/> + <translation>Конфлікт, який неможна вирішити</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="539"/> @@ -3280,7 +3363,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/syncengine.cpp" line="731"/> <source>Invalid characters, please rename "%1"</source> - <translation type="unfinished"/> + <translation>Помилкові символи, будь ласка, перейменуйте "%1"</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="864"/> @@ -3311,7 +3394,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/libsync/syncengine.cpp" line="1335"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> - <translation>Заборонено через відсутність прав додавання підкаталогів в цю теку.</translation> + <translation>Заборонено через відсутність прав додавання вкладених тек у цій теці.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="1382"/> @@ -3370,11 +3453,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>Версія %1. Для отримання більш детальної інформації, будь ласка, відвідайте <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3382,25 +3465,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3468,11 +3551,6 @@ It is not advisable to use it.</source> <translation>Налаштування...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>Деталі...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>Допомога</translation> @@ -3541,42 +3619,42 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="363"/> <source>Error during synchronization</source> - <translation type="unfinished"/> + <translation>Помилка під час синхронізації</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="367"/> <source>No sync folders configured</source> - <translation type="unfinished"/> + <translation>Теки для синхронізації не налаштовано</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="413"/> <source>Resume all folders</source> - <translation type="unfinished"/> + <translation>Продовжити синхронізацію у всіх теках</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="418"/> <source>Pause all folders</source> - <translation type="unfinished"/> + <translation>Призупинити синхронізацію всюди</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="694"/> <source>Resume all synchronization</source> - <translation type="unfinished"/> + <translation>Продовжити синхронізацію всюди</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="696"/> <source>Resume synchronization</source> - <translation type="unfinished"/> + <translation>Продовжити синхронізацію</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="704"/> <source>Pause all synchronization</source> - <translation type="unfinished"/> + <translation>Призупинити синхронізацію всюди</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="706"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>Призупинити синхронізацію</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="781"/> @@ -3584,6 +3662,11 @@ It is not advisable to use it.</source> <translation>Новий обліковий запис...</translation> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3592,7 +3675,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/owncloudgui.cpp" line="841"/> <source>Apps</source> - <translation type="unfinished"/> + <translation>Застосунки</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="898"/> @@ -3643,23 +3726,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>Мітка</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>Сервер</translation> @@ -3701,11 +3767,6 @@ It is not advisable to use it.</source> <translation>&Локальна Тека</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>&Зберегти локальні дані</translation> @@ -3724,11 +3785,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>&Ім'я користувача</translation> @@ -3742,11 +3798,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation type="unfinished"/> @@ -3761,21 +3812,15 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>Мітка</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3809,26 +3854,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>Мітка</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>Ваш запис цілком синхронізовано із локальною текою</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>НатиснітьКнопку</translation> - </message> </context> <context> <name>QObject</name> @@ -3883,7 +3912,7 @@ It is not advisable to use it.</source> <translation>Деякий час тому</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3966,14 +3995,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index ece04c76d..394854b2a 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -86,11 +86,6 @@ <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation>对话框</translation> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> <translation>标签</translation> @@ -116,13 +111,64 @@ </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</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/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>复制链接</translation> + </message> +</context> +<context> + <name>Flow2AuthWidget</name> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>格式</translation> + <translation>表单</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation>请切换到您的浏览器以继续。</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation>连接时发生错误。请重试。</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation>重新打开浏览器</translation> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation>复制链接</translation> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>选择一个本地文件夹进行同步</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>格式</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>选择远程目标文件夹</translation> @@ -187,12 +228,12 @@ <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation>端到端加密助记词</translation> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation>为了保护您的加密身份，我们用 12 个助记词对其进行了加密。请将它们抄下来并妥善保管。在您向账户添加其他设备（手机或笔记本电脑）时需要用到。</translation> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>格式</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>存储空间：...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>同步所有</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>不同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>应用手工修改</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>应用</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation><user> 已经连接到 <server> </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>没有配置的帐号。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>添加</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>移除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>账户</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>此账号支持端到端加密</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>启用加密</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation>显示 E2E 助记词</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> <translation>加密</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> + <translation>编辑已忽略的文件</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>选择同步内容</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>立即强制同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>重启同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>移除文件夹同步连接</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>文件夹创建失败</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>无法创建文件夹 <i>%1</i>。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>确定移除文件夹同步连接</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>移除文件夹同步连接</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>正在同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <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="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 已使用</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1, <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <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="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>已连接到 %1。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>服务器 %1 暂时不可用。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>服务器 %1 目前正在维护。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>从 %1 退出。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <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="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>正在连接到 %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>没有到位于%2中的%1的连接</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>登录</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <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="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <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="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <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="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>确认删除账号</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>删除连接</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>打开文件夹</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>注销</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>恢复同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>暂停同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 （%3%） of %2 使用中。一些文件夹，例如网络挂载的和共享的文件夹，可能有不同的限制。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>使用量 %1 / %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>目前没有储存使用量信息可用。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>没有 %1 连接配置。</translation> </message> @@ -543,32 +595,22 @@ <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>窗体</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>文本标签</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> <translation>接受</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> <translation>已同步</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> <translation>重试所有上传</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>帐户%1没有同步活动。</translation> </message> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>向数据库写入元数据错误</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> <translation>请输入端到端加密短语：<br><br>用户名：%2<br>账号：%3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation>输入 E2E 密语</translation> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation>服务器返回错误：<em>%i</em></translation> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <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="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <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="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation>从服务器返回的应答没有包含所有预期的字段</translation> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation>连接到 %1</translation> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <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"/> + <source>Unable to open the Browser, please copy the link to your Browser.</source> + <translation>无法打开浏览器，请将链接复制到您的浏览器。</translation> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,120 +835,120 @@ <translation>%1 不可读。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 已移除。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 已下载。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 已更新。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 已更名为 %2。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 已移动至 %2。</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 和 %n 其它文件已被移除。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 和 %n 其它文件已下载。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 和 %n 其它文件已更新。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 已经更名为 %2，其它 %3 文件也已更名。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 已移动到 %2，其它 %3 文件也已移动。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 和 %n 其他文件有同步冲突。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 有同步冲突。请检查冲突文件！</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 和 %n 其他文件由于错误不能同步。详细信息请查看日志。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 同步出错。详情请查看日志。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>同步活动</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>无法读取系统排除的文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <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="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> <translation>一个来自外部存储的文件夹已被添加。 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <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="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <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="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <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="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -866,7 +961,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -877,22 +972,22 @@ 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="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> <translation>下载新文件？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> <translation>下载新文件？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>保持本地文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> @@ -901,7 +996,7 @@ If this was an accident and you decide to keep your files, they will be re-synce 如果这是一个意外而您想要保留这些文件，他们会被重新从服务器同步过来。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> @@ -910,17 +1005,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="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> <translation>备份已删除</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> <translation>正常同步</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> <translation>保留本地文件为冲突文件</translation> </message> @@ -1036,12 +1131,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>添加同步文件夹</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>已与本地文件夹同步</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation>已与本地文件夹（%1）同步</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>文件</translation> </message> @@ -1071,7 +1166,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>载入文件夹列表时发生错误。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>已登出</translation> </message> @@ -1086,107 +1181,107 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>存在未解决的冲突。点击查看细节。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation>状态发生变化</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>正在同步 %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>，</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>下载 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>上传 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> <translation>检查远程变更 '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> <translation>检查本地变更 '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2（%3 / %4）</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>剩余：%5，%1 / %2, 文件数量 %3 / %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%2 的 %1，%4 的文件 %3</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>第 %1 个文件，共 %2 个</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>请稍等...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>等待 %n 个其他文件（文件夹）</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>准备同步...</translation> </message> @@ -1317,11 +1412,6 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>窗体</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> <translation>法律提示</translation> @@ -1472,83 +1562,81 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>文件忽略模式：</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>增加</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>此项目由系统在 %1 处提供，不能在这里被修改。</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> - <translation>移除全部</translation> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> + <translation>IgnoreListTableWidget</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> <translation>模式</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> <translation>允许删除</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation>添加</translation> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> <translation>移除</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <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>匹配到模式的文件或文件夹将不会被同步。 + <translation>与模式匹配的文件或文件夹将不会被同步。 -如果选中的项目正在阻止文件夹的删除，它们也会被删除。这对于元数据很有用。</translation> +如果选中的项目正在阻止文件夹的删除，它们也会被删除。这对于元数据来说很有用。</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> <translation>不能打开文件</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>无法向 %1 中写入修改。</translation> + <translation>无法向 '%1' 中写入更改。</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>增加忽略模式</translation> + <translation>添加忽略模式</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>增加新的忽略模式：</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>此项目由系统在 %1 处提供，不能在这里被修改。</translation> + <translation>添加新的忽略模式：</translation> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation>对话框</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> <translation>法律提示</translation> </message> <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation>文本标签</translation> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="58"/> <source>Close</source> <translation>关闭</translation> @@ -1680,11 +1768,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>窗体</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>代理设置</translation> @@ -1994,11 +2077,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation>在浏览器中登录</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation>复制链接到剪贴板</translation> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2049,12 +2127,12 @@ It is not advisable to use it.</source> <translation>&下一步 ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation>无效的链接</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>无法载入证书。是不是密码错了？</translation> </message> @@ -2132,79 +2210,79 @@ It is not advisable to use it.</source> <translation>不能创建本地文件夹 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>未指定远程文件夹！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>错误：%1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation>在 Nextcloud 上创建文件夹：%1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>远程目录%1成功创建。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>远程文件夹 %1 已存在。连接它以供同步。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>创建文件夹出现 HTTP 错误代码 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <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="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <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="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <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="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>成功连接到了 %1！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>无法建立到 %1 的链接，请稍后重试。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>文件夹更名失败</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>本地同步目录 %1 已成功创建</b></font></translation> </message> @@ -2212,12 +2290,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1 链接向导</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>跳过文件夹设置</translation> </message> @@ -2251,7 +2329,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>向数据库写入元数据错误</translation> </message> @@ -2279,32 +2357,32 @@ It is not advisable to use it.</source> <translation>空闲磁盘空间少于 %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>已从服务器删除文件</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>文件无法完整下载。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <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="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <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="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>自从发现文件以来，它已经被改变了</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>向数据库写入元数据错误</translation> </message> @@ -2317,7 +2395,7 @@ It is not advisable to use it.</source> <translation>；恢复失败：%1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>文件（夹）移除了只读共享，但恢复失败：%1</translation> </message> @@ -2449,27 +2527,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>本地文件在同步时已删除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时已修改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation>从服务器得到了意外的返回值（%1）</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation>服务器端文件 ID 缺失</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation>服务器端 ETag 缺失</translation> </message> @@ -2678,22 +2756,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation>&共享链接</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation>密码：</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation>有效期至：</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>文本标签</translation> </message> @@ -2766,22 +2844,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <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="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation>复制链接</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>没有 '%1' 相关结果</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation>我向您共享了一些东西</translation> </message> @@ -2799,22 +2877,27 @@ It is not advisable to use it.</source> <translation>可编辑</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation>可以再分享</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation>取消共享</translation> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation>可以创建</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation>可以修改</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation>可以删除</translation> </message> @@ -2841,8 +2924,8 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> - <translation>查看 SSL 加密调试信息</translation> + <source>SSL Cipher Debug View</source> + <translation>SSL加密调试视图</translation> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/> @@ -3027,11 +3110,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>窗体</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>总是信任该证书</translation> @@ -3060,44 +3138,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>组织：%1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>单位：%1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>国家：%1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>MD5 指纹：<tt>%1</tt></translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>SHA1 指纹：<tt>%1</tt></translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <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>指纹（SHA-512）：<tt>%1</tt></translation> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>有效日期：%1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>过期日期：%1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>签发人：%1</translation> </message> @@ -3388,11 +3471,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>版本 %1。详情请见 <a href='%2'>%3</a>。</p></translation> + <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="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation><p>该版本由 %1 提供</p></translation> </message> @@ -3400,25 +3483,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation>检测到无效证书</translation> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation>主机 “%1” 提供了无效证书。是否继续？</translation> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation>您已经以用户 %2 的身份从 %1 中注销，请重新登录</translation> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation>请以 %1 用户身份登陆</translation> </message> @@ -3486,11 +3569,6 @@ It is not advisable to use it.</source> <translation>设置...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>细节...</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>帮助</translation> @@ -3602,6 +3680,11 @@ It is not advisable to use it.</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="794"/> <source>Crash now</source> <comment>Only shows in debug mode to allow testing the crash handler</comment> @@ -3661,23 +3744,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>窗体</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>文本标签</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>服务器</translation> @@ -3719,11 +3785,6 @@ It is not advisable to use it.</source> <translation>本地文件夹</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation>pbSelectLocalFolder</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>保留本地数据</translation> @@ -3742,11 +3803,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>窗体</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>用户名</translation> @@ -3760,11 +3816,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>窗体</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation>请切换到您的浏览器继续。</translation> @@ -3779,21 +3830,15 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation>重新打开浏览器</translation> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation>复制链接</translation> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>窗体</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>文本标签</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">托管您自己的服务器</span></a></translation> @@ -3806,7 +3851,7 @@ It is not advisable to use it.</source> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="165"/> <source>Log in</source> - <translation>登陆</translation> + <translation>登录</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="288"/> @@ -3827,26 +3872,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>窗体</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>文本标签</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>您的整个账户将被同步到本地文件夹</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>按钮</translation> - </message> </context> <context> <name>QObject</name> @@ -3901,7 +3930,7 @@ It is not advisable to use it.</source> <translation>之前</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1：%2</translation> @@ -3984,14 +4013,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation>格式</translation> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 9ff719043..9e1789934 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -4,96 +4,91 @@ <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="107"/> <source>%1 (%2, %3)</source> - <translation type="unfinished"/> + <translation>%1 (%2, %3)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/> <source>Checking for changes in '%1'</source> - <translation type="unfinished"/> + <translation>檢查 '%1' 的變動</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/> <source>Syncing %1 of %2 (%3 left)</source> - <translation type="unfinished"/> + <translation>同步中 %1 的 %2 (剩餘 %3)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/> <source>Syncing %1 of %2</source> - <translation type="unfinished"/> + <translation>同步中 %1 的 %2</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/> <source>Syncing %1 (%2 left)</source> - <translation type="unfinished"/> + <translation>同步中 %1 (剩餘 %2)</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/> <source>Syncing %1</source> - <translation type="unfinished"/> + <translation>同步 %1</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/> <source>No recently changed files</source> - <translation type="unfinished"/> + <translation>近期無更動的檔案</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/> <source>Sync paused</source> - <translation type="unfinished"/> + <translation>同步已暫停</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="184"/> <source>Syncing</source> - <translation type="unfinished"/> + <translation>同步中</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/> <source>Open website</source> - <translation type="unfinished"/> + <translation>開啟網站</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/> <source>Recently changed</source> - <translation type="unfinished"/> + <translation>最近的更動</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/> <source>Pause synchronization</source> - <translation type="unfinished"/> + <translation>暫停同步</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/> <source>Help</source> - <translation type="unfinished"/> + <translation>說明</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/> <source>Settings</source> - <translation type="unfinished"/> + <translation>設定</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/> <source>Log out</source> - <translation type="unfinished"/> + <translation>登出</translation> </message> <message> <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/> <source>Quit sync client</source> - <translation type="unfinished"/> + <translation>退出同步客戶端</translation> </message> </context> <context> <name>Dialog</name> <message> - <location filename="../src/gui/mnemonicdialog.ui" line="23"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/mnemonicdialog.ui" line="58"/> <source>Label</source> - <translation type="unfinished"/> + <translation>標籤</translation> </message> </context> <context> @@ -101,28 +96,79 @@ <message> <location filename="../src/common/filesystembase.cpp" line="445"/> <source>Could not make directories in trash</source> - <translation type="unfinished"/> + <translation>無法將目錄移置回收桶</translation> </message> <message> <location filename="../src/common/filesystembase.cpp" line="459"/> <location filename="../src/common/filesystembase.cpp" line="465"/> <source>Could not move '%1' to '%2'</source> - <translation type="unfinished"/> + <translation>無法將%1' 移動至 '%2'</translation> </message> <message> <location filename="../src/common/filesystembase.cpp" line="502"/> <source>Moving to the trash is not implemented on this platform</source> + <translation>移至回收桶功能目前無法使用</translation> + </message> +</context> +<context> + <name>Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="36"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="46"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="56"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.ui" line="69"/> + <source>Copy link</source> <translation type="unfinished"/> </message> </context> <context> - <name>FolderWizardSourcePage</name> + <name>Flow2AuthWidget</name> <message> - <location filename="../src/gui/folderwizardsourcepage.ui" line="14"/> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/> <source>Form</source> - <translation>表單</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="48"/> + <source>Please switch to your browser to proceed.</source> + <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="58"/> + <source>An error occurred while connecting. Please try again.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="68"/> + <source>Re-open Browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authwidget.ui" line="81"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>FolderWizardSourcePage</name> + <message> <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/> <source>Pick a local folder on your computer to sync</source> <translation>在您的電腦中選擇一個本地資料夾用來同步</translation> @@ -136,11 +182,6 @@ <context> <name>FolderWizardTargetPage</name> <message> - <location filename="../src/gui/folderwizardtargetpage.ui" line="14"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/> <source>Select a remote destination folder</source> <translation>選擇一個遠端的目標資料夾</translation> @@ -181,18 +222,18 @@ <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="403"/> <source>Server replied "%1 %2" to "%3 %4"</source> - <translation type="unfinished"/> + <translation>伺服器回覆 "%1 %2" 到 "%3 %4"</translation> </message> </context> <context> <name>OCC::AccountManager</name> <message> - <location filename="../src/gui/accountmanager.cpp" line="356"/> + <location filename="../src/gui/accountmanager.cpp" line="353"/> <source>End to end encryption mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountmanager.cpp" line="357"/> + <location filename="../src/gui/accountmanager.cpp" line="354"/> <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source> <translation type="unfinished"/> </message> @@ -200,266 +241,277 @@ <context> <name>OCC::AccountSettings</name> <message> - <location filename="../src/gui/accountsettings.ui" line="14"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> - <location filename="../src/gui/accountsettings.ui" line="58"/> + <location filename="../src/gui/accountsettings.ui" line="190"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="79"/> + <location filename="../src/gui/accountsettings.ui" line="211"/> <source>Storage space: ...</source> <translation>儲存空間容量: ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="152"/> + <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> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="198"/> + <location filename="../src/gui/accountsettings.ui" line="77"/> <source>Synchronize all</source> <translation>全部同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="205"/> + <location filename="../src/gui/accountsettings.ui" line="84"/> <source>Synchronize none</source> <translation>全部不同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="212"/> + <location filename="../src/gui/accountsettings.ui" line="91"/> <source>Apply manual changes</source> <translation>套用手動改變</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="260"/> + <location filename="../src/gui/accountsettings.ui" line="139"/> <source>Apply</source> <translation>套用</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="247"/> - <location filename="../src/gui/accountsettings.cpp" line="733"/> - <location filename="../src/gui/accountsettings.cpp" line="1146"/> + <location filename="../src/gui/accountsettings.ui" line="126"/> + <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="1221"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../src/gui/accountsettings.ui" line="42"/> + <location filename="../src/gui/accountsettings.ui" line="174"/> <source>Connected with <server> as <user></source> <translation>以 <user> 的身分連接 <server></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="186"/> + <location filename="../src/gui/accountsettings.cpp" line="188"/> <source>No account configured.</source> <translation>沒有設置帳號。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="206"/> + <location filename="../src/gui/accountsettings.cpp" line="216"/> <source>Add new</source> <translation>新增</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="214"/> + <location filename="../src/gui/accountsettings.cpp" line="224"/> <source>Remove</source> <translation>移除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="218"/> + <location filename="../src/gui/accountsettings.cpp" line="228"/> <source>Account</source> <translation>帳號</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="234"/> + <location filename="../src/gui/accountsettings.cpp" line="238"/> + <source>This account supports end-to-end encryption</source> + <translation>此帳戶支援端點對端點加密</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="240"/> + <source>Enable encryption</source> + <translation>啟用加密</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="257"/> <source>Show E2E mnemonic</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="542"/> + <location filename="../src/gui/accountsettings.cpp" line="610"/> <source>Encrypt</source> + <translation>加密</translation> + </message> + <message> + <location filename="../src/gui/accountsettings.cpp" line="618"/> + <location filename="../src/gui/accountsettings.cpp" line="654"/> + <source>Edit Ignored Files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="583"/> + <location filename="../src/gui/accountsettings.cpp" line="658"/> <source>Choose what to sync</source> <translation>選擇要同步的項目</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="589"/> + <location filename="../src/gui/accountsettings.cpp" line="664"/> <source>Force sync now</source> <translation>強制同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="591"/> + <location filename="../src/gui/accountsettings.cpp" line="666"/> <source>Restart sync</source> <translation>重新啟動同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="600"/> + <location filename="../src/gui/accountsettings.cpp" line="675"/> <source>Remove folder sync connection</source> <translation>移除資料夾同步連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="671"/> + <location filename="../src/gui/accountsettings.cpp" line="746"/> <source>Folder creation failed</source> <translation>資料夾建立失敗</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="672"/> + <location filename="../src/gui/accountsettings.cpp" line="747"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>無法建立本地資料夾 <i>%1</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="725"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>Confirm Folder Sync Connection Removal</source> <translation>確認移除資料夾同步連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="732"/> + <location filename="../src/gui/accountsettings.cpp" line="807"/> <source>Remove Folder Sync Connection</source> <translation>移除資料夾同步連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="814"/> + <location filename="../src/gui/accountsettings.cpp" line="889"/> <source>Sync Running</source> <translation>正在同步中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="815"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <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="904"/> + <location filename="../src/gui/accountsettings.cpp" line="979"/> <source>%1 in use</source> <translation>%1 正在使用</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="931"/> + <location filename="../src/gui/accountsettings.cpp" line="1006"/> <source>%1 as <i>%2</i></source> <translation>%1 如 <i>%2<i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="937"/> + <location filename="../src/gui/accountsettings.cpp" line="1012"/> <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="939"/> + <location filename="../src/gui/accountsettings.cpp" line="1014"/> <source>Connected to %1.</source> <translation>已連線到 %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="941"/> + <location filename="../src/gui/accountsettings.cpp" line="1016"/> <source>Server %1 is temporarily unavailable.</source> <translation>伺服器 ％1 暫時無法使用。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="943"/> + <location filename="../src/gui/accountsettings.cpp" line="1018"/> <source>Server %1 is currently in maintenance mode.</source> <translation>伺服器 %1 現正處於維護模式</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="945"/> + <location filename="../src/gui/accountsettings.cpp" line="1020"/> <source>Signed out from %1.</source> <translation>從 %1 登出</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="954"/> + <location filename="../src/gui/accountsettings.cpp" line="1029"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="958"/> + <location filename="../src/gui/accountsettings.cpp" line="1033"/> <source>Connecting to %1...</source> <translation>正在連接到 ％1 ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="961"/> + <location filename="../src/gui/accountsettings.cpp" line="1036"/> <source>No connection to %1 at %2.</source> <translation>沒有從 %2 連線到 %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="993"/> + <location filename="../src/gui/accountsettings.cpp" line="1068"/> <source>Log in</source> <translation>登入</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1089"/> + <location filename="../src/gui/accountsettings.cpp" line="1164"/> <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="1091"/> + <location filename="../src/gui/accountsettings.cpp" line="1166"/> <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="1092"/> + <location filename="../src/gui/accountsettings.cpp" line="1167"/> <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="1138"/> + <location filename="../src/gui/accountsettings.cpp" line="1213"/> <source>Confirm Account Removal</source> <translation>確認移除帳號</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1139"/> + <location filename="../src/gui/accountsettings.cpp" line="1214"/> <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="1145"/> + <location filename="../src/gui/accountsettings.cpp" line="1220"/> <source>Remove connection</source> <translation>移除連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="526"/> - <location filename="../src/gui/accountsettings.cpp" line="579"/> + <location filename="../src/gui/accountsettings.cpp" line="594"/> + <location filename="../src/gui/accountsettings.cpp" line="651"/> <source>Open folder</source> <translation>開啟資料夾</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="210"/> - <location filename="../src/gui/accountsettings.cpp" line="995"/> + <location filename="../src/gui/accountsettings.cpp" line="220"/> + <location filename="../src/gui/accountsettings.cpp" line="1070"/> <source>Log out</source> <translation>登出</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Resume sync</source> <translation>繼續同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="597"/> + <location filename="../src/gui/accountsettings.cpp" line="672"/> <source>Pause sync</source> <translation>暫停同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="726"/> + <location filename="../src/gui/accountsettings.cpp" line="801"/> <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="891"/> + <location filename="../src/gui/accountsettings.cpp" line="966"/> <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="892"/> + <location filename="../src/gui/accountsettings.cpp" line="967"/> <source>%1 of %2 in use</source> <translation>已使用 %2 中的 %1%</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="901"/> + <location filename="../src/gui/accountsettings.cpp" line="976"/> <source>Currently there is no storage usage information available.</source> <translation>目前無法查詢儲存空間使用資訊。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="967"/> + <location filename="../src/gui/accountsettings.cpp" line="1042"/> <source>No %1 connection configured.</source> <translation>沒有 %1 連線設置。</translation> </message> @@ -517,58 +569,48 @@ <message> <location filename="../src/gui/activityitemdelegate.cpp" line="131"/> <source>%1</source> - <translation type="unfinished"/> + <translation>%1</translation> </message> <message> <location filename="../src/gui/activityitemdelegate.cpp" line="179"/> <source>More information</source> - <translation type="unfinished"/> + <translation>更多資訊</translation> </message> <message> <location filename="../src/gui/activityitemdelegate.cpp" line="180"/> <source>Accept</source> - <translation type="unfinished"/> + <translation>接受</translation> </message> <message> <location filename="../src/gui/activityitemdelegate.cpp" line="181"/> <source>Join</source> - <translation type="unfinished"/> + <translation>加入</translation> </message> <message> <location filename="../src/gui/activityitemdelegate.cpp" line="198"/> <source>Open Browser</source> - <translation type="unfinished"/> + <translation>開啟瀏覽器</translation> </message> </context> <context> <name>OCC::ActivityWidget</name> <message> - <location filename="../src/gui/activitywidget.ui" line="14"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.ui" line="84"/> - <source>TextLabel</source> - <translation>文字標籤</translation> - </message> - <message> <location filename="../src/gui/activitywidget.cpp" line="56"/> <source>Accept</source> - <translation type="unfinished"/> + <translation>接受</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="183"/> + <location filename="../src/gui/activitywidget.cpp" line="188"/> <source>Synced</source> - <translation type="unfinished"/> + <translation>已同步</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="218"/> + <location filename="../src/gui/activitywidget.cpp" line="223"/> <source>Retry all uploads</source> - <translation type="unfinished"/> + <translation>重試所有的上傳</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="333"/> + <location filename="../src/gui/activitywidget.cpp" line="338"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/> 帳號 %1 尚未啟用紀錄行為功能</translation> </message> @@ -588,7 +630,7 @@ <message> <location filename="../src/gui/addcertificatedialog.ui" line="35"/> <source>Certificate & Key (pkcs12) :</source> - <translation type="unfinished"/> + <translation>憑證與密鑰 (pkcs12) :</translation> </message> <message> <location filename="../src/gui/addcertificatedialog.ui" line="51"/> @@ -621,12 +663,12 @@ <message> <location filename="../src/gui/application.cpp" line="193"/> <source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source> - <translation type="unfinished"/> + <translation>存取設定檔%1時發生錯誤 請確定檔案可以被使用者存取</translation> </message> <message> <location filename="../src/gui/application.cpp" line="196"/> <source>Quit %1</source> - <translation type="unfinished"/> + <translation>離開 %1</translation> </message> </context> <context> @@ -655,7 +697,7 @@ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1020"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/> <source>Error writing metadata to the database</source> <translation>寫入後設資料(metadata) 時發生錯誤</translation> </message> @@ -663,12 +705,12 @@ <context> <name>OCC::ClientSideEncryption</name> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="993"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="999"/> <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source> - <translation type="unfinished"/> + <translation>請輸入您的端點對端點加密的認證資訊<br><br>User: %2<br>Account: %3<br></translation> </message> <message> - <location filename="../src/libsync/clientsideencryption.cpp" line="1001"/> + <location filename="../src/libsync/clientsideencryption.cpp" line="1007"/> <source>Enter E2E passphrase</source> <translation type="unfinished"/> </message> @@ -723,6 +765,59 @@ </message> </context> <context> + <name>OCC::Flow2Auth</name> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="72"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="141"/> + <source>Error returned from the server: <em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="75"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="144"/> + <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="78"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="147"/> + <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/creds/flow2auth.cpp" line="81"/> + <location filename="../src/gui/creds/flow2auth.cpp" line="150"/> + <source>The reply from the server did not contain all expected fields</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthCredsPage</name> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="46"/> + <source>Connect to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="47"/> + <source>Login in your browser (Login Flow v2)</source> + <translation type="unfinished"/> + </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"/> + </message> +</context> +<context> + <name>OCC::Flow2AuthWidget</name> + <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"/> + </message> +</context> +<context> <name>OCC::Folder</name> <message> <location filename="../src/gui/folder.cpp" line="141"/> @@ -740,118 +835,119 @@ <translation>%1 是不可讀的</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="371"/> + <location filename="../src/gui/folder.cpp" line="375"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 已被移除。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="378"/> + <location filename="../src/gui/folder.cpp" line="382"/> <source>%1 has been downloaded.</source> <comment>%1 names a file.</comment> <translation>%1 已被下載。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="385"/> + <location filename="../src/gui/folder.cpp" line="389"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 已被更新。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="392"/> + <location filename="../src/gui/folder.cpp" line="396"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 已被重新命名為 %2。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="399"/> + <location filename="../src/gui/folder.cpp" line="403"/> <source>%1 has been moved to %2.</source> <translation>%1 已被搬移至 %2。</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="369"/> + <location filename="../src/gui/folder.cpp" line="373"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 跟 %n 其他檔案已經被刪除</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="376"/> + <location filename="../src/gui/folder.cpp" line="380"/> <source>%1 and %n other file(s) have been downloaded.</source> <translation><numerusform>%1 跟 %n 其他檔案已經被下載</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="383"/> + <location filename="../src/gui/folder.cpp" line="387"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 跟 %n 其他檔案已經被修改</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="390"/> + <location filename="../src/gui/folder.cpp" line="394"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>%1 已被改名為 %2 並且 %n其他檔案已被改名</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="397"/> + <location filename="../src/gui/folder.cpp" line="401"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>%1 已被搬移到%2 並且 %n 其他檔案已經被搬移</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="404"/> + <location filename="../src/gui/folder.cpp" line="408"/> <source>%1 has and %n other file(s) have sync conflicts.</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>%1 跟 %n 其他檔案同步時發生衝突</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="406"/> + <location filename="../src/gui/folder.cpp" line="410"/> <source>%1 has a sync conflict. Please check the conflict file!</source> - <translation type="unfinished"/> + <translation>%1 同步時發生衝突，請檢查發生衝突的檔案</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="411"/> + <location filename="../src/gui/folder.cpp" line="415"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>%1 與%n 其他檔案因為錯誤無法被同步。請從紀錄檔觀看細節。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="413"/> + <location filename="../src/gui/folder.cpp" line="417"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 因為錯誤無法被同步。請從紀錄檔觀看細節。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="421"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>Sync Activity</source> <translation>同步活動</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="632"/> + <location filename="../src/gui/folder.cpp" line="636"/> <source>Could not read system exclude file</source> <translation>無法讀取系統的排除檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="953"/> + <location filename="../src/gui/folder.cpp" line="957"/> <source>A new folder larger than %1 MB has been added: %2. </source> - <translation type="unfinished"/> + <translation>一個大於%1MB的資料夾已被新增至:%2 +</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="956"/> + <location filename="../src/gui/folder.cpp" line="960"/> <source>A folder from an external storage has been added. </source> - <translation type="unfinished"/> + <translation>一個來自外部空間的資料夾已被新增</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="957"/> + <location filename="../src/gui/folder.cpp" line="961"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1012"/> + <location filename="../src/gui/folder.cpp" line="1016"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1015"/> + <location filename="../src/gui/folder.cpp" line="1019"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1026"/> + <location filename="../src/gui/folder.cpp" line="1030"/> <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). @@ -860,7 +956,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1071"/> + <location filename="../src/gui/folder.cpp" line="1075"/> <source>All files in the sync folder '%1' folder 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 keep the files, they will be re-synced with the server if you have rights to do so. @@ -868,48 +964,48 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1080"/> + <location filename="../src/gui/folder.cpp" line="1084"/> <source>Download new files?</source> - <translation type="unfinished"/> + <translation>下載新檔案?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1083"/> + <location filename="../src/gui/folder.cpp" line="1087"/> <source>Download new files</source> - <translation type="unfinished"/> + <translation>下載新檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1084"/> + <location filename="../src/gui/folder.cpp" line="1088"/> <source>Keep local files</source> <translation>保留本地檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1076"/> + <location filename="../src/gui/folder.cpp" line="1080"/> <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1101"/> + <location filename="../src/gui/folder.cpp" line="1105"/> <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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1106"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>Backup detected</source> - <translation type="unfinished"/> + <translation>偵測到備份</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1113"/> <source>Normal Synchronisation</source> - <translation type="unfinished"/> + <translation>普通同步</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1110"/> + <location filename="../src/gui/folder.cpp" line="1114"/> <source>Keep Local Files as Conflict</source> - <translation type="unfinished"/> + <translation>將本地檔案視為衝突檔案</translation> </message> </context> <context> @@ -957,7 +1053,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderman.cpp" line="1220"/> <source>Sync was successful, unresolved conflicts.</source> - <translation type="unfinished"/> + <translation>同步成功，衝突未解決</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1222"/> @@ -1002,7 +1098,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderman.cpp" line="1318"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> - <translation type="unfinished"/> + <translation>此資料夾已與Server設定同步，請選擇其他資料夾</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1298"/> @@ -1023,12 +1119,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>新增資料夾同步功能的連線</translation> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="255"/> - <source>Synchronized with local folder</source> - <translation>已與本地檔案同步</translation> + <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/> + <source>Synchronized with local folder (%1)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusdelegate.cpp" line="302"/> + <location filename="../src/gui/folderstatusdelegate.cpp" line="303"/> <source>File</source> <translation>檔案</translation> </message> @@ -1058,7 +1154,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>從伺服器端同步資料夾清單時發生錯誤。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="237"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="239"/> <source>Signed out</source> <translation>已登出</translation> </message> @@ -1070,110 +1166,110 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> <source>There are unresolved conflicts. Click for details.</source> - <translation type="unfinished"/> + <translation>存在未解決的衝突，請查看細節</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="932"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="967"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>同步 %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>下載 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1008"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>上傳 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="919"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="921"/> <source>Checking for changes in remote '%1'</source> - <translation type="unfinished"/> + <translation>檢查遠端 '%1' 的變動</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="923"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="925"/> <source>Checking for changes in local '%1'</source> - <translation type="unfinished"/> + <translation>檢查本地 '%1' 的變動</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <source>↓ %1/s</source> - <translation type="unfinished"/> + <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/> <source>↑ %1/s</source> - <translation type="unfinished"/> + <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 的 %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1039"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> - <translation type="unfinished"/> + <translation>剩餘%5，%1 的 %2, 檔案 %3 的 %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1047"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 的 %2, 檔案 %3 的 %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1054"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/> <source>file %1 of %2</source> <translation>檔案 %1 的 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1100"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> <source>Waiting...</source> <translation>等待中...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>正在等候 %n 的資料夾(可能不只一個)</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1108"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/> <source>Preparing to sync...</source> <translation>正在準備同步...</translation> </message> @@ -1304,14 +1400,9 @@ Continuing the sync as normal will cause all your files to be overwritten by an <context> <name>OCC::GeneralSettings</name> <message> - <location filename="../src/gui/generalsettings.ui" line="14"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Legal notice</source> - <translation type="unfinished"/> + <translation>法律提示</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="66"/> @@ -1336,7 +1427,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.ui" line="195"/> <source>Ask for confirmation before synchronizing folders larger than</source> - <translation type="unfinished"/> + <translation>先詢問，當要同步的資料夾大小超過</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="215"/> @@ -1347,7 +1438,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.ui" line="239"/> <source>Ask for confirmation before synchronizing external storages</source> - <translation type="unfinished"/> + <translation>在與外部儲存空間同步時先詢問</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="82"/> @@ -1393,7 +1484,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/generalsettings.cpp" line="49"/> <source>Server notifications that require attention.</source> - <translation type="unfinished"/> + <translation>伺服器公告，請注意</translation> </message> </context> <context> @@ -1401,14 +1492,16 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/socketapi.cpp" line="520"/> <source>Sharing error</source> - <translation type="unfinished"/> + <translation>分享發生錯誤</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="521"/> <source>Could not retrieve or create the public link share. Error: %1</source> - <translation type="unfinished"/> + <translation>無法取回或生成公開分享連結。錯誤: + +%1</translation> </message> </context> <context> @@ -1416,7 +1509,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <message> <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="100"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> - <translation type="unfinished"/> + <translation>請輸入%1 密碼:<br><br>使用者: %2<br>帳戶: %3<br></translation> </message> <message> <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="114"/> @@ -1457,81 +1550,77 @@ Continuing the sync as normal will cause all your files to be overwritten by an <translation>根據模式套用什麼檔案要被忽略</translation> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="119"/> - <source>Add</source> - <translation>增加</translation> + <location filename="../src/gui/ignorelisteditor.cpp" line="40"/> + <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> + <translation>這個項目是由系統提供在 '%1' 且不能在這個頁面被修改</translation> </message> +</context> +<context> + <name>OCC::IgnoreListTableWidget</name> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="126"/> - <source>Remove all</source> + <location filename="../src/gui/ignorelisttablewidget.ui" line="14"/> + <source>IgnoreListTableWidget</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="93"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="33"/> <source>Pattern</source> - <translation>模式</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="98"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="38"/> <source>Allow Deletion</source> - <translation>允許刪除</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="49"/> + <source>Add</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.ui" line="109"/> + <location filename="../src/gui/ignorelisttablewidget.ui" line="59"/> <source>Remove</source> - <translation>移除</translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/ignorelisttablewidget.ui" line="66"/> + <source>Remove all</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="42"/> + <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>檔案或是資料夾符合模式的話將不會被同步。 - -當資料夾被移除時，會根據清單裡的允許刪除選項來避免那些檔案會被移除。而這對元資料是有用的。</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="133"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/> <source>Could not open file</source> - <translation>無法開啟檔案</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="134"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/> <source>Cannot write changes to '%1'.</source> - <translation>%1 無法寫入變更。</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="159"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="112"/> <source>Add Ignore Pattern</source> - <translation>增加忽略格式</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="160"/> + <location filename="../src/gui/ignorelisttablewidget.cpp" line="113"/> <source>Add a new ignore pattern:</source> - <translation>增加一個新的忽略格式:</translation> - </message> - <message> - <location filename="../src/gui/ignorelisteditor.cpp" line="46"/> - <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source> - <translation>這個項目是由系統提供在 '%1' 且不能在這個頁面被修改</translation> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::LegalNotice</name> <message> - <location filename="../src/gui/legalnotice.ui" line="14"/> - <source>Dialog</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/legalnotice.ui" line="26"/> <source>Legal notice</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/legalnotice.ui" line="36"/> - <source>TextLabel</source> - <translation type="unfinished"/> + <translation>法律提示</translation> </message> <message> <location filename="../src/gui/legalnotice.ui" line="58"/> @@ -1541,7 +1630,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/legalnotice.cpp" line="27"/> <source><p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></source> - <translation type="unfinished"/> + <translation><p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></translation> </message> <message> <location filename="../src/gui/legalnotice.cpp" line="30"/> @@ -1569,7 +1658,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/logbrowser.cpp" line="89"/> <source>&Capture debug messages</source> - <translation type="unfinished"/> + <translation>&擷取除錯訊息</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="101"/> @@ -1663,11 +1752,6 @@ Logs will be written to %1</source> <context> <name>OCC::NetworkSettings</name> <message> - <location filename="../src/gui/networksettings.ui" line="14"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> <location filename="../src/gui/networksettings.ui" line="23"/> <source>Proxy Settings</source> <translation>代理伺服器設定</translation> @@ -1773,7 +1857,7 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/creds/oauth.cpp" line="112"/> <source>Error returned from the server: <em>%1</em></source> - <translation type="unfinished"/> + <translation>伺服器回覆錯誤:<em>%1</em></translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="115"/> @@ -1793,7 +1877,7 @@ Logs will be written to %1</source> <message> <location filename="../src/gui/creds/oauth.cpp" line="125"/> <source><h1>Login Error</h1><p>%1</p></source> - <translation type="unfinished"/> + <translation><h1>登入錯誤</h1><p>%1</p></translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="131"/> @@ -1978,11 +2062,6 @@ for additional privileges during the process.</source> <source>Login in your browser</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> - <source>Copy link to clipboard</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::OwncloudSetupPage</name> @@ -2034,12 +2113,12 @@ It is not advisable to use it.</source> <translation>下一步 (&N) ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="281"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="283"/> <source>Invalid URL</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="403"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="412"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"/> </message> @@ -2117,79 +2196,79 @@ It is not advisable to use it.</source> <translation>無法建立本地資料夾 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="489"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="523"/> <source>No remote folder specified!</source> <translation>沒有指定遠端資料夾!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="495"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/> <source>Error: %1</source> <translation>錯誤： %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> <source>creating folder on Nextcloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="558"/> <source>Remote folder %1 created successfully.</source> <translation>遠端資料夾%1建立成功!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="526"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="560"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>遠端資料夾%1已存在,連線同步中</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="562"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>在HTTP建立資料夾失敗, error code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="532"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="566"/> <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="536"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="570"/> <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="541"/> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="575"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/> <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="559"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="593"/> <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="564"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="598"/> <source>Successfully connected to %1!</source> <translation>成功連接到 %1 ！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="605"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>無法建立連線%1, 請重新檢查</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="619"/> <source>Folder rename failed</source> <translation>重新命名資料夾失敗</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/> <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="633"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>本地同步資料夾 %1 建立成功!</b></font></translation> </message> @@ -2197,12 +2276,12 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="89"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="93"/> <source>%1 Connection Wizard</source> <translation>%1連線精靈</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="98"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="102"/> <source>Skip folders configuration</source> <translation>忽略資料夾設定資訊</translation> </message> @@ -2236,7 +2315,7 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="972"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="973"/> <source>Error writing metadata to the database</source> <translation>寫入後設資料(metadata) 時發生錯誤</translation> </message> @@ -2264,32 +2343,32 @@ It is not advisable to use it.</source> <translation>可用的硬碟空間已經少於 %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="602"/> + <location filename="../src/libsync/propagatedownload.cpp" line="608"/> <source>File was deleted from server</source> <translation>檔案已從伺服器被刪除</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="655"/> + <location filename="../src/libsync/propagatedownload.cpp" line="661"/> <source>The file could not be downloaded completely.</source> <translation>檔案下載無法完成。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="662"/> + <location filename="../src/libsync/propagatedownload.cpp" line="668"/> <source>The downloaded file is empty despite that the server announced it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="847"/> + <location filename="../src/libsync/propagatedownload.cpp" line="853"/> <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="882"/> + <location filename="../src/libsync/propagatedownload.cpp" line="888"/> <source>File has changed since discovery</source> <translation>尋找的過程中檔案已經被更改</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="938"/> + <location filename="../src/libsync/propagatedownload.cpp" line="944"/> <source>Error writing metadata to the database</source> <translation>寫入後設資料(metadata) 時發生錯誤</translation> </message> @@ -2302,7 +2381,7 @@ It is not advisable to use it.</source> <translation>; 重新儲存失敗 %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="301"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> <source>A file or folder was removed from a read only share, but restoring failed: %1</source> <translation>檔案或目錄已經從只供讀取的分享中被移除，但是復原失敗: %1</translation> </message> @@ -2434,27 +2513,27 @@ It is not advisable to use it.</source> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="403"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="404"/> <source>The local file was removed during sync.</source> <translation>本地端的檔案在同步過程中被刪除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="414"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="415"/> <source>Local file changed during sync.</source> <translation>本地端的檔案在同步過程中被更改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="448"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="449"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="455"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="456"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="469"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="470"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -2663,22 +2742,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareLinkWidget</name> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="46"/> + <location filename="../src/gui/sharelinkwidget.ui" line="171"/> <source>&Share link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="128"/> + <location filename="../src/gui/sharelinkwidget.ui" line="51"/> <source>Password:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="168"/> + <location filename="../src/gui/sharelinkwidget.ui" line="239"/> <source>Expiration date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.ui" line="236"/> + <location filename="../src/gui/sharelinkwidget.ui" line="112"/> <source>TextLabel</source> <translation>文字標籤</translation> </message> @@ -2751,22 +2830,22 @@ It is not advisable to use it.</source> <context> <name>OCC::ShareUserGroupWidget</name> <message> - <location filename="../src/gui/shareusergroupwidget.ui" line="52"/> + <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="238"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="259"/> <source>Copy link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="248"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="269"/> <source>No results for '%1'</source> <translation>'%1' 沒有結果</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="335"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="356"/> <source>I shared something with you</source> <translation type="unfinished"/> </message> @@ -2784,22 +2863,27 @@ It is not advisable to use it.</source> <translation>可編輯</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="364"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="385"/> <source>Can reshare</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="374"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="395"/> + <source>Unshare</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/shareusergroupwidget.cpp" line="404"/> <source>Can create</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="380"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="410"/> <source>Can change</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="386"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="416"/> <source>Can delete</source> <translation type="unfinished"/> </message> @@ -2826,7 +2910,7 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/> - <source>SSL Chipher Debug View</source> + <source>SSL Cipher Debug View</source> <translation type="unfinished"/> </message> <message> @@ -3012,11 +3096,6 @@ It is not advisable to use it.</source> <context> <name>OCC::SslErrorDialog</name> <message> - <location filename="../src/gui/sslerrordialog.ui" line="14"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> <location filename="../src/gui/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> <translation>信任此憑證</translation> @@ -3045,44 +3124,49 @@ It is not advisable to use it.</source> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="180"/> - <location filename="../src/gui/sslerrordialog.cpp" line="200"/> + <location filename="../src/gui/sslerrordialog.cpp" line="205"/> <source>Organization: %1</source> <translation>組織:%1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="181"/> - <location filename="../src/gui/sslerrordialog.cpp" line="201"/> + <location filename="../src/gui/sslerrordialog.cpp" line="206"/> <source>Unit: %1</source> <translation>單位:%1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="182"/> - <location filename="../src/gui/sslerrordialog.cpp" line="202"/> + <location filename="../src/gui/sslerrordialog.cpp" line="207"/> <source>Country: %1</source> <translation>國家:%1</translation> </message> <message> <location filename="../src/gui/sslerrordialog.cpp" line="189"/> - <source>Fingerprint (MD5): <tt>%1</tt></source> - <translation>指紋 (MD5): &lt;tt&gt;%1&lt;/tt&gt;</translation> - </message> - <message> - <location filename="../src/gui/sslerrordialog.cpp" line="190"/> <source>Fingerprint (SHA1): <tt>%1</tt></source> <translation>指紋 (SHA1): &lt;tt&gt;%1&lt;/tt&gt;</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="192"/> + <location filename="../src/gui/sslerrordialog.cpp" line="194"/> + <source>Fingerprint (SHA-256): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="195"/> + <source>Fingerprint (SHA-512): <tt>%1</tt></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/sslerrordialog.cpp" line="197"/> <source>Effective Date: %1</source> <translation>有效日期:%1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="193"/> + <location filename="../src/gui/sslerrordialog.cpp" line="198"/> <source>Expiration Date: %1</source> <translation>到期日: %1</translation> </message> <message> - <location filename="../src/gui/sslerrordialog.cpp" line="197"/> + <location filename="../src/gui/sslerrordialog.cpp" line="202"/> <source>Issuer: %1</source> <translation>簽發者: %1</translation> </message> @@ -3373,11 +3457,11 @@ It is not advisable to use it.</source> <name>OCC::Theme</name> <message> <location filename="../src/libsync/theme.cpp" line="344"/> - <source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source> - <translation><p>版本 %1. 如欲得知更多資訊，請到此拜訪 <a href='%2'>%3</a>.</p></translation> + <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="349"/> + <location filename="../src/libsync/theme.cpp" line="348"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -3385,25 +3469,25 @@ It is not advisable to use it.</source> <context> <name>OCC::WebEnginePage</name> <message> - <location filename="../src/gui/wizard/webview.cpp" line="199"/> + <location filename="../src/gui/wizard/webview.cpp" line="201"/> <source>Invalid certificate detected</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/webview.cpp" line="200"/> - <source>The host "%1" provided an invalid certitiface. Continue?</source> + <location filename="../src/gui/wizard/webview.cpp" line="202"/> + <source>The host "%1" provided an invalid certificate. Continue?</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::WebFlowCredentials</name> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="124"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="162"/> <source>You have been logged out of %1 as user %2. Please login again</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/webflowcredentials.cpp" line="141"/> + <location filename="../src/gui/creds/webflowcredentials.cpp" line="179"/> <source>Please login with the user: %1</source> <translation type="unfinished"/> </message> @@ -3471,11 +3555,6 @@ It is not advisable to use it.</source> <translation>設定…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="782"/> - <source>Details...</source> - <translation>細節…</translation> - </message> - <message> <location filename="../src/gui/owncloudgui.cpp" line="788"/> <source>Help</source> <translation>說明</translation> @@ -3587,6 +3666,11 @@ It is not advisable to use it.</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> + <source>View more activity...</source> + <translation type="unfinished"/> + </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> @@ -3646,23 +3730,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudAdvancedSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="20"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="100"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="205"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="235"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="294"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="395"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="421"/> - <source>TextLabel</source> - <translation>文字標籤</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/> <source>Server</source> <translation>伺服器</translation> @@ -3704,11 +3771,6 @@ It is not advisable to use it.</source> <translation>本地資料夾 (&L)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/> - <source>pbSelectLocalFolder</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/> <source>&Keep local data</source> <translation>保留本地資料 (&K)</translation> @@ -3727,11 +3789,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudHttpCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="14"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/> <source>&Username</source> <translation>使用者名稱 (&U)</translation> @@ -3745,11 +3802,6 @@ It is not advisable to use it.</source> <context> <name>OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="14"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> <translation type="unfinished"/> @@ -3764,21 +3816,15 @@ It is not advisable to use it.</source> <source>Re-open Browser</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/> + <source>Copy link</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="38"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="97"/> - <source>TextLabel</source> - <translation>文字標籤</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="66"/> <source><a href="https://docs.nextcloud.com/server/15/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a></source> <translation type="unfinished"/> @@ -3812,26 +3858,10 @@ It is not advisable to use it.</source> <context> <name>OwncloudWizardResultPage</name> <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="14"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="20"/> - <source>TextLabel</source> - <translation>文字標籤</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/> <source>Your entire account is synced to the local folder </source> <translation>您整個帳號的資料會與本地資料夾同步</translation> </message> - <message> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/> - <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="120"/> - <source>PushButton</source> - <translation>按鈕</translation> - </message> </context> <context> <name>QObject</name> @@ -3886,7 +3916,7 @@ It is not advisable to use it.</source> <translation>前一段時間</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="153"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -3969,14 +3999,6 @@ It is not advisable to use it.</source> </message> </context> <context> - <name>WebView</name> - <message> - <location filename="../src/gui/wizard/webview.ui" line="26"/> - <source>Form</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>main.cpp</name> <message> <location filename="../src/gui/main.cpp" line="39"/> |
