diff options
66 files changed, 3488 insertions, 4588 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 1654bd804..000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,1426 +0,0 @@ -Changelog for ownCloud Desktop Client [unreleased] (UNRELEASED) -======================================= -The following sections list the changes in ownCloud Desktop Client unreleased relevant to -ownCloud admins and users. - - - -Summary -------- - -* Change - Allow OpenID Connect authentication without a .well-known configuration: [#7681](https://github.com/owncloud/client/pull/7681) - -Details -------- - -* Change - Allow OpenID Connect authentication without a .well-known configuration: [#7681](https://github.com/owncloud/client/pull/7681) - - A user might not want to provide .well-known/openid-configuration. The new changes enable us - to authenticate with OpenID Connect without it, by directly compiling the required urls into - the client. - - https://github.com/owncloud/client/pull/7681 - -ChangeLog -========= -version 2.6.1 (2020-01-17) -(last updated on de0d330c002436454f3fe4929bd707e5f0425949) - -Changes: -* GUI: Change the display name to "server (user name)", show the full text in the tooltip (#6728) -* GUI: Add quit button to the settings dialog (#7547) -* GUI: Show a warning that proxy settings do not apply to localhost (#7169) -* CLI: Make it possible to show settings/quit by command line invocation (#7018, #7547) -* Linux: Add action to Desktop file to show settings, quit the client (#7018, #7547) - -Bugfixes: -* Sync: Correctly sync files on Windows after they got unlocked (owncloud/enterprise#3609) -* Log: Message priority wasn't handled correctly so the console log was flooded(#7453) -* Vfs: Do not overwrite existing files by placeholder (#7557, #7556) -* Discovery: Allow more HTTP error code to be treated as ignored dir (#7586) -* GUI: Limit the clickable region of the 'add folder' button (#7326) -* GUI: Don't show the "All files deleted" popup when unselecting everything with selective sync (#7337) -* GUI: Don't put a too big icon in about dialog (#7574) -* Shell Integration: Don't assume read-only folder when permissions are not known (#7330) -* Sync: Temporary disable http2 support by default again (#7610) -* Windows Installer: Remember install location on auto update (#7580) - -version 2.6.0 (2019-11-11) -(last update on 5131f50ff048d5213aa69edfbae349de2822498a) - -Major changes and additions: -* Rewrote discovery code for performance improvements and better maintainability. -* Tech Preview: Add native virtual files mode for Windows 10. - (https://github.com/owncloud/client/wiki/Virtual-Files-on-Windows-10) -* Tech Preview: Improvements and fixes for all virtual files mode - (https://github.com/owncloud/client/wiki/Virtual-Files) -* Add basic support for libcloudproviders for gtk/gnome integration (#7209) -* Remove support for Shibboleth auth, please use OAuth2 server app (#6451) - -Some small changes and bug fixes: -* Sync: Better detection of complex renames -* Sync: Add workarounds so HTTP2 may be enabled with Qt >=5.12.4 (#7092, #7174) -* Sync: When propagating new remote directories, set local mtime to server mtime (#7119) -* Sync: Add support for asynchronous upload operations (core#31851) -* Sync: Handle blacklisted_files server capability (#434) -* Sync: Fix downloading of files when the database is used for local discovery -* Sync: Fix sync progress when virtual files are created (#6933) -* Sync: Fix issue with a folder being renamed into another renamed folder (#6694) -* Sync: Reduce client-triggered touch ignore duration from 15s to 3s -* Sync: Fix file attribute propagation when propagating conflicts -* Sync: Fix local discovery when removing a selective sync exclusion -* Sync: Fix detection of case-only renames on Windows -* Sync: Fix race conditions in the linux folder watcher (#7068) -* Sync: Fix issue with special characters in the filename and chunked uploads (#7176) -* Sync: Fix renaming a single file causing the "all files deleted" popup (#7204) -* Sync: Reduce memory use during uploads by not reading whole chunks to memory (#7226) -* Sync: Don't abort on 404, 500, 503 errors (#5088, #5859, #7199) -* Sync: Fix parsing of etags, improving move detection (#7271, #7345) -* Sync: If a move is forbidden, restore the source (#7410) -* Sync: When moving is allowed but deleting is not, do not restore moved items (#7293) -* Sync: Fix delete-before-rename bug (#7441) -* Sync: Delay job execution a bit (#7439) -* Sync: Make sure we schedule only one job (#7439) -* Sync: PropagateDownload: Don't try to open readonly temporaries (#7419) -* Sync: Don't fatal on "Storage temporarily unavailable" (#5088) -* Experimental: Add capability to sync file deltas. (#179) (https://github.com/owncloud/client/wiki/DeltaSync) -* Vfs: The online-only/available-locally flag applies to new remote files now. -* Vfs: Introduce actions and warning text for switching vfs on and off. -* Vfs: Cannot be used with selective sync at the same time. -* Vfs: Can now be fully enabled or disabled. -* Vfs: Suffix mode ignores remote files with the suffix (#6953) -* Vfs: Fix behavior when file is renamed and suffix is added/removed at the same time (#7001) -* Vfs: Improve notifications for file creation actions (#7101) -* Vfs: Improve user-visible aspects of pinning and availability (#7111) -* Vfs: Add note about which plugin is in use to about dialog (#7137) -* Vfs: Fix reliability of "Download file" context menu action (#7124) -* Vfs: Fix crash when dehydrating a complete folder -* Vfs: Make "Free space" context menu action only enabled when it has an effect (#7143) -* Vfs: Ensure the database temporaries are marked as excluded (#7141) -* Vfs: Don't dehydrate existing data when switching on (#7302) -* Vfs: Fix move detection when virtual files are involved (#7001) -* Vfs: Lots of tests and corrections for suffix edge cases (#7350, #7261) -* GUI: Adjust "new public link share" ui so options can be set before share creation -* GUI: Added action to open folder in browser to selective sync context menu (#6471) -* GUI: Add server version info to SSL info button (#6628) -* GUI: Allow log window of running client to be opened via command line -* GUI: Introduce conflict resolution actions to right-click menu of conflicts and files in read-only directories (#6252) -* GUI: Update sooner when user resolves a conflict (#7073) -* GUI: Improve error message for missing data in server replies (#7112) -* GUI: Remove log window, instead focus on easy handling of log files (#6475) -* GUI: Fix notification buttons sometimes getting their own window (#7185) -* GUI: Notifications: Remove do-nothing "OK" button (#7355) -* GUI: Add "Show file versions" context menu action (#7196) -* GUI: Fix layout in "Add Certificate" dialog (#7184) -* GUI: Fix duplicated error message for fatal errors (#5088) -* GUI: Fix selective sync ui initial state after account creation (#7336) -* GUI: Improve help text in ignore editor (#7162) -* GUI: Show restoration items in protocol -* Sharing: Fix issues with enforced passwords and expiry (#7246, #7245) -* Sharing: Fix resharing an item in a share with limited permissions (#7275) -* Sharing: Use the default expiration date even when not enforced (#7256) -* Sharing: When sharing from context menu, show dialog if share creation fails (#7286) -* Sharing: Always show at least readonly permissions (#7429) -* OSX: Fix issues with Finder integration being gone after reboot -* OSX: Use the same implementation as on Linux/Windows for the settings dialog (#7371) -* Linux: Add autostart delay to avoid tray icon issues (#6518) -* Folder watcher: Test before relying on it (#7241) -* Client certs: Fix storage of large certs in older Windows versions (#6776) -* Updater: Show a nicer version string In the "available update" notification (#6602) -* Updater: Set correct state on network error (#3933) -* Updater: Provide more useful options on update failure (#7217) -* Updater: Improve logging (#3475, #7388) -* Updater: Fix Version numer not shown in the user visible string (#7288) -* DB: Database path for new folders now starts with ".sync_", avoiding the "._" (#5904) -* File hashes: Add support for SHA256 and SHA3 -* Cmd: Respect chunk sizing environment variables (#7078) -* Log: Don't write to logdir if --logfile is passed (#6909) -* Log: Make --logfile - work on Windows -* Log: Make --logdir compress logs reliably (#7353) -* Log: Print critical and fatal messages to stderr -* Doc: Migrate the documentation to Antora (#6785) -* Doc: Update Windows build instructions -* Doc: Add explanation of how to manually change server url (#6579) -* Doc: List more environment variables -* Doc: List more config file options (owncloud/docs#1365) -* Build: Fix KDEInstallDirs deprecation warnings (#6922) -* Build: Fixes for compiling on "remarkable" tablet (#6870) -* Build: Add PLUGINDIR variable for finding vfs plugins (#7027) -* Build: Drone (#7426) -* Build: Remove 'binary' submodule, remove outdated VS projects -* Translations: Change the way we pull in translations (#7426) -* Remove the WebKit dependency (#6451) -* Several performance optimizations -* Update SQLite3 to 3.27.2 (if bundled) -* Many test improvements (like #6358) - -version 2.5.4 (2019-03-19) -* Crash fix: Infinite recursion for bad paths on Windows (#7041) -* Crash fix: SocketApi mustn't send if readyRead happens after disconnected (#7044) -* Fix rare error causing spurious local deletes (#6677) -* Disable HTTP2 support due to bugs in Qt 5.12.1 (#7020, QTBUG-73947) -* Fix loading of persisted cookies when loading accounts (#7054) -* Windows: Fix breaking of unrelated explorer actions (#7004, #7023) -* Windows: Forbid syncing of files with bytes 0x00 to 0x1F in filenames (#6987) -* macOS: Opt out of dark mode until problems can be addressed (#7043) -* macOS: Fix folder dehydration requests (#6977) -* Linux: Tray: Try to establish tray after 10s if failed initially (#6518) -* Linux: FolderWatcher: Work around missing notifications (#7068) -* Shares: "copy link" action can create shares with expiry (#7061) -* Selective sync: Don't collapse folder tree when changing selection (#7055) -* Client cert dialog: Avoid incorrect behavior due to multiple signal connections - -version 2.5.3 (2019-02-07) -* Connectivity: Add a noUnauthedRequests branding option -* Credentials: Warn in log if keychain-write jobs fail (#6776) -* Database: Move drop-index to after pragmas are set (#6881) -* Download: Ignore Content-length for compressed HTTP2/SPDY replies (#6885) - -version 2.5.2 (2019-01-25) -* Crash fix: macOS: When opening settings dialog (#6930) -* Crash fix: macOS: While app is in background -* Crash fix: When deleting an account (#6893) -* Crash fix: During password dialog -* SyncJournalDB: Change sqlite3 locking_mode to "exclusive" (#6881) -* Wizard: Fix setting up accounts with SSL client certs (#6911) -* Sync: Fix duplicate slashes in destination of MOVE operation (#6904) -* Sync: Fix file unlocking triggering too many syncs (#6822) -* GUI: Increase default size of ignore list editor (#6641) -* GUI: Fix background color of SSL info button (#871) -* GUI: Ctrl-L and Cmd-L open the log window (F12 is sometimes taken) -* Vfs: Fix problem with dehydrating a file on OSX (#6844) -* Vfs: Do not show settings window when opening a virtual file (#6764) -* Settings: Fix lookup of system override settings (e.g. from HKEY_LOCAL_MACHINE) -* macOS: New "make macdeployqt" target instead of deploying Qt on "make install" - -version 2.5.1 (2018-11-09) -* OAuth2: Refresh the token without aborting the sync (#6814) -* OAuth2: Fix migration from BasicAuth when the server uses LDAP -* Linux: FolderWatcher: fix paths after dir renames (#6808) -* Sync: Always recurse within touched directory (#6804) -* Sync: Fixed crash when aborting sync of large files with older servers -* Sync: Don't error out if X-OC-MTime header is missing (#6797) -* Sync: Fix memory leak during upload (#6699) -* Sync: Server Move: Fix too many starting slashes in the destination header (#6824) -* Sync: Windows: Don't check if a server file name can be encoded (#6810) -* Virtual Files: Renaming a virtual files also rename the file on the server (#6718) -* Virtual Files: Disable the 'choose what to sync' in the new folder wizard when virtual files are selected -* Account Settings: Add a context menu entry to enable or disable virtual files (#6725) -* Account Settings: Fix progress being written in white when there are errors -* Account Settings: Link to about dialog from old about space in General Settings -* GUI: Plug a few smaller memory leaks -* Wizard: Reset the QSslConfiguration before checking the server (#6832) -* Wizard: Manual folder configuration should not create the local folder (#6853) -* Windows Shell Integration: No limit on the amount of selected files (#6780) -* Windows Shell Integration: Make OCUtil helper lib static and link it statically against crt -* Windows: Disable autostartCheckBox if autostart is configured system wide (#6816) -* Windows: Make qFatal() trigger the crash reporter on Windows (#6823) -* macOS: Fix icon name in Info.plist -* macOS: Do not select ownCloud in Finder after installation (#6781) -* macOS: Improve macdeployqt.py -* Discovery: Include path in error message (#6826) -* Database: Allow downgrade from 2.6 -* Migration from 2.4: fallback to move file by file if directory move failled (#6807) -* owncloudcmd: Read server version and dav user id from the server (#6830) - -version 2.5.0 (2018-09-18) -* Local discovery: Speed up by skipping directories without changes reported by the file system watcher. -* Experimental option to create virtual files (e.g. my_document.txt.owncloud) and download contents on demand ("placeholders") -* Windows: Add sync folders to Explorer's navigation pane (#5295) -* Config: Client configuration in roaming profile on Windows, XDG conform on Linux (#684, #2245) -* Experimental option to upload conflict files (#4557) -* Conflicts: Change conflict file naming scheme -* Conflicts: Add user name to conflict file name (#6325) -* Conflicts: Better comparison when connection broke (#6626) -* Conflicts: Deal with file/folder conflicts (#6312) -* Conflicts: Change tray icon for unresolved conflicts (#6277) -* Conflicts: Add documentation link to conflicts listing (#6396) -* Conflicts: Change tags to be more user friendly (#6365) -* Share dialog: Allow opening it if the file's contents are still syncing (#4608) -* Share dialog: Don't hide account settings when opening it (#6185) -* Share dialog: Remove odd grey square on OSX (#5774) -* Share dialog: Preserve the entered password when unrelated changes are done (#6512) -* Share dialog: Fix Re-shares not not showing up (#6666) -* Sharing: Add "copy public link" to menu (#6356) -* Share link: Update permission wording (#6192) -* Private links: improve legacy fileid derivation (#6745) -* User shares: Show avatars -* OAuth2: Remove the timeout (#6612) -* Wizard: Remove the "Skip folder config" button and instead add a radio button (#3664) -* Wizard: Fix for back button in OAuth2 (#6574) -* Wizard: add a context menu to copy the OAuth2 link (enterprise -* Wizard: Put errors into a scroll area (#6546) -* Wizard: show a message when the URL is invalid -* Wizard: pre-select the right radio button (#6685) -* Selective Sync: Do not abort applying selective sync if one folder has an error (#6675) -* Protocol: Introduce context menu with "open in browser" (#6121) -* Protocol: Correct sorting by size (#6326) -* Issues tab: Invalidate issues selectively (#6226) -* Issues tab: Don't allow two issues for the same file/folder -* Issues tab: addItem performance improvement -* Activities: Remove the text that a server does not support activities when the account is removed (#6679) -* Activities: Handle the fact that the username can contain a '@' (#6728) -* Notifications: Lower hiding timeout -* Notifications: Also have clickable link (#6236) -* Shell integration: Add "Open in browser" entry in the explorer menu (#5903) -* Sync journal: Fix crash when unmounting a drive while a sync is running (#6049) -* Client certs: Improve error message (#6128) -* Settings: Hide selective sync buttons while disconnected (#5809) -* Settings: Show account page when account created -* Settings: Move "About" to a dialog (#6075) -* Settings: Force sync should wipe the blacklist (#6757) -* Excludes: Optimize further the matching of exclude files using regular expression -* Windows: Update Overlay Icon naming -* Windows: Release handle/fd when file open fails (#6699) -* Config: Look for exclude file in a relative path. -* Config: Versionize settings -* Settings: Fix rename migration issue on old macOS -* Credentials: Re-try on Linux if daemon not running (#4274, #6522) -* Windows: Fixed MSVC build and compiler bugs -* Proxy: Hostname validation and reconnection on setting change (#6140) -* owncloudcmd: Set proxy earlier (#6281) -* Exclude regex: Restore old matching on Windows (#6245) -* Build system: Modernize the CMakeLists.txt files -* Use standard png2ico -* Sync: When detecting a local move, keep the local mtime (#6629) -* Sync: Better error handling for local directory parsing (#6610) -* Sync: Error if properties are missing (#6317) -* Sync: Recover when the PUT reply (or chunkin's MOVE) is lost (#5106) -* Sync: Do not abort a sync if the server closes the connection (#6516) -* Sync: Increase the timeout for the last MOVE/PUT for huge files (#6527) -* Sync: Fix renames making hierarchy inversion (#6694) -* Sync: RemotePermissions: Fix empty vs null (#4608) -* Sync: Fix the "direction" of the "all file delted" message when the server is reset (#6317) -* Data-Fingerprint: Fix backup detection when fingerprint is empty -* propagateuploadv1: Fixed an assert with ownCloud 5 -* Download: Use the <s:message> from the reply in the error message (#6459, #6459) -* SocketAPI: dynamic action menu -* Hidden option to move remote-deleted files to trash (#6265) -* FolderStatusModel: Refresh folders on Problem sync (#6337) -* SyncJournal: Clear etag filter before sync -* SyncEngine: Use separate state for two unicode conversions -* owncloudcmd: Do not read the proxy settings from the gui's config file -* ProgressInfo: Add information for local vs remote discovery -* SyncResult: Make sure the number of conflicts is correct (#6226) -* Remove the "CSync" wording from the error messages -* Apply branding to crashreporter resources file -* SslButton: Add HTTP/2 info (#3146) -* SslButton: Improve speed (especially on macOS) (#6031) -* Folder: normalize the local path. (#4424) -* Folder: Fix checking if the folder can be used as sync folder (#6654) -* Blacklisting must prevent parent etag updates (#6411) -* FolderStatusModel: fix potential assert -* Nautilus integration: Not a ColumnProvider -* Nautilus integration: Fix python3 compatibility (#6406, #6643) -* Nautilus: Guard against None state (#6643) -* Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty -* Notify if an explicitly excluded folder is created (#6222) -* Theme: unify ownCloudTheme and Theme classes -* SyncJournalDb::setSelectiveSyncList: Always use a transaction (#6431) -* Folders: Use "Problem" icon for unresolved conflicts (#6277) -* macOS: Unload the Finder extension on exit (#5382, #3819) -* Logging: Go to new file on Problem/Abort too (#6442) -* Logging: Compress log when switching files (#6442) -* Logging: Add persistent auto-logdir option (#6442) -* Logging: .owncloudsynclog: Allow 10 MB of size (#6420) -* Logging: .owncloudsynclog: Persist X-Request-ID for correlation with server (#6420) -* UI: High-DPI layout fixes -* Network settings: Better warnings about bad configuration (#5885) -* Folder watcher: Show a notification if it becomes unreliable (#6119) -* Ignore editor: Preserve comments in the exclude list file -* Updater: Support EXE->MSI upgrade (different code than 2.4) -* Updater: Remove unused installers before copying new ones into the appdata dir (#6690) -* ConnectionValidator: change the minimum server version to 7.0 -* ConnectionValidator: Warn when the server version is less than 10.0 -* Valgrind: Refactorings to avoid errors -* Crash fixes (#6562 and more) -* Windows: Fix missing company name in our DLLs -* Windows: Appveyor/craft changes -* Linux: More tray workarounds (#6545) -* libocsync: Rename to ${APPLICATION_EXECUTABLE}_csync -* Don't use Qt deprecated API now that we required Qt 5.6 - -version 2.4.3 (2018-08-13) -* Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY (#6696, #6610) -* OAuth2: Fix infinite loop when the refresh token is expired -* Windows MSI: Fix crash in the auto updater -* Nautilus: Guard against None state (#6643) - -version 2.4.2 (2018-07-18) -* Linux: Tray workarounds (#6545) -* Fix nautilus/nemo shell issues (#6393, #6406) -* Updater: Add update channel feature (#6259) -* Updater: Support EXE->MSI upgrade -* SyncJournal: Fixes for sync folders on removable media (#6049, #6049) -* SslButton: Add HTTP/2 info (#3146) -* Fix assert when using ownCloud server 5 (which you should not) (#6403) -* Normalize local path (#4424) -* Blacklisting must prevent parent etag updates (#6411) -* macdeployqt: Adjust minimum version based on our Qt (#5932) -* macOS: Unload the Finder extension on exit (#5382, #3819) -* Upload: Adjust timeout for final job based on file size (#6527) -* Sync: When detecting a local move, keep the local mtime (#6629) -* Credentials: Retry fetching from the keychain in case the keychain is still starting (#4274, #6522) -* OAuth2: Try to refresh the token even if the credentials weren't ready (#6522) - -version 2.4.1 (2018-03-05) -* Ignore files with file names that can't be encoded for the filesystem (#6287, #5676, #5719) -* Issues: Speed up insertion and add hard upper limit (#6272) -* Notifications: Fix "Dismiss" action -* Notifications: Fix timer invocation on macOS -* Notifications: Immediately poll when account online -* Protocol: Remove entries for auto resolved conflicts (#6316) -* owncloudcmd: Set proxy before capabilities call (#6281) -* owncloudcmd: Do not do the capability call when --nonshib is passed -* Avatars: Use old location for servers <10 (#6279) -* Link shares: Change default share name (#6298) -* Sharing: Use maximum allowed permissions for new share (#6346) -* Nautilus integration: Work with python2 and python3 -* Windows: Don't delete contents behind directory junctions (#6322) -* SyncJournal: Don't use LIKE with paths (#6322) -* Fix setting launch-on-startup when the first account is set up (#6347) -* HTTP2: Only allow with Qt 5.9.4 (#6285) -* Crash fixes - -version 2.4.0 (2017-12-21) -* If you're using 2.4.0 alpha1, please upgrade as previous alphas/rcs had an issue with hidden files and renames! -* OAuth2 authentication support by opening external browser (#5668) -* Shibboleth: Change to use OAuth2 if supported (#6198) -* Sharing: Add support for multiple public link shares (#5655) -* Sharing: Add option to copy/email private links (#5023, #5627) -* Sharing: Add option "show file listing" (#5837) -* Sharing: Show warning that links are public (#5747) -* Sharing: Sharing dialog redesign: multiple share links support (#5695) -* Sharing: Make "can edit" partially checked sometimes (#5642) -* Sharing: Trigger a sync for folder affected by a change of sharing (#6098) -* Wizard: Never propose an existing folder for syncing (#5597) -* Wizard: Don't show last page anymore, go to settings directly (#5726) -* Wizard: Handle url-shortener redirects (#5954) -* Wizard: Resolve url/ redirects only if url/status.php not found (#5954) -* Wizard: Add explanation text when server error is shown (#6157) -* Wizard: Update the window size on high dpi screen (#6156) -* Wizard: Don't report confusing error message (#6116) -* Gui: Display the user server avatar (#5482) -* Gui: Use display name of user, not internal name -* Server URL: Update configuration in case of permanent redirection (#5972) -* Gui: Allow to add multiple sync folder connection of the same folder (#6032) -* Tray Menu: More detailed status messages -* Tray Menu: Shibboleth: raise the browser when clicking on the tray (#6105) -* Activity: Link errors from the account tab, allow filtering by account/folder (#5861) -* Activity: Present conflicts more prominently (#5894) -* Activity: Allow sorting the columns in issues and protocol tabs (#6093, #6086) -* Selective Sync: Open sub folder context menu (#5596) -* Selective Sync: Skip excluded folders when reading db (#5772) -* Selective Sync: Remove local files of unselected folder despite other modified files (#5783) -* Excludes: Remove .htaccess form list of excluded files (#5701) -* Excludes: Hardcode desktop.ini -* Excludes: Allow escaping "#" (#6012) -* Excludes: Use faster matching via QRegularExpression (#6063) -* Discovery: Increase the MAX_DEPTH and show deep folders as ignored (#1067) -* Discovery: General speed improvements -* Downloads: Remove empty temporary if disk space full (#5746) -* Downloads: Read Content-MD5 header for object store setups -* Checksums: Add global disable environment variable (#5017) -* Quota: PropagateUpload: Model of remote quota, avoid some uploads (#5537) -* Create favorite also in folder wizard (#455) -* Windows: Use the application icon for the Windows 8 sidebar favorite (#2446, #5690) -* macOS: Finder sidebar icon (#296) -* Overlay Icons: Consider also the "shared by me" as shared (#4788) -* Overlay Icons: Update right after sharing (#6115) -* Overlay Icons: Fix different case paths not matching (#5257) -* Overlay Icons: Detect changes in the shared flag (#6098) -* Windows Overlay Icons: Potential hang fixes -* Linux Overlay Icons: fix branded nemo and caja shell integration (#5966) -* Credentials: Fix behavior for bad password (#5989) -* Credentials: Don't create empty client cert keychain entries (#5752) -* Credentials: Namespace windows cred keys (#6125) -* Credentials: Use per-account keychain entries (#5830, #6126) -* AccountSettings: Triggering log in re-ask about previously rejected certificates (#5819) -* owncloudcmd: Added bandwidth limit parameter (#5707) -* owncloudcmd: Fix timestamps, Fix --logdebug -* AccountSettings: Sync with clean discovery on Ctrl-F6 (#5666) -* Sync: Dynamic sizing of chunks in chunked uploads for improved big file upload performance (#5852) -* Sync: Introduce overall errors that are not tied to a file (#5746) -* Sync: Better messaging for 507 Insufficient Storage (#5537) -* Sync: Create conflicts by comparing the hash of files with identical mtime/size (#5589) -* Sync: Avoid downloads by comparing the hash of files with identical mtime/size (#6153) -* Sync: Upload conflict files if OWNCLOUD_UPLOAD_CONFLICT_FILES environment variable is set (#6038) -* Sync: Blacklist: Don't let errors become warnings (#5516) -* Sync: Check etag again after active sync (#4116) -* Sync: Rename handling fixes: duplicate file ids (#6096, #6212) -* Sync: Rename handling fixes: File size must be equal -* Sync: Rename handling: Fix duplicate files on abort/resume sync (#5949) -* Sync: Add capability for invalid filename regexes (#6092) -* SyncJournalDB: Fall back to DELETE journal mode if WAL mode does not seem to work (#5723) -* SyncJournalDB: Don't crash if the db file is readonly (#6050) -* SyncJournalDB: DB close error is not fatal -* Fix at least one memory leak -* Documentation improvements -* Logging improvements (With Qt logging categories) (#5671) -* Logging filtering per account (#5672) -* Crash fixes -* Test improvements -* Small UI layout fixes -* Performance improvements -* Maintenance Mode: Detect maintenance mode (#4485) -* Maintenance Mode: Add a 1 to 5 min reconnection delay (#5872) -* HTTP: Send a unique X-Request-ID with each request (#5853) -* HTTP: Support HTTP2 when built and running with Qt 5.9.x (Official packages still on Qt 5.6.x) (#5659) -* owncloudcmd: Don't start if connection or auth fails (#5692) -* csync: Switch build from C to C++ (#6033) -* csync: Refactor a lot to use common data structures to save memory and memory copying -* csync: Switch some data structures to Qt data structures -* csync: Switch to using upper layer SyncJournalDB (#6087) -* Switch 3rdparty/json usage to Qt5's QJson (#5710) -* OpenSSL: Don't require directly, only via Qt (#5833) -* Remove iconv dependency, use Qt for file system locale encoding/decoding (emoji filename support on macOS) (#5875) -* Compilation: Remove Qt 4 code (#6025, #5702, #5505) -* Harmonize source code style with clang-format (#5732) -* Switch over to Qt 5 function pointer signal/slot syntax (#6041) -* Compile with stack-smashing protection -* Updater: Rudimentary support for beta channel (#6048) - -version 2.3.4 (2017-11-02) -* Checksums: Use addData function to avoid endless loop CPU load issues with Office files -* Packaging: Require ZLIB - -version 2.3.3 (2017-08-29) -* Chunking NG: Don't use old chunking on new DAV endpoint (#5855) -* Selective Sync: Skip excluded folders when reading DB, don't let them show errors (#5772) -* Settings: Make window bigger so Qt version is always visible (#5760) -* Share links: Show warning that public link shares are public (#5786) -* Downloads: Re-trigger folder discovery on HTTP 404 (#5799) -* Overlay Icons: Fix potential hangs on Windows -* SyncJournalDB: Don't use ._ as filename pattern if that does not work because of SMB storage settings (#5844) -* SyncJournalDB: Log reason for sqlite3 opening errors -* Notifications: Proapgate "Dismiss" button action to server (#5922) -* Switch Linux build also to Qt 5.6.2 (#5470) -* Stopped maintaining Qt 4 buildability - -version 2.3.2 (2017-05-08) -* Fix more crashes (thanks to everyone submitting to our crash reporter!) -* Improve compatibility with server 10.0 (#5691, X-OC-Total-Size) -* Share dialog: UI improvements, Bring to front on tray click -* owncloudcmd: Align process return value with sync return value (#3936) -* Fix disk free check on Windows when opening the local DB - -version 2.3.1 (2017-03-21) -* Fix several crashes (thanks to everyone submitting to our crash reporter!) -* Improve HTTP redirect handling (#5555) -* Blacklist: Escalate repeated soft error to normal error (#5500) -* NTFS: Do not attempt to upload two existing files with similar casing (#5544) -* Fix URL for linking to application password generation for ownCloud 10.0 (#5605) - -version 2.3.0 (2017-03-03) -* Decreased memory usage during sync -* Overlay icons: Lower CPU usage -* Allow to not sync the server's external storages by default -* Switch Windows and OS X build to Qt 5.6.2 -* Switch to new ownCloud server WebDAV endpoint -* Chunking NG: New file upload chunking algorithmn for ownCloud server 9.2 -* Allow to sync a folder to multiple different servers (Filename change from .csync_journal.db to _sync_$HASH.db) -* Conflicts: Use the local mtime for the conflict file name (#5273) -* "Sync now" menu item -* SSL Client certificate support improved (Show UI, Store keys in keychain) -* Propagator: Upload more small files in parallel -* Sync Engine: Read data-fingerprint property to detect backups (#2325) -* GUI: Show link to ceate an app password/token for syncing -* Share dialog: Add 'Mail link' button -* Caja file manager plugin -* Make "backup detected" message to not trigger in wrong cases -* SyncEngine: Fix renaming of folder when file are changed (#5192) -* Fix reconnect bug if status.php intermittently returns wrong data (#5188) -* Improve sync scheduling (#5317) -* Overlay icons: Improvements in correctnes -* Tray menu: Only update on demand to fix Linux desktop integration glitches -* Progress: Better time/bandwidth estimations -* Network: Follow certain HTTP redirects (#2791) -* Network: Remove all cookies (including load balancers etc) when logging out -* Discovery thread: Low priority -* owncloudsync.log: Write during propagation -* Better error message for files with trailing spaces on Windows -* Excludes: Consider files in hidden folders excluded (#5163) -* Allow sync directory to be a symlinked directory -* Add manifest file on Windows to make the application UAC aware -* macOS: Improve monochrome tray icons -* Shibboleth bugfixes -* Fixes with regards to low disk space -* A ton of other bugfixes -* Refactorings -* Improved documentation -* Crash fixes - -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) -* Selective Sync: Fix HTTP request loop and show error in view (#5154) -* ConnectionValidator: properly handle error in status.php request (#5188) -* Discovery: Set thread priority to low (#5017) -* ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS -* ShareLink: Ensure the password line edit is enabled (#5117) - -version 2.2.3 (release 2016-08-08) -* SyncEngine: Fix detection of backup (#5104) -* Fix bug with overriding URL in config (#5016) -* Sharing: Fix bug with file names containing percent encodes (#5042, #5043) -* Sharing: Permissions for federated shares on servers >=9.1 (#4996, #5001) -* Overlays: Fix issues with file name casing on OS X and Windows -* Windows: Skip symlinks and junctions again (#5019) -* Only accept notification API Capability if endpoint is OCS-enabled (#5034) -* Fix windows HiDPI (#4994) -* SocketAPI: Use different pipe name to avoid unusual delay (#4977) -* Tray: Add minimal mode as workaround and testing tool for Linux issues (#4985, #4990) -* owncloudcmd: Fix --exclude regression #4979 -* Small memleak: Use the full file stat destructors (#4992) -* Fix small QAction memleak (#5008) -* Fix crash on shutting down during propagation (#4979) -* Decrease memory usage during sync #4979 -* Setup csync logging earlier to get all log output (#4991) -* Enable Shibboleth debug view with OWNCLOUD_SHIBBOLETH_DEBUG env - -version 2.2.2 (release 2016-06-21) -* Excludes: Don't redundantly add the same exclude files (memleak) (#4967, #4988) -* Excludes: Only log if the pattern was really logged. (#4989) - -version 2.2.1 (release 2016-06-06) - * Fix out of memory error when too many uploads happen (#4611) - * Fix display errors in progress display (#4803 #4856) - * LockWatcher: Remember to upload files after they become unlocked (#4865) - * Fix overlay icons for files with umlauts (#4884) - * Certs: Re-ask for different cert after rejection (#4898, #4911) - * Progress: Don't count items without propagation jobs (#4856, #4910) - * Utility: Fix for the translation of minutes, second (#4855) - * SyncEngine: invalid the blacklist entry when the rename destination change - -version 2.2.0 (release 2016-05-12) - * Overlay icons: Refactoring - mainly for performance improvements - * Improved error handling with Sync Journal on USB storages (#4632) - * Sharing Completion: Improved UI of completion in sharing from desktop. (#3737) - * Show server notifications on the client (#3733) - * Improved Speed with small files by dynamic parallel request count (#4529) - * LockWatcher: Make sure to sync files after apps released exclusive locks on Windows. - * Improved handling of Win32 file locks and network files - * Workaround Ubuntu 16.04 tray icon bug (#4693) - * Removed the Alias field from the folder definition (#4695) - * Improved netrc parser (#4691) - * Improved user notifications about ignored files and conflicts (#4761, #3222) - * Add warnings for old server versions (#4523) - * Enable tranportation checksums if the server supports based on server capabilities (#3735) - - * Default Chunk-size changed to 10MB (#4354) - * Documentation Improvements, ie. about overlay icons - * Translation fixes - * Countless other bugfixes - * Update of QtKeyChain to support Windows credential store - * Packaging of dolphin overlay icon module for bleeding edge distros - -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 - * Fix undeliberate WiFi scanning done by Qt Network classes - * Several fixes/improvements to the sharing dialog - * Several fixes/improvements to the server activity tab - * Create the directory when using --confdir and it does not exist - * Windows Overlay icons: Fix DLL and icon oddities - * Mac Overlay icons: Don't install legacy Finder plugin on >= 10.10 - * Linux Overlay icons: Nemo plugin - * Overlay icons: Fix several wrong icon state computations - * Allow changeable upload chunk size in owncloud.cfg - * Crash fixes on account deletion - * Forget password on explicit sign-out - * OS X: Fix the file system watcher ignoring unicode paths (#4424) - * Windows Installer: Update to NSIS 2.50, fixes possible DLL injection - * Sync Engine: .lnk files - * Sync Engine: symlinked syn directories - * Sync Engine: Windows: Fix deleting and replacing of read-only files (#4308, #4277) - * Sync Engine: Fixes for files becoming directories and vice versa (#4302) - * Misc other fixes/improvements - -version 2.1 (release 2015-12-03) - * GUI: Added a display of server activities - * GUI: Added a separate view for not synced items, ignores, errors - * GUI: Improved upload/download progress UI (#3403, #3569) - * Allowed sharing with ownCloud internal users and groups from Desktop - * Changed files starting in .* to be considered hidden on all platforms (#4023) - * Reflect read-only permissions in filesystem (#3244) - * Blacklist: Clear on successful chunk upload (#3934) - * 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 - * Performance improvements in the logging functions - * Ensured that local disk space problems are handled gracefully (#2939) - * Improved handling of checksums: transport validation, db (#3735) - * For *eml-files don't reupload if size and checksum are unchanged (#3235) - * Ensured 403 reply code is handled properly (File Firewall) (#3490) - * Reduced number of PROPFIND requests to server(#3964) - * GUI: Added Account toolbox widget to keep account actions (#4139) - * Tray Menu: Added fixes for Recent Activity menu (#4093, #3969) - * FolderMan: Fixed infinite wait on pause (#4093) - * Renamed env variables to include unit (#2939) - * FolderStatusModel: Attempt to detect removed undecided files (#3612) - * SyncEngine: Don't whipe the white list if the sync was aborted (#4018) - * Quota: Handle special negative value for the quota (#3940) - * State app name in update notification (#4020) - * PropagateUpload: Fixed double-emission of finished (#3844) - * GUI: Ensured folder names which are excluded from sync can be clicked - * Shell Integration: Dolphin support, requires KF 5.16 and KDE Application 15.12 - * FolderStatusModel: Ensured reset also if a folder was renamed (#4011) - * GUI: Fixed accessiblity of remaing items in full settings toolbar (#3795) - * Introduced the term "folder sync connection" in more places (#3757) - * AccountSettings: Don't disable pause when offline (#4010) - * Fixed handling of hidden files (#3980) - * Handle download errors while resuming as soft errors (#4000) - * SocketAPI: Ensured that the command isn't trimmed (#3297) - * Shutdown socket API before removing the db (#3824) - * GUI: Made "Keep" default in the delete-all dialog (#3824) - * owncloudcmd: Introduced return code 0 for --version and --help - * owncloudcmd: Added --max-sync-retries (#4037) - * owncloudcmd: Don't do a check that file are older than 2s (#4160) - * Fixed getting size for selective sync (#3986) - * Re-added close button in the settings window (#3713) - * Added abililty to handle storage limitations gracefully (#3736) - * Organized patches to our base Qt version into admin/qt/patches - * Plus: A lot of unmentioned improvements and fixes - -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 - * SelectiveSync: Increase folder list timeout to 60 - * Propagation: Try another sync on 423 Locked (#3387) - * Propagation: Make 423 Locked a soft error (#3387) - * Propagation: Reset upload blacklist if a chunk succeeds - * Application: Fix crash on early shutdown (#3898) - * Linux: Don't show settings dialog always when launched twice (#3273, #3771, #3485) - * win32 vio: Add the OPEN_REPARSE_POINTS flag to the CreateFileW call. (#3813) - * AccountSettings: only expand root elements on single click. - * AccountSettings: Do not allow to expand the folder list when disconnected. - * Use application SHORT name for the name of the MacOSX pkg file (ownBrander). - * FolderMan: Fix for removing a syncing folder (#3843) - * ConnectionMethodDialog: Don't be insecure on close (#3863) - * Updater: Ensure folders are not removed (#3747) - * Folder settings: Ensure path is cleaned (#3811) - * Propagator: Simplify sub job finished counting (#3844) - * Share dialog: Hide settings dialog before showing (#3783) - * UI: Only expand 1 level in folder list (#3585) - * UI: Allow folder expanding from button click (#3585) - * UI: Expand folder treeview on single click (#3585) - * GUI: Change tray menu order (#3657) - * GUI: Replace term "sign in" with "Log in" and friends. - * SetupPage: Fix crash caused by uninitialized Account object. - * Use a themable WebDAV path all over. - * Units: Back to the "usual" mix units (JEDEC standard). - * csync io: Full UNC path support on Win (#3748) - * Tray: Don't use the tray workaround with the KDE theme (#3706, #3765) - * ShareDialog: Fix folder display (#3659) - * AccountSettings: Restore from legacy only once (#3565) - * SSL Certificate Error Dialog: show account name (#3729) - * Tray notification: Don't show a message about modified folder (#3613) - * PropagateLocalRemove: remove entries from the DB even if there was an error. - * Settings UI improvements (eg. #3713, #3721, #3619 and others) - * Folder: Do not create the sync folder if it does not exist (#3692) - * Shell integration: don't show share menu item for top level folders - * Tray: Hide while modifying menus (#3656, #3672) - * AddFolder: Improve remote path selection error handling (#3573) - * csync_update: Use excluded_traversal() to improve performance (#3638) - * csync_excluded: Add fast _traversal() function (#3638) - * csync_exclude: Speed up significantly (#3638) - * AccountSettings: Adjust quota info design (#3644, #3651) - * Adjust buttons on remove folder/account questions (#3654) - -version 2.0.1 (release 2015-09-01) - * AccountWizard: fix when the theme specify a override URL (#3699) - -version 2.0.0 (release 2015-08-25) - * Add support for multiple accounts (#3084) - * Do not sync down new big folders from server without users consent (#3148) - * Integrate Selective Sync into the default UI - * OS X: Support native finder integration for 10.10 Yosemite (#2340) - * Fix situation where client would not reconnect after timeout (#2321) - * Use SI units for the file sizes - * Improve progress reporting during sync (better estimations, show all files, show all bandwidth) - * Windows: Support paths >255 characters (#57) by using Windows API instead of POSIX API - * Windows, OS X: Allow to not sync hidden files (#2086) - * OS X: Show file name in UI if file has invalid UTF-8 in file name - * Sharing: Make use of Capability API (#3439) - * Sharing: Do not allow sharing the root folder (#3495) - * Sharing: Show thumbnail - * Client Updater: Check for updates periodically, not only once per run (#3044) - * Windows: Remove misleading option to remove sync data (#3461) - * Windows: Do not provoke AD account locking if password changes (#2186) - * Windows: Fix installer when installing unprivileged (#2616, #2568) - * Quota: Only refresh from server when UI is shown - * SSL Button: Show more information - * owncloudcmd: Fix --httpproxy (#3465) - * System proxy: Ask user for credentials if needed - * Several fixes and performance improvements in the sync engine - * Network: Try to use SSL session tickets/identifiers. Check the SSL button to see if they are used. - * Bandwidth Throttling: Provide automatic limit setting for downloads (#3084) - * Systray: Workaround for issue with Qt 5.5.0 #3656 - -version 1.8.4 (release 2015-07-13) - * Release to ship a security release of openSSL. No source changes of the ownCloud Client code. - -version 1.8.3 (release 2015-06-23) - * Fix a bug in the Windows Installer that could crash explorer (#3320) - * Reduce 'Connection closed' errors (#3318, #3313, #3298) - * 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. - -version 1.8.2 (release 2015-06-08) - * Improve reporting of server error messages (#3220) - * Discovery: Ignore folders with any 503 (#3113) - * Wizard: Show server error message if possible (#3220) - * QNAM: Fix handling of mitm cert changes (#3283) - * Win32: Installer translations added (#3277) - * Win32: Allow concurrent OEM (un-)installers (#3272) - * Win32: Make Setup/Update Mutex theme-unique (#3272) - * 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) - * 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) - * SyncJournalDB: Minor fixes and simplificatons - * SyncEngine: Force re-read of folder Etags for upgrades from - 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) - * Wizard: Allow SSL cert dialog to show twice (#3168) - * ProtocolWidget: Fix rename message (#3210) - * Discovery: Test better, treat invalid hrefs as error (#3176) - * Propagator: Overwrite local data only if unchanged (#3156) - * ShareDialog: Improve error reporting for share API fails - * OSX Updater: Only allow updates only if in /Applications (#2931) - * Wizard: Fix lock icon (#1447) - * Fix compilation with GCC 5 - * Treat any 503 error as temporary (#3113) - * Work around for the Qt PUT corruption bug (#2425) - * OSX Shell integration: Optimizations - * Windows Shell integration: Optimizations - .. more than 250 commits since 1.8.1 - -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 - * 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 - * Add-folder Wizard: Select the newly created folder - * Activity: Correctly restore column sizes #3005 - * SSL Button: do not crash on empty certificate chain - * SSL Button: Make menu creation lazy #3007 #2990 - * 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 - * 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 - * Do not store Session Cookies in the client cookie storage - * CookieJar: Don't accidentally overwrite cookies. #2808 - * 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. - * Fix a crash on shutdown in ~SocketApi #3057 - * SyncEngine: Show more timing measurements #3064 - * Discovery: Add warning if returned etag is 0 - * Fix a crash caused by an invalid DiscoveryDirectoryResult::iterator #3051 - * Sync: Fix sync of deletions during 503. #2894 - * Handle redirect of auth request. #3082 - * Discovery: Fix parsing of broken XML replies, which fixes local file disappearing #3102 - * Migration: Silently restore files that were deleted locally by bug #3102 - * Sort folder sizes SelectiveSyncTreeView numerically #3112 - * Sync: PropagateDownload: Read the mtime from the file system after writing it #3103 - * Sync: Propagate download: Fix restoring files for which the conflict file exists #3106 - * Use identical User Agents and version for csync and the Qt parts - * Prevent another crash in ~SocketApi #3118 - * Windows: Fix rename of finished file. #3073 - * AccountWizard: Fix auth error handling. #3155 - * Documentation fixes - * Infrastructure/build fixes - * Win32/OS X: Apply patch from OpenSSL to handle oudated intermediates gracefully #3087 - -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 - * Enhanced usage of parallel HTTP requests for ownCloud 8 servers - * Renamed github repository from mirall to client. - * Mac OS: Use native notification support - * Selective Sync: allow to enforce selective sync in brandings. - * Added ability to build on Windows utilizing MingGW - * SQLite database fixes if running on FAT filesystems - * Improved detection of changing files to upload from local - * Preparations for the multi-account feature - * Fixed experience for Window manager without system tray - * 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. - * Merged some NetBSD patches - * Selective sync support for owncloudcmd - * Reorganize the source repository - * Prepared direct download - * Added Crashreporter feature to be switched on on demand - * A huge amount of bug fixes in all areas of the client. - * almost 700 commits since 1.7.1 - -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 - * 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 - * Added fallback for distros where XDG_RUNTIME_DIR is undefined - * Fix the setup wizard, bug #1989, #2264 - * Fix scheduling of ETag check jobs, bug #2553 - * Fix to avoid syncing more than one folder at a time, bug #2407 - * Use fife minutes timeout for all network jobs - * Cleanup for Folderwizard wording - * Improve journal check: Remove corrupted journal files, bug #2547 - * Fix item count in progress dialog for deletes, bug #1132 - * Display correct file count on deletion (#1132) - * Fix reinitializing the folder using the wizard in certain cases (#2606) - * Mac OS: Fixed branding of the pkg file - * Mac OS: Fix display of overlay icons in certain situations (#1132) - * Mac OS: Use a bundled version of OpenSSL (#764, #2600, #2510) - * Win32: improved filesystem watcher - * Win32: Improve threading with shell integration - * Win32: Upgraded to OpenSSL 1.0.1j - * 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 - * 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. - * Improved local change detection: consider file size, detect files - with ongoing changes and do not upload immediately - * Improved HTTP request timeout handler: all successful requests reset - the timeout counter - * Improvements for syncing command line tool: netrc support, improved - 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. - * 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 - * Improve "resync handling" if errors occur - * Blacklist improvements - * 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. - * Fixed missing warnings about reusing a sync folder when the back button - 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. - * 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. - -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 - * 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) - * 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. - -version 1.6.2 (release 2014-07-28 ) - * Limit the HTTP buffer size when downloading to limit memory consumption. - * Another small mem leak fixed in HTTP Credentials. - * 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. - * 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 - * Propagator: Fix crash when logging out during upload (#1957) - * Propagator_qnam: Fix signal slot connection (#1963) - * Use more elaborated way to detect that the server was reconfigured (#1948) - * Setup Wizard: Reconfigure Server also if local path was changed (#1948) - -version 1.6.1 (release 2014-06-26 ) - * Fix 'precondition failed' bug with broken upload - * 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 - * Fix reappearing directories if dirs are removed during its - 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) - * 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 - * Fix a lot of issues and warnings found by Coverity - * Fix Mac some settings dialog problems - - -version 1.6.0 (release 2014-05-30 ) - * Minor GUI improvements - * Qt5 compile issues fixed - * Ignore sync log file in filewatcher - * Install libocsync to private library dir and use rpath to localize - * Fix reconnect after server disconnect - * Fix "unknown action" display in Activity window - * Fix memory leaks - * Respect XDG_CONFIG_HOME environment var - * Handle empty fileids in the journal correctly - * Add abilility to compile libowncloudsync without GUI dependendy - * Fix SSL error with previously-expired CAs on Windows - * Fix incorrect folder pause state after start - * Fix a couple of actual potential crashes - * Improve Cookie support (e.g. for cookie-based load-balancers) - * 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) - * 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) - * 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 - * 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 - * Mac OS X: Fix UI inconsistencies on Mavericks - * Shibboleth: Warn if authenticating with a different user - * Remove vio abstraction in csync - * Avoid data loss when a client file system is not case sensitive - -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) - * 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 - * [Packaging] Debian/Ubuntu: ship sync-exclude.lst - * [Packaging] Fix issues with access to gnome keychain in Fedora and RHEL6 - * [Packaging] Ensure all sub packages get updated - * [Packaging] Fix incorrect path in desktop file (RHEL6/CentOS6) - -version 1.5.2 (release 2014-02-26 ) - * Fix behavior when attempting to rename Shared folder - * Fix potential endless sync loops on Mac OS (#1463) - * Fix potential crash when pausing during update phase (#1442) - * Fix handing of shared directories - * Fix online state handling (#1441, #1459) - * Fix potential crash in c_iconv on Mac OS - * Fix certificate chain display in SSLButton - * Fix sporadicly appearing multiple auth prompts on sign-in - * Show correct state icon in Account Settings right away - * Re-fetch content that gets deleted from read only shared directories - * Do not store the password in the config file, erase existing ones (#1469) - * Shibboleth: Close browser window after login - * Shibboleth: Proper invalidation if timeout during sync - * Shibboleth: Do not pop up IdP login immediately when modifying account - * Shibboleth: Avoid auth on restart by storing cookies in the wallet - * Fix license headers - -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) - * Added a button to the account dialog that gives information - 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) - * Handle windows lnk files correctly (Bug #1307) - * Detect removes and renames in read only shares and - 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 - * Fixed mem leak after via valgrind on Mac - * Imported the ocsync library into miralls repository. - Adopted all build systems and packaging to that. - * Introduce a new linux packaging scheme following the - debian upstream scheme - * Use a refactored Linux file system watcher based on - inotify, incl. unit tests - * Wizard: Gracefully fall back to HTTP if HTTPS connection - 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. - * Add proxy support to owncloud commandline client - * NSIS fixes - * A lot of other fixes and minor improvements - * Improve Qt5 compatability - -version 1.5.0 (release 2013-12-12 ), csync 0.91.4 required - * New owncloud propagator that skips the vio abstraction layer - * Add owncloudcmd to replace the ocsync command line tool - * Localize Windows installer - * Allow to sign in and out - * Ask for password if missing - * Introduce activity view - * Introduce black list for files which could not be synced - * Enabling accessbility by shipping accessibility enables on OS X (#736) - * Toggle Settings window when clicking on systray icon on Win and KDE (#896) - * FolderWizard: Sanitize error detection (#1201) - * Set proper enable state of blacklist button after the dialog was opened - * Set proper tooltips in blacklist - * Translatable error messages for file errors - * Add man page for owncloudcmd (#1234) - * Don't close setup wizard when the initial sync run is started - * Close the sync journal if a folder gets removed (#1252) - * Activity: Avoid horizontal scrollbar (#1213) - * Fix crash (#1229) - * Resize wizard appropriately (#1130) - * Fix account identity test (#1231) - * Maintain the file type correctly - * Display rename-target in sync protocol action column - * Let recursive removal also remove the top dir - * If item is a directory, remove its contents from the database as well (#1257) - * Install headers for owncloudsync library - * Fix opening the explorer with a selected file in Windows (#1249) - * Add build number into versioning scheme - * Windows: Fix rename of temporary files - * Windows: Fix move file operation - -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) - * Add folder column to detailed sync protocol (#1037) - * Fix possible endless loop in inotify (#1041) - * Do not elide the progress text (#1049) - * Fix high CPU load (#1073) - * Reconnect if network is unavailable after startup (#1080) - * Ensure paused folder stays paused when syncing with more than one folder (#1083) - * Don't show desktop notification when the user doesn't want to (#1093) - * System tray: Avoid quick flickering up of the ok-icon for the sync prepare state - * Progress: Do not show progress if nothing is transmitted - * 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. - * Wait up to 30 secs before complaining about missing systray - 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. - * Enable and disable the folder watcher during syncs correctly. - * Fix setting of thread priority. - * Fixed file size display. - * Fixed various folder wizard issues, bug #992 - * Made "Sync started" message optional, fixes bug #934 - * Fixed shutdown, avoid crashed config on win32, fixes bug #945 - * Pop up config wizard if no server url is configured, fixes bug #1018 - * Settings: calculate sidebar width dynamically, fixes bug #1020 - * Fixed a crash if sync folders were removed, fixes bug #713 - * Do proper resync after network disconnect, fixes bug #1007 - * 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 - * Add Bandwidth Control - * Add a visual storage/quota indicator (context menu and account settings) - * Add progress indication (context menu and account settings) - * Introduce a sync history, persisting results across syncs - * 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 - * Add Help item, pointing to online reference - * Implement graphical selection of remote folders in FolderWizard - * Allow custom ignore patterns - * Add an editor for ingore patterns - * ALlow to flag certain ignore patterns as discardable - * Ensure to ship with all valid translations - * Progress Dialog now preserves the last syncned items across sync runs - * Split Setup Wizard into multiple pages again - * Implement "--logfile -" to log to stdout - * Add preliminary support for Shibboleth authentication - * Linux: Provide more icon sizes - * Linux: Do not trigger notifier on ignored files - * Windows: Reduce priority of CSync thread - * Documentation: Prem. updates to reflect UI changes - * Significant code refactorings - * 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 - - * Default proxy port to 8080 - * Don't lose proxy settings when changing passwords - * Support SOCKS5 proxy (useful in combination with ssh *D) - * Propagate proxy changes to csync at runtime - * Improve proxy wizard - * Display proxy errors - * Solved problems with lock files - * Warn if for some reason all files are scheduled for removal on either side - * Avoid infinite loop if authentication fails in certain cases - * Fix reading the password from the config in certain cases - * Do not crash when configured sync target disappears - * Make --help work on windows - * Make sync feedback less ambiguous. - * Fix icon tray tooltip sometimes showing repeated content - * More use of native directory separators on Windows - * 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 - * 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) - * Server side directory moves will be detected - * New setup wizard, defaulting to root syncing (only for new setups) - * Improved thread stop/termination - -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 - * [Fixes] Build with older CMake versions (CentOS/RHEL 6) - * [Fixes] Wording in GUI - * [Fixes] Silently ignore "installed = true" status.php - * Set log verbosity before calling csync_init. - * GUI feedback for the statistics copy action - * Safer approach for detecting duplicate sync runs - -version 1.2.4 (release 2013-04-11 ), csync 0.70.6 required - * [Fixes] Clarify string in folder wizard - * [Fixes] Fixed some valgrind warnings - * [Fixes] Ensure that only one sync thread can ever run - * [Fixes] Fix default config storage path - * [Fixes] Skip folders with no absolute path - * [Fixes] Allow setting the configuration directory on command line - -version 1.2.3 (release 2013-04-02 ), csync 0.70.5 required - * [Fixes] Unbreak self-signed certificate handling - -version 1.2.2 (release 2013-04-02 ), csync 0.70.5 required - * [Fixes] Do not crash when local file tree contains symlinks - * [Fixes] Correctly handle locked files on Windows - * [Fixes] Display errors in all members of the SSL chain - * [Fixes] Enable Accessibility features on Windows - * [Fixes] Make setupFavLink work properly on Mac OS - * [Fixes] Ignore temporary files created by MS Office - * [Gui] Support Nautilus in setupFavLink - -version 1.2.1 (release 2013-02-26 ), csync 0.70.4 required - * [Fixes] Leave configured folders on configuration changes. - * [Fixes] Do not allow to finish the setup dialog if connection can't be established. - * [Fixes] Better handling of credentials in setup dialog. - * [Fixes] Do not leak fd's to /dev/null when using gnutls - * [Fixes] Stop sync scheduling when configuration wizard starts. - * [Fixes] Clear pending network requests when stepping back in config wizard. - * [Fixes] User password dialog asynchronous issues. - * [Fixes] Make folderman starting and stoping the scheduling. - * [Fixes] Various minor fixes and cleanups. - * [Fixes] Crash on pausing sync - * [Fixes] Stale lock file after pausing sync - * [App] Load translations from app dir or bundle as well. - * [Platform] Build fixes and simplifications, ie. build only one lib. - * [Platform] Added some getter/setters for configuration values. - * [Platform] Added man pages. - * [Platform] Simplified/fixed credential store usage and custom configs. - * [Platform] Added soname version to libowncloudsync. - * [Platform] Pull in Qt translations - * [Gui] Make sync result popups less annoyingq - * [Gui] Fix for result popup - -version 1.2.0 (release 2013-01-24 ), csync 0.70.2 required - * [GUI] New status dialog to show a detailed list of synced files. - * [GUI] New tray notifications about synced files. - * [GUI] New platform specific icon set. - * [App] Using cross platform QtKeychain library to store credentials crypted. - * [App] Use cross platform notification for changes in the local file system rather than regular poll. - * [Fixes] Improved SSL Certificate handling and SSL fixes troughout syncing. - * [Fixes] Fixed proxy authentication. - * [Fixes] Allow brackets in folder name alias. - * [Fixes] Lots of other minor fixes. - * [Platform] cmake fixes. - * [Platform] Improved, more detailed error reporting. - -version 1.1.4 (release 2012-12-19 ), csync 0.60.4 required - * No changes to mirall, only csync fixes. - -version 1.1.3 (release 2012-11-30 ), csync 0.60.3 required - * No changes to mirall, only csync fixes. - -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. - * [Fixes] If local sync dir is not existing, create it. - * [Fixes] lots of other minor fixes. - * [GUI] Display error messages in status dialog. - * [GUI] GUI fixes for the connection wizard. - * [GUI] Show username for connection in statusdialog. - * [GUI] Show intro wizard on new connection setup. - * [APP] Use CredentialStore to better support various credential - backends. - * [APP] Handle missing local folder more robust: Create it if - 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 - * [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 - * [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. - * [Fixes] Proxy support: now supports Proxy Auto-Configuration (PAC) - 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. - * [Fixes] Crash through wrong delete operator. - * [MacOS] behave correctly on retina displays. - * [MacOS] fix focus policy. - * [MacOS] Packaging improvements. - * [MacOS] Packaging improvements. - * [Platform] Windows: Setup closes client prior to uninstall. - * [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() - -version 1.0.5 (release 2012-08-14), csync 0.50.8 required - * [Fixes] Fixed setup dialog: Really use https if checkbox is activated. - -version 1.0.4 (release 2012-08-10), csync 0.50.8 required - * [APP] ownCloud is now a single instance app, can not start twice any more. - * [APP] Proxy support - * [APP] Handle HTTP redirection correctly, note new url. - * [APP] More relaxed handling of read only directories in the sync paths. - * [APP] Started to split off a library with sync functionality, eg for KDE - * [APP] Make ownCloud Info class a singleton, more robust. - * [GUI] New, simplified connection wizard. - * [GUI] Added ability for customized theming. - * [GUI] Improved icon size handling. - * [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%. - * [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. - * [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. - * [Fixes] More user expected behaviour deletion of sync folder local - 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 - * [Fixes] MacOS: Put app translations to correct places - * [Fixes] Win32: Fix loading of csync state db. - * [Fixes] Improved some english grammar. - * [Platform] Added krazy2 static code checks. - -version 1.0.2 (release 2012-05-18), csync 0.50.6 required - * [GUI] New icon set for ownCloud client - * [GUI] No splashscreen any more (oC Bug #498) - * [GUI] Russian translation added - * [GUI] Added 'open ownCloud' to traymenu - * [GUI] "Pause" and "Resume" instead of Enable/Disable - * [Fixes] Long running syncs can be interrupted now. - * [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. - -version 1.0.1 (release 2012-04-18), csync 0.50.5 required - * [Security] Support SSL Connections - * [Security] SSL Warning dialog - * [Security] Do not store password in clear text anymore - * [Security] Restrict credentials to the configured host - * [Security] Added ability to forbid local password storage. - * [Fixes] Various fixes of the startup behaviour. - * [Fixes] Various fixes in sync status display - * [GUI] Various error messages for user display improved. - * [GUI] fixed terms and Translations - * [GUI] fixed translation loading - * [Intern] Migrate old credentials to new format - * [Intern] Some code refactorings, got rid of rotten QWebDav lib - * [Intern] lots of cmake cleanups - * [Intern] Backport to Qt Version 4.6 for compat. with older distros. - * [Platform] MacOSX porting efforts - * [Platform] MacOSX Bundle creation added - * [Platform] Enabled ranslations on Windows. - - - diff --git a/VERSION.cmake b/VERSION.cmake index 8f780835c..f512e0bd6 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,7 +1,7 @@ set( MIRALL_VERSION_MAJOR 2 ) set( MIRALL_VERSION_MINOR 7 ) set( MIRALL_VERSION_PATCH 0 ) -set( MIRALL_VERSION_YEAR 2019 ) +set( MIRALL_VERSION_YEAR 2020 ) set( MIRALL_SOVERSION 0 ) if ( NOT DEFINED MIRALL_VERSION_SUFFIX ) diff --git a/admin/osx/sign_app.sh b/admin/osx/sign_app.sh deleted file mode 100755 index e909f66d7..000000000 --- a/admin/osx/sign_app.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -xe - -[ "$#" -lt 2 ] && echo "Usage: sign_app.sh <app> <identity> <team_identifier>" && exit - -src_app="$1" -identity="$2" -team_identifier="$3" - -codesign -s "$identity" --force --preserve-metadata=entitlements --verbose=4 --options runtime --deep "$src_app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app" -codesign -s "$identity" --force --preserve-metadata=entitlements --verbose=4 --options runtime --deep "$src_app" - -# Verify the signature -codesign -dv $src_app -codesign --verify -v --strict $src_app -spctl -a -t exec -vv $src_app - -# Validate that the key used for signing the binary matches the expected TeamIdentifier -# needed to pass the SocketApi through the sandbox -codesign -dv $src_app 2>&1 | grep "TeamIdentifier=$team_identifier" -exit $? diff --git a/changelog/unreleased/7247 b/changelog/unreleased/7247 new file mode 100644 index 000000000..6b6c1a84d --- /dev/null +++ b/changelog/unreleased/7247 @@ -0,0 +1,5 @@ +Bugfix: Fixed bug in public link with password required + +In the sharing dialog, "password required" capabilities lead to incorrect behavior + +https://github.com/owncloud/client/issues/7247 diff --git a/changelog/unreleased/7313 b/changelog/unreleased/7313 new file mode 100644 index 000000000..358a76799 --- /dev/null +++ b/changelog/unreleased/7313 @@ -0,0 +1,5 @@ +Bugfix: Fixed editing public link expiration date + +In the sharing dialog, allow editing public link expiration date when it is enforced + +https://github.com/owncloud/client/issues/7313 diff --git a/changelog/unreleased/7336 b/changelog/unreleased/7336 new file mode 100644 index 000000000..2ceeeffba --- /dev/null +++ b/changelog/unreleased/7336 @@ -0,0 +1,6 @@ +Bugfix: Expand file tree also when no folders are synced + +We have fixed the behaviour of the folder Widget, +when a account was added and none of its folders was selected to be synced, the tree was not expanded. + +https://github.com/owncloud/client/issues/7336 diff --git a/changelog/unreleased/7700 b/changelog/unreleased/7700 new file mode 100644 index 000000000..f7f50a5b4 --- /dev/null +++ b/changelog/unreleased/7700 @@ -0,0 +1,6 @@ +Bugfix: Fixed bug saving the cookies + +Saving the cookies on Windows might fail if the containing folder does not exist + + +https://github.com/owncloud/client/issues/7700 diff --git a/changelog/unreleased/7709 b/changelog/unreleased/7709 new file mode 100644 index 000000000..8e3e26b1f --- /dev/null +++ b/changelog/unreleased/7709 @@ -0,0 +1,7 @@ +Bugfix: Fixed crash in the setup wizard + +Fixe crash if setup wizard is closed while the virtual file system dialog is open + + +https://github.com/owncloud/client/issues/7709 +https://github.com/owncloud/client/issues/7711 diff --git a/changelog/unreleased/7710 b/changelog/unreleased/7710 new file mode 100644 index 000000000..2ce50750b --- /dev/null +++ b/changelog/unreleased/7710 @@ -0,0 +1,7 @@ +Bugfix: Fixed bug in the Virtual File warning dialog + +Don't show virtual file system warning again when the radio button is triggered a second time. +Declining the dialog had no effect as the radio button was already checked + +https://github.com/owncloud/client/issues/7710 +https://github.com/owncloud/client/issues/7712 diff --git a/changelog/unreleased/7722 b/changelog/unreleased/7722 new file mode 100644 index 000000000..949638c29 --- /dev/null +++ b/changelog/unreleased/7722 @@ -0,0 +1,4 @@ +Bugfix: Fixed a potential crash while discovering moves + + +https://github.com/owncloud/client/issues/7722 diff --git a/changelog/unreleased/7741 b/changelog/unreleased/7741 new file mode 100644 index 000000000..bc653bb85 --- /dev/null +++ b/changelog/unreleased/7741 @@ -0,0 +1,6 @@ +Bugfix: Add Folder Sync Connection sometimes does not warn + +Warn when adding a folder sync connection of a remote folder +for which a subdir is already synchronized + +https://github.com/owncloud/client/issues/7741 diff --git a/changelog/unreleased/7744 b/changelog/unreleased/7744 new file mode 100644 index 000000000..75e9251fd --- /dev/null +++ b/changelog/unreleased/7744 @@ -0,0 +1,6 @@ +Bugfix: Resize the buttons in the settings view dynamically + +Since Qt 5.12 the button text gets elided automatically +if the button text would exceed the button width. + +https://github.com/owncloud/client/issues/7744 diff --git a/changelog/unreleased/7760 b/changelog/unreleased/7760 new file mode 100644 index 000000000..6f5000751 --- /dev/null +++ b/changelog/unreleased/7760 @@ -0,0 +1,4 @@ +Bugfix: Fixed a potential crash on cancelation of discovery jobs + + +https://github.com/owncloud/client/pull/7760 diff --git a/changelog/unreleased/7761 b/changelog/unreleased/7761 new file mode 100644 index 000000000..33d51169f --- /dev/null +++ b/changelog/unreleased/7761 @@ -0,0 +1,6 @@ +Bugfix: Fix a potential crash on Windows VFS + +We've fixed a potential crash where marking a file as +"Always keep on this device" caused the client to crash. + +https://github.com/owncloud/client/issues/7761 diff --git a/cmake/modules/FindLibcloudproviders.cmake b/cmake/modules/FindLibcloudproviders.cmake index 9b01f3a94..527c7509b 100644 --- a/cmake/modules/FindLibcloudproviders.cmake +++ b/cmake/modules/FindLibcloudproviders.cmake @@ -1,4 +1,4 @@ -# (c) 2019 Copyright ownCloud GmbH +# (c) 2019-2020 Copyright ownCloud GmbH # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING* file. diff --git a/docs/fonts/mplus-1mn-bold.ttf b/docs/fonts/mplus-1mn-bold.ttf Binary files differnew file mode 100644 index 000000000..5f26678ad --- /dev/null +++ b/docs/fonts/mplus-1mn-bold.ttf diff --git a/docs/fonts/mplus-1mn-medium.ttf b/docs/fonts/mplus-1mn-medium.ttf Binary files differnew file mode 100644 index 000000000..a85c66b40 --- /dev/null +++ b/docs/fonts/mplus-1mn-medium.ttf diff --git a/docs/fonts/mplus-1mn-regular.ttf b/docs/fonts/mplus-1mn-regular.ttf Binary files differnew file mode 100644 index 000000000..394fb2f57 --- /dev/null +++ b/docs/fonts/mplus-1mn-regular.ttf diff --git a/docs/fonts/mplus-1mn-thin.ttf b/docs/fonts/mplus-1mn-thin.ttf Binary files differnew file mode 100644 index 000000000..de41c15a8 --- /dev/null +++ b/docs/fonts/mplus-1mn-thin.ttf diff --git a/docs/fonts/mplus-1p-regular.ttf b/docs/fonts/mplus-1p-regular.ttf Binary files differnew file mode 100644 index 000000000..b64dee269 --- /dev/null +++ b/docs/fonts/mplus-1p-regular.ttf diff --git a/docs/modules/ROOT/pages/installing.adoc b/docs/modules/ROOT/pages/installing.adoc index 7d17edf77..58e407464 100644 --- a/docs/modules/ROOT/pages/installing.adoc +++ b/docs/modules/ROOT/pages/installing.adoc @@ -17,12 +17,12 @@ You will also find links to source code archives and older versions on the downl == System Requirements * Windows 7+ -* Mac OS X 10.7+ (*64-bit only*) -* CentOS 6 & 7 (64-bit only) -* Debian 8.0 & 9.0 -* Fedora 25 & 26 & 27 -* Ubuntu 16.04 & 17.04 & 17.10 -* openSUSE Leap 42.2 & 42.3 +* Mac OS X 10.10+ (64-bit only) +* CentOS 6 & 7 & 8 +* Debian 8.0 & 9.0 & 10 +* Fedora 27 & 28 & 29 & 30 & 31 +* Ubuntu 18.04 & 19.04 & 19.10 +* openSUSE Leap 42.2 & 42.3 & 15.0 & 15.1 & 15.2 NOTE: For Linux distributions, we support, if technically feasible, the latest 2 versions per platform and the previous Ubuntu https://wiki.ubuntu.com/LTS[LTS]. diff --git a/docs/resources/themes/owncloud-theme.yml b/docs/resources/themes/owncloud-theme.yml index 2abde5a83..41fbcd0ee 100644 --- a/docs/resources/themes/owncloud-theme.yml +++ b/docs/resources/themes/owncloud-theme.yml @@ -5,20 +5,20 @@ font: normal: notoserif-regular.ttf bold: notoserif-bold.ttf italic: notoserif-italic.ttf - bold_italic: notoserif-bold_italic.ttf + bold_italic: notoserif-bolditalic.ttf # M+ 1mn supports ASCII and the circled numbers used for conums M+ 1mn: - normal: mplus1mn-regular-ascii-conums.ttf - bold: mplus1mn-bold-ascii.ttf - italic: mplus1mn-italic-ascii.ttf - bold_italic: mplus1mn-bold_italic-ascii.ttf + normal: mplus-1mn-regular.ttf + bold: mplus-1mn-bold.ttf + italic: mplus-1mn-thin.ttf + bold_italic: mplus-1mn-medium.ttf # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font M+ 1p Fallback: - normal: mplus1p-regular-fallback.ttf - bold: mplus1p-regular-fallback.ttf - italic: mplus1p-regular-fallback.ttf - bold_italic: mplus1p-regular-fallback.ttf + normal: mplus-1p-regular.ttf + bold: mplus-1p-regular.ttf + italic: mplus-1p-regular.ttf + bold_italic: mplus-1p-regular.ttf Open Sans: normal: opensans-light.ttf bold: opensans-bold.ttf @@ -49,7 +49,7 @@ base: font_size: 10.5 line_height_length: 11 line_height: $base_line_height_length / $base_font_size - #line_height: 1 + #line_height: 1 font_size_large: round($base_font_size * 1.25) font_size_small: round($base_font_size * 0.85) font_size_min: $base_font_size * 0.75 diff --git a/src/gui/MacOSXBundleInfo.plist b/src/gui/MacOSXBundleInfo.plist index d77481d0e..b37b55393 100644 --- a/src/gui/MacOSXBundleInfo.plist +++ b/src/gui/MacOSXBundleInfo.plist @@ -27,7 +27,7 @@ <key>CFBundleShortVersionString</key> <string>${MIRALL_VERSION_STRING}</string> <key>NSHumanReadableCopyright</key> - <string>(C) 2014-2019 ${APPLICATION_VENDOR}</string> + <string>(C) 2014-2020 ${APPLICATION_VENDOR}</string> <key>SUShowReleaseNotes</key> <false/> <key>SUPublicDSAKeyFile</key> diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index fe6be59cc..1ddef1406 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -252,7 +252,10 @@ void AccountManager::saveAccountHelper(Account *acc, QSettings &settings, bool s CookieJar *jar = qobject_cast<CookieJar *>(acc->_am->cookieJar()); if (jar) { qCInfo(lcAccountManager) << "Saving cookies." << acc->cookieJarPath(); - jar->save(acc->cookieJarPath()); + if (!jar->save(acc->cookieJarPath())) + { + qCWarning(lcAccountManager) << "Failed to save cookies to" << acc->cookieJarPath(); + } } } } @@ -294,7 +297,9 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings) // now the server cert, it is in the general group settings.beginGroup(QLatin1String("General")); - acc->setApprovedCerts(QSslCertificate::fromData(settings.value(caCertsKeyC).toByteArray())); + const auto certs = QSslCertificate::fromData(settings.value(caCertsKeyC).toByteArray()); + qCInfo(lcAccountManager) << "Restored: " << certs.count() << " unknown certs."; + acc->setApprovedCerts(certs); settings.endGroup(); return acc; diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 34931f76b..b612c5a7e 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -547,7 +547,7 @@ void AccountSettings::slotEnableVfsCurrentFolder() if (!selected.isValid() || !folder) return; - OwncloudWizard::askExperimentalVirtualFilesFeature([folder, this](bool enable) { + OwncloudWizard::askExperimentalVirtualFilesFeature(this, [folder, this](bool enable) { if (!enable || !folder) return; diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index fbd472ffb..0dc918989 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -589,6 +589,13 @@ void FolderStatusModel::fetchMore(const QModelIndex &parent) QTimer::singleShot(1000, this, &FolderStatusModel::slotShowFetchProgress); } +void FolderStatusModel::resetAndFetch(const QModelIndex &parent) +{ + auto info = infoForIndex(parent); + info->resetSubs(this, parent); + fetchMore(parent); +} + void FolderStatusModel::slotGatherPermissions(const QString &href, const QMap<QString, QString> &map) { auto it = map.find("permissions"); @@ -721,11 +728,6 @@ void FolderStatusModel::slotUpdateDirectories(const QStringList &list) for (auto it = undecidedIndexes.begin(); it != undecidedIndexes.end(); ++it) { suggestExpand(index(*it, 0, idx)); } - -/* We need lambda function for the following code. - * It's just a small feature that will be missing if the comiler is too old */ -#if !(defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG)) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 405) - /* Try to remove the the undecided lists the items that are not on the server. */ auto it = std::remove_if(selectiveSyncUndecidedList.begin(), selectiveSyncUndecidedList.end(), [&](const QString &s) { return selectiveSyncUndecidedSet.count(s); }); @@ -735,7 +737,6 @@ void FolderStatusModel::slotUpdateDirectories(const QStringList &list) SyncJournalDb::SelectiveSyncUndecidedList, selectiveSyncUndecidedList); emit dirtyChanged(); } -#endif } void FolderStatusModel::slotLscolFinishedWithError(QNetworkReply *r) @@ -1096,10 +1097,7 @@ void FolderStatusModel::slotFolderSyncStateChange(Folder *f) if (f->syncResult().folderStructureWasChanged() && (state == SyncResult::Success || state == SyncResult::Problem)) { // There is a new or a removed folder. reset all data - auto &info = _folders[folderIndex]; - auto idx = index(folderIndex); - info.resetSubs(this, idx); - fetchMore(idx); + resetAndFetch(index(folderIndex)); } } @@ -1206,7 +1204,7 @@ void FolderStatusModel::slotNewBigFolder() return; } - _folders[folderIndex].resetSubs(this, index(folderIndex)); + resetAndFetch(index(folderIndex)); emit suggestExpand(index(folderIndex)); emit dirtyChanged(); diff --git a/src/gui/folderstatusmodel.h b/src/gui/folderstatusmodel.h index fe7679360..4d338732a 100644 --- a/src/gui/folderstatusmodel.h +++ b/src/gui/folderstatusmodel.h @@ -52,6 +52,7 @@ public: QModelIndex parent(const QModelIndex &child) const override; bool canFetchMore(const QModelIndex &parent) const override; void fetchMore(const QModelIndex &parent) override; + void resetAndFetch(const QModelIndex &parent); bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; struct SubFolderInfo diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp index 8e3ddb505..e2bace7e2 100644 --- a/src/gui/folderwizard.cpp +++ b/src/gui/folderwizard.cpp @@ -445,6 +445,8 @@ bool FolderWizardRemotePath::isComplete() const warnStrings.append(tr("This folder is already being synced.")); } else if (dir.startsWith(curDir)) { warnStrings.append(tr("You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.").arg(Utility::escape(curDir), Utility::escape(dir))); + } else if (curDir.startsWith(dir)) { + warnStrings.append(tr("You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.").arg(Utility::escape(curDir), Utility::escape(dir))); } } @@ -538,7 +540,7 @@ void FolderWizardSelectiveSync::virtualFilesCheckboxClicked() // The click has already had an effect on the box, so if it's // checked it was newly activated. if (_virtualFilesCheckBox->isChecked()) { - OwncloudWizard::askExperimentalVirtualFilesFeature([this](bool enable) { + OwncloudWizard::askExperimentalVirtualFilesFeature(this, [this](bool enable) { if (!enable) _virtualFilesCheckBox->setChecked(false); }); diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 4257d382d..950266c6f 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -52,13 +52,12 @@ const QString TOOLBAR_CSS() "QToolBar QToolButton:checked { background: %3; color: %4; }"); } -const float buttonSizeRatio = 1.618f; // golden ratio +const float BUTTONSIZERATIO = 1.618f; // golden ratio /** display name with two lines that is displayed in the settings - * If width is bigger than 0, the string will be ellided so it does not exceed that width */ -QString shortDisplayNameForSettings(OCC::Account *account, int width) +QString shortDisplayNameForSettings(OCC::Account *account) { QString user = account->davDisplayName(); if (user.isEmpty()) { @@ -70,12 +69,6 @@ QString shortDisplayNameForSettings(OCC::Account *account, int width) host.append(QLatin1Char(':')); host.append(QString::number(port)); } - if (width > 0) { - QFont f; - QFontMetrics fm(f); - host = fm.elidedText(host, Qt::ElideMiddle, width); - user = fm.elidedText(user, Qt::ElideRight, width); - } return QStringLiteral("%1\n%2").arg(user, host); } } @@ -132,7 +125,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) _ui->stack->addWidget(networkSettings); QWidget *spacer = new QWidget(); - spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum); _toolBar->addWidget(spacer); QAction *quitAction = createColorAwareAction(QLatin1String(":/client/resources/quit.png"), tr("Quit %1").arg(qApp->applicationName())); @@ -251,8 +244,6 @@ void SettingsDialog::showIssuesList(const QString &folderAlias) void SettingsDialog::accountAdded(AccountState *s) { - auto height = _toolBar->sizeHint().height(); - bool brandingSingleAccount = !Theme::instance()->multiAccount(); QAction *accountAction; @@ -268,7 +259,7 @@ void SettingsDialog::accountAdded(AccountState *s) if (!brandingSingleAccount) { accountAction->setToolTip(s->account()->displayName()); - accountAction->setIconText(shortDisplayNameForSettings(s->account().data(), height * buttonSizeRatio)); + accountAction->setIconText(shortDisplayNameForSettings(s->account().data())); } _toolBar->insertAction(_toolBar->actions().at(0), accountAction); auto accountSettings = new AccountSettings(s, this); @@ -317,8 +308,7 @@ void SettingsDialog::slotAccountDisplayNameChanged() if (action) { QString displayName = account->displayName(); action->setText(displayName); - auto height = _toolBar->sizeHint().height(); - action->setIconText(shortDisplayNameForSettings(account, height * buttonSizeRatio)); + action->setIconText(shortDisplayNameForSettings(account)); } } } @@ -407,16 +397,16 @@ public: return nullptr; } - QToolButton *btn = new QToolButton(parent); + QToolButton *btn = new QToolButton(toolbar); QString objectName = QLatin1String("settingsdialog_toolbutton_"); objectName += text(); btn->setObjectName(objectName); btn->setDefaultAction(this); btn->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); - btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); - // btn->setMinimumWidth(qMax<int>(parent->sizeHint().height() * buttonSizeRatio, - // btn->sizeHint().width())); + btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding); + // icon size is fixed, we can't use the toolbars actual size hint as it might not be defined yet + btn->setMinimumWidth(toolbar->iconSize().height() * BUTTONSIZERATIO); return btn; } }; diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp index b2fc30bfe..75b6b2a11 100644 --- a/src/gui/sharelinkwidget.cpp +++ b/src/gui/sharelinkwidget.cpp @@ -45,7 +45,6 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account, , _sharePath(sharePath) , _localPath(localPath) , _manager(nullptr) - , _passwordRequired(false) , _expiryRequired(false) , _namesSupported(true) { @@ -136,10 +135,9 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account, // Parse capabilities - // If password is enforced then don't allow users to disable it - if (_account->capabilities().sharePublicLinkEnforcePassword()) { - _ui->checkBox_password->setEnabled(false); - _passwordRequired = true; + if (!_account->capabilities().sharePublicLinkAllowUpload()) { + _ui->radio_readWrite->setEnabled(false); + _ui->radio_uploadOnly->setEnabled(false); } // If expiredate is enforced do not allow disable and set max days @@ -330,25 +328,44 @@ void ShareLinkWidget::slotShareSelectionChanged() _ui->shareProperties->setEnabled(true); - _ui->checkBox_password->setEnabled(!_passwordRequired); - _ui->checkBox_expire->setEnabled(!_expiryRequired); - _ui->widget_editing->setEnabled(true); - if (!_account->capabilities().sharePublicLinkAllowUpload()) { - _ui->radio_readWrite->setEnabled(false); - _ui->radio_uploadOnly->setEnabled(false); + // Public upload state (files can only be read-only, box is hidden for them) + _ui->widget_editing->setEnabled(!_isFile); + if (!selectionUnchanged) { + if (share && share->getPublicUpload()) { + if (share->getShowFileListing()) { + _ui->radio_readWrite->setChecked(true); + } else { + _ui->radio_uploadOnly->setChecked(true); + } + } else { + _ui->radio_readOnly->setChecked(true); + } } + const auto capabilities = _account->capabilities(); + const bool passwordRequired = + (_ui->radio_readOnly->isChecked() && capabilities.sharePublicLinkEnforcePasswordForReadOnly()) + || (_ui->radio_readWrite->isChecked() && capabilities.sharePublicLinkEnforcePasswordForReadWrite()) + || (_ui->radio_uploadOnly->isChecked() && capabilities.sharePublicLinkEnforcePasswordForUploadOnly()); + // Password state _ui->pushButton_setPassword->setVisible(!createNew); _ui->checkBox_password->setText(tr("P&assword protect")); - if (!selectionUnchanged) { - if (share && share->isPasswordSet()) { + if (createNew) { + if (passwordRequired) { _ui->checkBox_password->setChecked(true); - _ui->lineEdit_password->setPlaceholderText("********"); + _ui->lineEdit_password->setPlaceholderText(tr("Please Set Password")); _ui->lineEdit_password->setEnabled(true); - } else if (createNew && _passwordRequired) { + } else if (!selectionUnchanged || _ui->lineEdit_password->text().isEmpty()) { + // force to off if no password was entered yet + _ui->checkBox_password->setChecked(false); + _ui->lineEdit_password->setPlaceholderText(QString()); + _ui->lineEdit_password->setEnabled(false); + } + } else if (!selectionUnchanged) { + if (share && share->isPasswordSet()) { _ui->checkBox_password->setChecked(true); - _ui->lineEdit_password->setPlaceholderText(tr("Please Set Password")); + _ui->lineEdit_password->setPlaceholderText("********"); _ui->lineEdit_password->setEnabled(true); } else { _ui->checkBox_password->setChecked(false); @@ -358,35 +375,31 @@ void ShareLinkWidget::slotShareSelectionChanged() _ui->lineEdit_password->setText(QString()); _ui->pushButton_setPassword->setEnabled(false); } + // The following is done to work with old shares when the pw requirement + // is enabled on the server later: users can add pws to old shares. + _ui->checkBox_password->setEnabled(!_ui->checkBox_password->isChecked() || !passwordRequired); // Expiry state _ui->calendar->setMinimumDate(QDate::currentDate().addDays(1)); - if (share && share->getExpireDate().isValid()) { - _ui->checkBox_expire->setChecked(true); - _ui->calendar->setDate(share->getExpireDate()); - _ui->calendar->setEnabled(true); - } else if (createNew) { - const QDate defaultExpire = capabilityDefaultExpireDate(); - if (defaultExpire.isValid()) - _ui->calendar->setDate(defaultExpire); - const bool enabled = _expiryRequired || defaultExpire.isValid(); - _ui->checkBox_expire->setChecked(enabled); - _ui->calendar->setEnabled(enabled); - } else { - _ui->checkBox_expire->setChecked(false); - _ui->calendar->setEnabled(false); - } - - // Public upload state - if (share && share->getPublicUpload()) { - if (share->getShowFileListing()) { - _ui->radio_readWrite->setChecked(true); + if (!selectionUnchanged) { + if (share && share->getExpireDate().isValid()) { + _ui->checkBox_expire->setChecked(true); + _ui->calendar->setDate(share->getExpireDate()); + _ui->calendar->setEnabled(true); + } else if (createNew) { + const QDate defaultExpire = capabilityDefaultExpireDate(); + if (defaultExpire.isValid()) + _ui->calendar->setDate(defaultExpire); + const bool enabled = _expiryRequired || defaultExpire.isValid(); + _ui->checkBox_expire->setChecked(enabled); + _ui->calendar->setEnabled(enabled); } else { - _ui->radio_uploadOnly->setChecked(true); + _ui->checkBox_expire->setChecked(false); + _ui->calendar->setEnabled(false); } - } else { - _ui->radio_readOnly->setChecked(true); } + // Allows checking expiry on old shares created before it was required. + _ui->checkBox_expire->setEnabled(!_ui->checkBox_expire->isChecked() || !_expiryRequired); // Name and create button _ui->create->setVisible(createNew); @@ -655,6 +668,9 @@ void ShareLinkWidget::slotPermissionsClicked() _ui->errorLabel->hide(); current->setPermissions(uiPermissionState()); + } else { + // Password may now be required, update ui. + slotShareSelectionChanged(); } } @@ -690,6 +706,10 @@ void ShareLinkWidget::slotServerError(int code, const QString &message) _pi_password->stopAnimation(); _pi_editing->stopAnimation(); + // Reset UI state + _selectedShareId.clear(); + slotShareSelectionChanged(); + qCWarning(lcSharing) << "Error from server" << code << message; displayError(message); } @@ -698,7 +718,6 @@ void ShareLinkWidget::slotPasswordSetError(int code, const QString &message) { slotServerError(code, message); - _ui->checkBox_password->setEnabled(!_passwordRequired); _ui->lineEdit_password->setEnabled(true); _ui->lineEdit_password->setFocus(); } diff --git a/src/gui/sharelinkwidget.h b/src/gui/sharelinkwidget.h index e22b24b8c..7364fba24 100644 --- a/src/gui/sharelinkwidget.h +++ b/src/gui/sharelinkwidget.h @@ -127,7 +127,6 @@ private: ShareManager *_manager; bool _isFile; - bool _passwordRequired; bool _expiryRequired; bool _namesSupported; diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp index 9d02f8eea..3473c2366 100644 --- a/src/gui/socketapi.cpp +++ b/src/gui/socketapi.cpp @@ -889,7 +889,7 @@ void SocketApi::sendSharingContextMenuOptions(const FileData &fileData, SocketLi // Is is possible to create a public link without user choices? bool canCreateDefaultPublicLink = publicLinksEnabled - && !capabilities.sharePublicLinkEnforcePassword(); + && !capabilities.sharePublicLinkEnforcePasswordForReadOnly(); if (canCreateDefaultPublicLink) { listener->sendMessage(QLatin1String("MENU_ITEM:COPY_PUBLIC_LINK") + flagString + tr("Copy public link to clipboard")); diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp index 0e738089e..15e6a7d20 100644 --- a/src/gui/wizard/owncloudadvancedsetuppage.cpp +++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp @@ -362,14 +362,16 @@ void OwncloudAdvancedSetupPage::slotSelectiveSyncClicked() void OwncloudAdvancedSetupPage::slotVirtualFileSyncClicked() { - OwncloudWizard::askExperimentalVirtualFilesFeature([this](bool enable) { - if (!enable) - return; - - _ui.lSelectiveSyncSizeLabel->setText(QString()); - _selectiveSyncBlacklist.clear(); - setRadioChecked(_ui.rVirtualFileSync); - }); + if (!_ui.rVirtualFileSync->isChecked()) { + OwncloudWizard::askExperimentalVirtualFilesFeature(this, [this](bool enable) { + if (!enable) + return; + + _ui.lSelectiveSyncSizeLabel->setText(QString()); + _selectiveSyncBlacklist.clear(); + setRadioChecked(_ui.rVirtualFileSync); + }); + } } void OwncloudAdvancedSetupPage::slotSyncEverythingClicked() diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp index e1dc7e3d2..e77fbe37b 100644 --- a/src/gui/wizard/owncloudwizard.cpp +++ b/src/gui/wizard/owncloudwizard.cpp @@ -235,7 +235,7 @@ AbstractCredentials *OwncloudWizard::getCredentials() const return nullptr; } -void OwncloudWizard::askExperimentalVirtualFilesFeature(const std::function<void(bool enable)> &callback) +void OwncloudWizard::askExperimentalVirtualFilesFeature(QWidget *receiver, const std::function<void(bool enable)> &callback) { const auto bestVfsMode = bestAvailableVfsMode(); QMessageBox *msgBox = nullptr; @@ -274,7 +274,8 @@ void OwncloudWizard::askExperimentalVirtualFilesFeature(const std::function<void msgBox->addButton(tr("Enable experimental placeholder mode"), QMessageBox::AcceptRole); msgBox->addButton(tr("Stay safe"), QMessageBox::RejectRole); } - connect(msgBox, &QMessageBox::finished, msgBox, [callback, msgBox](int result) { + msgBox->setParent(receiver); + connect(msgBox, &QMessageBox::finished, receiver, [callback, msgBox](int result) { callback(result == QMessageBox::AcceptRole); msgBox->deleteLater(); }); diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h index 45be13872..72a69f676 100644 --- a/src/gui/wizard/owncloudwizard.h +++ b/src/gui/wizard/owncloudwizard.h @@ -74,7 +74,7 @@ public: * being experimental. Calles the callback with true if enabling was * chosen. */ - static void askExperimentalVirtualFilesFeature(const std::function<void(bool enable)> &callback); + static void askExperimentalVirtualFilesFeature(QWidget *receiver, const std::function<void(bool enable)> &callback); // FIXME: Can those be local variables? // Set from the OwncloudSetupPage, later used from OwncloudHttpCredsPage diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index 335ae4cd4..f9e334bf0 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -299,6 +299,7 @@ QSslConfiguration Account::getOrCreateSslConfig() void Account::setApprovedCerts(const QList<QSslCertificate> certs) { _approvedCerts = certs; + QSslSocket::addDefaultCaCertificates(certs); } void Account::addApprovedCerts(const QList<QSslCertificate> certs) @@ -389,11 +390,14 @@ void Account::slotHandleSslErrors(QNetworkReply *reply, QList<QSslError> errors) if (!guard) return; - QSslSocket::addDefaultCaCertificates(approvedCerts); - addApprovedCerts(approvedCerts); - emit wantsAccountSaved(this); - // all ssl certs are known and accepted. We can ignore the problems right away. - qCInfo(lcAccount) << out << "Certs are known and trusted! This is not an actual error."; + if (!approvedCerts.isEmpty()) { + QSslSocket::addDefaultCaCertificates(approvedCerts); + addApprovedCerts(approvedCerts); + emit wantsAccountSaved(this); + + // all ssl certs are known and accepted. We can ignore the problems right away. + qCInfo(lcAccount) << out << "Certs are known and trusted! This is not an actual error."; + } // Warning: Do *not* use ignoreSslErrors() (without args) here: // it permanently ignores all SSL errors for this host, even diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index 9674997d6..c89a85960 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -49,9 +49,27 @@ bool Capabilities::sharePublicLinkSupportsUploadOnly() const return _fileSharingPublicCapabilities.value(QStringLiteral("supports_upload_only")).toBool(); } -bool Capabilities::sharePublicLinkEnforcePassword() const +static bool getEnforcePasswordCapability(const QVariantMap &fileSharingPublicCapabilities, const QByteArray &name) { - return _fileSharingPublicCapabilities.value(QStringLiteral("password")).toMap().value(QStringLiteral("enforced")).toBool(); + auto value = fileSharingPublicCapabilities["password"].toMap()["enforced_for"].toMap()[name]; + if (!value.isValid()) + return fileSharingPublicCapabilities["password"].toMap()["enforced"].toBool(); + return value.toBool(); +} + +bool Capabilities::sharePublicLinkEnforcePasswordForReadOnly() const +{ + return getEnforcePasswordCapability(_fileSharingPublicCapabilities, QByteArrayLiteral("read_only")); +} + +bool Capabilities::sharePublicLinkEnforcePasswordForReadWrite() const +{ + return getEnforcePasswordCapability(_fileSharingPublicCapabilities, QByteArrayLiteral("read_write")); +} + +bool Capabilities::sharePublicLinkEnforcePasswordForUploadOnly() const +{ + return getEnforcePasswordCapability(_fileSharingPublicCapabilities, QByteArrayLiteral("upload_only")); } bool Capabilities::sharePublicLinkDefaultExpire() const diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h index 9ada3648c..b7a571716 100644 --- a/src/libsync/capabilities.h +++ b/src/libsync/capabilities.h @@ -37,7 +37,16 @@ public: bool sharePublicLink() const; bool sharePublicLinkAllowUpload() const; bool sharePublicLinkSupportsUploadOnly() const; - bool sharePublicLinkEnforcePassword() const; + + /** Whether read-only link shares require a password. + * + * Returns sharePublicLinkEnforcePassword() if the fine-grained + * permission isn't available. + */ + bool sharePublicLinkEnforcePasswordForReadOnly() const; + bool sharePublicLinkEnforcePasswordForReadWrite() const; + bool sharePublicLinkEnforcePasswordForUploadOnly() const; + bool sharePublicLinkDefaultExpire() const; int sharePublicLinkDefaultExpireDateDays() const; bool sharePublicLinkEnforceExpireDate() const; diff --git a/src/libsync/cookiejar.cpp b/src/libsync/cookiejar.cpp index a15ac87d1..11e423103 100644 --- a/src/libsync/cookiejar.cpp +++ b/src/libsync/cookiejar.cpp @@ -21,6 +21,7 @@ #include <QLoggingCategory> #include <QNetworkCookie> #include <QDataStream> +#include <QDir> namespace OCC { @@ -97,27 +98,45 @@ void CookieJar::clearSessionCookies() setAllCookies(removeExpired(allCookies())); } -void CookieJar::save(const QString &fileName) +bool CookieJar::save(const QString &fileName) { - QFile file; - file.setFileName(fileName); + const QFileInfo info(fileName); + if (!info.dir().exists()) + { + info.dir().mkpath("."); + } + qCDebug(lcCookieJar) << fileName; - file.open(QIODevice::WriteOnly); + QFile file(fileName); + if (!file.open(QIODevice::WriteOnly)) + { + return false; + } QDataStream stream(&file); stream << removeExpired(allCookies()); file.close(); + return true; } -void CookieJar::restore(const QString &fileName) +bool CookieJar::restore(const QString &fileName) { - QFile file; - file.setFileName(fileName); - file.open(QIODevice::ReadOnly); + const QFileInfo info(fileName); + if (!info.exists()) + { + return false; + } + + QFile file(fileName); + if (!file.open(QIODevice::ReadOnly)) + { + return false; + } QDataStream stream(&file); QList<QNetworkCookie> list; stream >> list; setAllCookies(removeExpired(list)); file.close(); + return true; } QList<QNetworkCookie> CookieJar::removeExpired(const QList<QNetworkCookie> &cookies) diff --git a/src/libsync/cookiejar.h b/src/libsync/cookiejar.h index 95ae38027..6d3703aaa 100644 --- a/src/libsync/cookiejar.h +++ b/src/libsync/cookiejar.h @@ -39,8 +39,8 @@ public: using QNetworkCookieJar::setAllCookies; using QNetworkCookieJar::allCookies; - void save(const QString &fileName); - void restore(const QString &fileName); + bool save(const QString &fileName); + bool restore(const QString &fileName); signals: void newCookiesForUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url); diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp index 26a69a496..6f837f748 100644 --- a/src/libsync/discoveryphase.cpp +++ b/src/libsync/discoveryphase.cpp @@ -167,6 +167,7 @@ QPair<bool, QByteArray> DiscoveryPhase::findAndCancelDeletedJob(const QString &o (*it)->_instruction = CSYNC_INSTRUCTION_NONE; result = true; oldEtag = (*it)->_etag; + _deletedItem.erase(it); } if (auto *otherJob = _queuedDeletedDirectories.take(originalPath)) { oldEtag = otherJob->_dirItem->_etag; diff --git a/src/libsync/discoveryphase.h b/src/libsync/discoveryphase.h index 5bc2b0624..105954ce8 100644 --- a/src/libsync/discoveryphase.h +++ b/src/libsync/discoveryphase.h @@ -158,7 +158,7 @@ class DiscoveryPhase : public QObject friend class ProcessDirectoryJob; - ProcessDirectoryJob *_currentRootJob = nullptr; + QPointer<ProcessDirectoryJob> _currentRootJob; /** Maps the db-path of a deleted item to its SyncFileItem. * diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7c1dcda17..463cdbfce 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -33,6 +33,7 @@ owncloud_add_test(OwnSql "") owncloud_add_test(SyncJournalDB "") owncloud_add_test(SyncFileItem "") owncloud_add_test(ConcatUrl "") +owncloud_add_test(Cookies "") owncloud_add_test(XmlParse "") owncloud_add_test(ChecksumValidator "") diff --git a/test/testcookies.cpp b/test/testcookies.cpp new file mode 100644 index 000000000..a5053abd9 --- /dev/null +++ b/test/testcookies.cpp @@ -0,0 +1,43 @@ +/* + This software is in the public domain, furnished "as is", without technical + support, and with no warranty, express or implied, as to its usefulness for + any purpose. +*/ + +#include <QtTest> + +#include "libsync/cookiejar.h" + +using namespace OCC; + +class TestCookies : public QObject +{ + Q_OBJECT + +private slots: + void testCookies() + { + QTemporaryDir tmp; + const QString nonexistingPath = tmp.filePath("someNonexistingDir/test.db"); + QNetworkCookie cookieA = QNetworkCookie("foo", "bar"); + // tomorrow rounded + cookieA.setExpirationDate(QDateTime(QDateTime::currentDateTimeUtc().addDays(1).date())); + const QList<QNetworkCookie> cookies = {cookieA, QNetworkCookie("foo2", "bar")}; + CookieJar jar; + jar.setAllCookies(cookies); + QCOMPARE(cookies, jar.allCookies()); + QVERIFY(jar.save(tmp.filePath("test.db"))); + // ensure we are able to create a cookie jar in a non exisitning folder (mkdir) + QVERIFY(jar.save(nonexistingPath)); + + CookieJar jar2; + QVERIFY(jar2.restore(nonexistingPath)); + // here we should have only cookieA as the second one was a session cookie + QCOMPARE(QList<QNetworkCookie>{cookieA}, jar2.allCookies()); + + } + +}; + +QTEST_APPLESS_MAIN(TestCookies) +#include "testcookies.moc" diff --git a/test/testsyncmove.cpp b/test/testsyncmove.cpp index 4122b91e0..9a503be29 100644 --- a/test/testsyncmove.cpp +++ b/test/testsyncmove.cpp @@ -287,40 +287,46 @@ private slots: QVERIFY(fakeFolder.syncOnce()); QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState()); - int nGET = 0; - fakeFolder.setServerOverride([&](QNetworkAccessManager::Operation op, const QNetworkRequest &, QIODevice *) { - if (op == QNetworkAccessManager::GetOperation) - ++nGET; - return nullptr; - }); + OperationCounter counter; + fakeFolder.setServerOverride(counter.functor()); // Try a remote file move remote.rename("A/a1", "A/W/a1m"); remote.rename(prefix + "/A/a1", prefix + "/A/W/a1m"); QVERIFY(fakeFolder.syncOnce()); QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState()); - QCOMPARE(nGET, 0); + QCOMPARE(counter.nGET, 0); // And a remote directory move remote.rename("A/W", "A/Q/W"); remote.rename(prefix + "/A/W", prefix + "/A/Q/W"); QVERIFY(fakeFolder.syncOnce()); QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState()); - QCOMPARE(nGET, 0); + QCOMPARE(counter.nGET, 0); // Partial file removal (in practice, A/a2 may be moved to O/a2, but we don't care) remote.rename(prefix + "/A/a2", prefix + "/a2"); remote.remove("A/a2"); QVERIFY(fakeFolder.syncOnce()); QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState()); - QCOMPARE(nGET, 0); + QCOMPARE(counter.nGET, 0); // Local change plus remote move at the same time fakeFolder.localModifier().appendByte(prefix + "/a2"); remote.rename(prefix + "/a2", prefix + "/a3"); QVERIFY(fakeFolder.syncOnce()); QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState()); - QCOMPARE(nGET, 1); + QCOMPARE(counter.nGET, 1); + counter.reset(); + + // remove localy, and remote move at the same time + fakeFolder.localModifier().remove("A/Q/W/a1m"); + remote.rename("A/Q/W/a1m", "A/Q/W/a1p"); + remote.rename(prefix + "/A/Q/W/a1m", prefix + "/A/Q/W/a1p"); + QVERIFY(fakeFolder.syncOnce()); + QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState()); + QCOMPARE(counter.nGET, 1); + counter.reset(); } void testMovePropagation() @@ -807,6 +813,34 @@ private slots: QCOMPARE(counter.nMOVE, 2); } + void moveFileToDifferentFolderOnBothSides() + { + FakeFolder fakeFolder { FileInfo::A12_B12_C12_S12() }; + OperationCounter counter; + fakeFolder.setServerOverride(counter.functor()); + + // Test that moving a file within to different folder on both side does the right thing. + + fakeFolder.remoteModifier().rename("B/b1", "A/b1"); + fakeFolder.localModifier().rename("B/b1", "C/b1"); + + fakeFolder.localModifier().rename("B/b2", "A/b2"); + fakeFolder.remoteModifier().rename("B/b2", "C/b2"); + + QVERIFY(fakeFolder.syncOnce()); + QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState()); + QVERIFY(fakeFolder.currentRemoteState().find("A/b1")); + QVERIFY(fakeFolder.currentRemoteState().find("C/b1")); + QVERIFY(fakeFolder.currentRemoteState().find("A/b2")); + QVERIFY(fakeFolder.currentRemoteState().find("C/b2")); + QCOMPARE(counter.nMOVE, 0); // Unfortunately, we can't really make a move in this case + QCOMPARE(counter.nGET, 2); + QCOMPARE(counter.nPUT, 2); + QCOMPARE(counter.nDELETE, 0); + counter.reset(); + + } + // Test that deletes don't run before renames void testRenameParallelism() { diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 2cb2d5fe3..6df99975e 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -699,17 +699,17 @@ This action will abort any currently running synchronization.</source> <translation>Pokračovat</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Chyba přístupu ke konfiguračnímu souboru</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Došlo k chybě při přístupu ke konfigurační soubor %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Ukončit ownCloud</translation> </message> @@ -781,8 +781,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -790,27 +790,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>Adresář nenalezen: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>Kódování znaků jména soubor je neplatné</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>Chyba při čtení adresáře %1</translation> </message> @@ -912,40 +912,40 @@ This action will abort any currently running synchronization.</source> <translation>Průběh synchronizace</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <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="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Pokud to chcete stáhnout, běžte do nastavení a vyberte to.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -954,7 +954,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="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -964,7 +964,7 @@ Tyto soubory budou smazány i ve vaší místní synchronizované složce a nebu Rozhodnete-li se soubory smazat, budou vám nedostupné, nejste-li jejich vlastníkem.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -973,17 +973,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Odstranit všechny soubory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Odstranit všechny soubory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Ponechat soubory</translation> </message> @@ -1159,107 +1159,107 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>Jsou zde nevyřešené konflikty. Klikněte pro detaily.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>Zjišťuji změny ve vzdáleném '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>Zjišťuji změny v místním '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Srovnávám změny</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronizuji %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>soubor %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Chvíli strpení...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Čeká se na %n další adresář...</numerusform><numerusform>Čeká se na %n další adresáře...</numerusform><numerusform>Čeká se na %n dalších adresářů...</numerusform><numerusform>Čeká se na %n dalších adresářů...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Synchronizace se připravuje...</translation> </message> @@ -1283,12 +1283,12 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Přidat synchronizaci adresáře</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Přidat synchronizační připojení</translation> </message> @@ -1358,21 +1358,26 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Již synchronizujete adresář <i>%1</i>, který je adresáři <i>%2</i> nadřazený.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation type="unfinished"/> </message> @@ -1531,29 +1536,29 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>&Restart && aktualizace</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Zrušit</translation> </message> @@ -2137,7 +2142,7 @@ můžete být požádáni o dodatečná oprávnění.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3035,33 +3040,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nastavení</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Aktivita</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Hlavní</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Síť</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Ukončit %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Účet</translation> </message> @@ -3207,96 +3212,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Kdokoliv, kdo má odkaz, může přistupovat k tomuto souboru/složce</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>Ch&ránit heslem</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Tento soubor nelze sdílet, protože byl nasdílen bez možnosti dalšího sdílení.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Vytvoření veřejného odkazu</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Smazat</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Otevřít odkaz v prohlížeči</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Zkopírovat URL do schránky</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Poslat odkaz emailem</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation>Vytvořit nový...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Potvrdit smazání sdíleného odkazu</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Zrušit</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Veřejný odkaz</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Nastavte prosím heslo</translation> </message> @@ -3896,243 +3901,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Přihlašte se prosím</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Adresář %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Nejsou nastaveny žádné adresáře pro synchronizaci.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Otevřít v prohlížeči</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Přihlásit...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Odhlásit se</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Poslední změny</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Spravované adresáře:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Otevřít adresář '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Otevřít %1 v prohlížeči</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an 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="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Neznámý stav</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Nastavení...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Podrobnosti...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Nápověda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Ukončit %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Odpojeno od %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Nepodporovaná verze serveru</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Odpojeno</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Odpojeno od účtů:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Účet %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Odhlášeno</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>Synchronizace účtu je vypnuta</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>Synchronizace je pozastavena</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Chyba při synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Spustit všechny adresáře</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Pozastavit všechny adresáře</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Spustit veškerou synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Spustit synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Pozastavit veškerou synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Pozastavit synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Odhlásit ze všech účtů</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Přihlásit ke všem účtům...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Nový účet...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>O %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Žádné položky nebyly nedávno synchronizovány</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Zjišťuji změny ve vzdáleném '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Zjišťuji změny v místním '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synchronizuji %1 ze %2 (zbývá %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Synchronizace %1 z %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronizuji %1 (zbývá %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Synchronizuji %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Aktuální</translation> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index 70208eb43..8a20c349d 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -524,7 +524,7 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <message> <location filename="../src/gui/activitylistmodel.cpp" line="74"/> <source>%1 %2 on %3</source> - <translation type="unfinished"/> + <translation>%1 %2 für %3</translation> </message> </context> <context> @@ -609,22 +609,22 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <message numerus="yes"> <location filename="../src/gui/activitywidget.cpp" line="351"/> <source>%n notifications(s) for %1.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n Benachrichtigung für %1.</numerusform><numerusform>%n Benachrichtigungen für %1.</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/gui/activitywidget.cpp" line="357"/> <source>%n notifications(s) for %1 and %2.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n Benachrichtigung für %1 und %2.</numerusform><numerusform>%n Benachrichtigungen für %1 und %2.</numerusform></translation> </message> <message> <location filename="../src/gui/activitywidget.cpp" line="359"/> <source>New notifications for %1, %2 and other accounts.</source> - <translation type="unfinished"/> + <translation>Neue Benachrichtigungen für %1, %2 und andere Konten.</translation> </message> <message> <location filename="../src/gui/activitywidget.cpp" line="362"/> <source>Open the activity view for details.</source> - <translation type="unfinished"/> + <translation>Öffne die Aktivitäts-Ansicht für Genaueres.</translation> </message> <message> <location filename="../src/gui/activitywidget.cpp" line="145"/> @@ -703,17 +703,17 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <translation>Fortsetzen</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Fehler beim Zugriff auf die Konfigurationsdatei</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Es ist ein Fehler beim Zugriff auf die Konfigurationsdatei unter %1 aufgetreten.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>ownCloud verlassen</translation> </message> @@ -785,8 +785,8 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Server Fehler: Die PROPFIND Antwort ist nicht XML formattiert!</translation> </message> @@ -794,27 +794,27 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation>Fehler beim Öffnen des Ordners %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation>Der Ordner ist auf dem Client nicht erreichbar, Zugriff verweigert</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>Ordner nicht gefunden: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>Dateikodierung ist ungültig</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>Fehler beim Lesen des Ordners %1</translation> </message> @@ -916,41 +916,41 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <translation>Synchronisierungsaktivität</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <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="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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 erzeugt aber früher von der Synchronisation ausgeschlossen. Daten im Ordner werden nicht synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Die Datei %1 wurde erzeugt aber früher von der Synchronisation ausgeschlossen. Sie wird nicht synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -963,7 +963,7 @@ Dies bedeutet, dass der Synchronisationsclient lokale Änderungen möglicherweis %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -974,7 +974,7 @@ 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="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -983,17 +983,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Alle Dateien löschen?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Lösche alle Dateien</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Dateien behalten</translation> </message> @@ -1169,107 +1169,107 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>Änderungen der entfernten Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>Änderungen der lokalen Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>Datei %1 von %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Warte...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Bereite Synchronisation vor...</translation> </message> @@ -1293,12 +1293,12 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Ordner-Synchronisation hinzufügen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Synchronisation hinzufügen</translation> </message> @@ -1368,21 +1368,26 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Sie synchronisieren bereits <i>%1</i>, das ein übergeordneten Ordner von <i>%2</i> ist.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation>Virtuelle Dateien verwenden, anstatt die Dateien herunter zu laden %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation>(Tech-Vorschau)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation>(Experimentell)</translation> </message> @@ -1541,17 +1546,17 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>&Neustarten && aktualisieren</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Autostart kann nicht abgeschaltet werden, da Autostart als Systemeinstellung aktiviert ist.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>Update-Kanal verändern?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1559,12 +1564,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Beachten Sie, das dies nur bestimmt von welchem Bereich Sie Upgrades erhalten und dass es keine Downgrade-Möglichkeiten gibt: Ein "Schritt zurück" vom Beta-Kanal zum Stabilen-Kanal kann normalerweise nicht unverzüglich erfolgen und bedeutet Wartezeiten auf eine Stabile-Version, die dann neuer ist als die jeweils aktuell installierte Beta-Version.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>Update-Kanal ändern</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -1908,7 +1913,7 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <message> <location filename="../src/gui/networksettings.ui" line="176"/> <source>Note: proxy settings have no effects for accounts on localhost</source> - <translation type="unfinished"/> + <translation>Beachte: Proxy Einstellungen haben keinen Effekt bei Konten auf localhost</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="197"/> @@ -2152,7 +2157,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3056,33 +3061,33 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Einstellungen</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Aktivität</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Allgemein</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> - <translation type="unfinished"/> + <translation>Sind Sie sicher, dass sie %1 beenden möchten?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Benutzerkonto</translation> </message> @@ -3228,96 +3233,96 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Jeder mit dem Link hat Zugriff auf die Datei/Ordner</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>Passwort geschützt</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Die Datei kann nicht geteilt werden, weil sie ohne erneute Teilungs-Berechtigung für Sie geteilt wurde.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Das Teilen von Links wurde deaktiviert</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Öffentlichen Link zum Teilen erstellen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Löschen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Link im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Link in Zwischenablage kopieren</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Link in die Zwischenablage kopieren (direkter download)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Link als E-Mail verschicken</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Link per Email senden (direkter download)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation>Neu erstellen...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation>Ich habe %1 mit Ihnen geteilt</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Löschung des öffentlichen Links bestätigen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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>Möchte Sie wirklich den öffentlichen Link <i>%1 </i>löschen?<p>Hinweis: Dies kann nicht rückgängig gemacht werden.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Öffentlicher Link</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>Öffentlichen Link löschen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Bitte wählen Sie ein Passwort:</translation> </message> @@ -3919,243 +3924,243 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Bitte melden Sie sich an</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Ordner %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Es wurden keine Synchonisationsordner konfiguriert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Einloggen...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Letzte Änderungen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Verwaltete Ordner:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Ordner »%1« öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>%1 im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>Der Server mit Konto %1 läuft mit einer nicht unterstützten Version %2. Die Verwendung dieses Clienten mit nicht unterstützten Serverversionen ist ungetestet und möglicherweise gefährlich. Fortfahren auf eigenes Risiko.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Unbekannter Status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Einstellungen …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Details …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Von %1 trennen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>nicht unterstützte Server Version</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Getrennt</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>Die Verbindungen zu einigen Konten wurde getrennt</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Verbindungen zu Konten wurde getrennt:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Konto %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Abgemeldet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>Account Synchronisation ist deaktiviert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>Synchronisation pausiert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>Ungelöste Konflikte</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Fehler bei der Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>Keine Ordner zur Synchronisation konfiguriert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Setze alle Ordner fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Stoppe alle Ordner</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Setze gesamte Synchronisation fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Setze Synchronisation fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Stoppe gesamte Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Stoppe Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Bei allen Konten abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Bei allen Konten anmelden...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Neues Konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>Über %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Keine kürzlich synchronisierten Elemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Änderungen der entfernten Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Änderungen der lokalen Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synchronisiere %1 von %2 (%3 übrig)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Synchronisiere %1 von %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronisiere %1 (%2 übrig)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Aktuell</translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index cf44969bf..af84cfd8e 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -703,17 +703,17 @@ This action will abort any currently running synchronization.</source> <translation>Συνέχεια</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Σφάλμα πρόσβασης στο αρχείο ρυθμίσεων</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Υπήρξε σφάλμα κατά την πρόσβαση του αρχείου ρυθμίσεων στο %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Έξοδος ownCloud</translation> </message> @@ -785,8 +785,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Σφάλμα διακομιστή: Η απάντηση PROPFIND δεν έχει μορφοποιηθεί με XML!</translation> </message> @@ -794,27 +794,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation>Σφάλμα κατά το άνοιγμα του καταλόγου %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation>Ο κατάλογος δεν είναι προσβάσιμος από τον πελάτη, άρνηση πρόσβασης</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>Δεν βρέθηκε ο κατάλογος: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>Σφάλμα κατά την ανάγνωση του καταλόγου %1</translation> </message> @@ -916,41 +916,41 @@ This action will abort any currently running synchronization.</source> <translation>Δραστηριότητα Συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <source>Could not read system exclude file</source> <translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <source>A folder from an external storage has been added. </source> <translation>Προστέθηκε ένας φάκελος από εξωτερικό αποθηκευτικό χώρο. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -963,7 +963,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -974,7 +974,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a Εφόσον επιλέξετε να διαγράψετε τα αρχεία, δε θα είναι διαθέσιμα σε εσάς, εκτός εάν είστε ο ιδιοκτήτης τους. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -983,17 +983,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Αφαίρεση Όλων των Αρχείων;</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Αφαίρεση όλων των αρχείων</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Διατήρηση αρχείων</translation> </message> @@ -1169,107 +1169,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Αυτές είναι οι ανεπίλυτες διενέξεις. Κάντε κλικ για λεπτομέρειες.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>Έλεγχος για αλλαγές στο απομακρυσμένο '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>Έλεγχος για αλλαγές στο τοπικό '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Συνδυασμός αλλαγών</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>αρχείο %1 από %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Αναμονή...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Προετοιμασία για συγχρονισμό...</translation> </message> @@ -1293,12 +1293,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Προσθήκη Σύνδεσης Συγχρονισμού</translation> </message> @@ -1368,21 +1368,26 @@ If this was an accident and you decide to keep your files, they will be re-synce <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Ο φάκελος <i>%1</i>, ο οποίος είναι γονεϊκός φάκελος του <i>%2</i>, συγχρονίζεται ήδη.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation type="unfinished"/> </message> @@ -1541,17 +1546,17 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>&Επανεκκίνηση && Ενημέρωση</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Δεν μπορείτε να απενεργοποιήσετε την αυτόματη εκκίνηση επειδή είναι ενεργοποιημένη η αυτόματη εκκίνηση σε επίπεδο συστήματος.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>Αλλαγή καναλιού ενημέρωσης;</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1560,12 +1565,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Σημειώστε ότι αυτό επιλέγει μόνο από ποιες αναβαθμίσεις έχουν ληφθεί και ότι δεν υπάρχουν υποβαθμίσεις: Έτσι, η επιστροφή από το κανάλι beta στο σταθερό κανάλι συνήθως δεν μπορεί να γίνει αμέσως και σημαίνει αναμονή για μια σταθερή έκδοση που είναι νεότερη από την τρέχουσα beta έκδοση.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>Αλλαγή καναλιού ενημέρωσης</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> @@ -2154,7 +2159,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3058,33 +3063,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ρυθμίσεις</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Δραστηριότητα</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Γενικά</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Δίκτυο</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Κλείσιμο %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Λογαριασμός</translation> </message> @@ -3230,96 +3235,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Οποιοσδήποτε με τη σύνδεση έχει πρόσβαση στο αρχείο / φάκελο</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>Π&ροστασία με κωδικό</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Το αρχείο δεν μπορεί να διαμοιραστεί γιατί διαμοιράστηκε χωρίς δικαιώματα διαμοιρασμού.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Οι σύνδεσμοι των κοινόχρηστων έχουν απενεργοποιηθεί</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Δημιουργία δημόσιου συνδέσμου κοινόχρηστου</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Διαγραφή</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Άνοιγμα συνδέσμου στον περιηγητή</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Αντιγραφή συνδέσμου στο πρόχειρο</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Αντιγραφή συνδέσμου στο πρόχειρο (άμεση λήψη)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Αποστολή συνδέσμου με αλληλογραφία</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Αποστολή συνδέσμου με ηλεκτρονικό ταχυδρομείο (απευθείας λήψη)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation>Δημιουργία νέου...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation>Διαμοιράστηκα %1 με εσένα</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Επιβεβαίωση διαγραφής συνδέσμου κοινόχρηστου</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Θέλετε πραγματικά να διαγράψετε τον σύνδεσμο κοινόχρηστου <i>%1</i>; </p><p>Σημείωση: Αυτή η ενέργεια δεν μπορεί να ανακληθεί.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Δημόσιος σύνδεσμος</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>Διαγραφή συνδέσμου κοινόχρηστου</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Παρακαλούμε ορίστε Κωδικό</translation> </message> @@ -3921,243 +3926,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Παρκαλώ συνδεθείτε</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Φάκελος %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Δεν έχουν ρυθμιστεί φάκελοι συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Άνοιγμα στον περιηγητή ιστού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Σύνδεση...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Αποσύνδεση</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Πρόσφατες Αλλαγές</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Φάκελοι υπό Διαχείριση:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Άνοιγμα φακέλου '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Άνοιγμα %1 στον περιηγητή</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>Ο διακομιστής στο λογαριασμό %1 εκτελεί μια μη υποστηριζόμενη έκδοση %2. Η χρήση αυτού του πελάτη με μη υποστηριζόμενες εκδόσεις διακομιστών δεν είναι δοκιμασμένη και δυνητικά επικίνδυνη. Προχωρήστε με δική σας ευθύνη.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Άγνωστη κατάσταση</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Ρυθμίσεις...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Λεπτομέρειες...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Βοήθεια</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Κλείσιμο %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Αποσυνδέθηκε από %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Μη υποστηριζόμενη έκδοση διακομιστή</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Αποσυνδεδεμένο</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>Έγινε αποσύνδεση από μερικούς λογαριασμούς</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Αποσυνδέθηκε από τους λογαριασμούς:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Λογαριασμός %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Αποσύνδεση</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>Ο λογαριασμός συγχρονισμού έχει απενεργοποιηθεί</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>Παύθηκε ο συγχρονισμός</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>Ανεπίλυτες συγκρούσεις</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Σφάλμα κατά τον συγχρονισμό</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>Δεν ρυθμίστηκαν φάκελοι συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Αναίρεση παύσης όλων των φακέλων</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Παύση όλων των φακέλων</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Αναίρεση παύσης όλων των συγχρονισμών</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Αναίρεση παύσης συγχρονσμού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Παύση όλων των συγχρονισμών</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Παύση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Έξοδος από όλους τους λογαριασμούς</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Είσοδος σε όλους τους λογαριασμούς</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Νέος λογαριασμός...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>Σχετικά %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Έλεγχος για αλλαγές στο απομακρυσμένο '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Έλεγχος για αλλαγές στο τοπικό '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Συγχρονισμός %1 από %2 (%3 απομένουν)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Συγχρονισμός %1 από %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Συγχρονισμός %1 (%2 απομένουν)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Συγχρονισμός %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Ενημερωμένο</translation> </message> diff --git a/translations/client_en.ts b/translations/client_en.ts index a733592cf..81456d560 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -789,8 +789,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"></translation> </message> @@ -798,27 +798,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation type="unfinished"></translation> </message> @@ -1183,102 +1183,102 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1286,7 +1286,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/folderstatusmodel.cpp" line="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation type="unfinished"></translation> </message> @@ -1310,12 +1310,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation type="unfinished"></translation> </message> @@ -1385,21 +1385,26 @@ If this was an accident and you decide to keep your files, they will be re-synce <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation type="unfinished"></translation> </message> @@ -2163,7 +2168,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation type="unfinished"></translation> </message> @@ -3060,33 +3065,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation type="unfinished"></translation> </message> @@ -3232,96 +3237,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation type="unfinished"></translation> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index 5bba0f9a6..56f78ed7f 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -241,17 +241,17 @@ <message> <location filename="../src/gui/accountsettings.cpp" line="353"/> <source>Enable virtual file support %1...</source> - <translation type="unfinished"/> + <translation>Activar soporte para archivo virtual %1...</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="353"/> <source>(tech preview)</source> - <translation type="unfinished"/> + <translation>(previsualización técnica)</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="353"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(experimental)</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="442"/> @@ -524,7 +524,7 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <message> <location filename="../src/gui/activitylistmodel.cpp" line="74"/> <source>%1 %2 on %3</source> - <translation type="unfinished"/> + <translation>%1 %2 en %3</translation> </message> </context> <context> @@ -609,22 +609,22 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <message numerus="yes"> <location filename="../src/gui/activitywidget.cpp" line="351"/> <source>%n notifications(s) for %1.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n notificación para %1.</numerusform><numerusform>%n notificaciones para %1.</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/gui/activitywidget.cpp" line="357"/> <source>%n notifications(s) for %1 and %2.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n notificación para %1 y %2.</numerusform><numerusform>%n notificaciones para %1 y %2.</numerusform></translation> </message> <message> <location filename="../src/gui/activitywidget.cpp" line="359"/> <source>New notifications for %1, %2 and other accounts.</source> - <translation type="unfinished"/> + <translation>Nuevas notificaciones para %1, %2 y otras cuentas.</translation> </message> <message> <location filename="../src/gui/activitywidget.cpp" line="362"/> <source>Open the activity view for details.</source> - <translation type="unfinished"/> + <translation>Abrir la vista de actividad para ver los detalles.</translation> </message> <message> <location filename="../src/gui/activitywidget.cpp" line="145"/> @@ -703,17 +703,17 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Error al acceder al archivo de configuración</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Ha ocurrido un error al acceder al archivo de configuración %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Salir de ownCloud</translation> </message> @@ -785,8 +785,8 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Error en el servidor: la réplica PROPFIND no está en un formato XML!</translation> </message> @@ -794,27 +794,27 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation>Error durante la apertura de la carpeta %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation>Directorio no accesible en el cliente, permiso denegado</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>No se encuentra carpeta: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>Los caracteres del nombre de fichero no son válidos</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>Error durante la lectura del directorio %1</translation> </message> @@ -916,41 +916,41 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <translation>Actividad de la sincronización</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <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="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>La carpeta %1 ha sido creada, pero tambien ha sido excluida de la sincronización. Los datos que contenga, no serán sincronizados.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>El archivo %1 ha sido creado, pero tambien ha sido excluido de la sincronización. Por tanto, no será sincronizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -963,7 +963,7 @@ Esto significa que el cliente de sincronización podría no subir los cambios lo %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -974,7 +974,7 @@ Si decide mantener estos archivos, serán re-sincronizados con el servidor si Vd Si decide borrarlos, no serán visibles para Vd. a menos que sea usted el propietario.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -983,17 +983,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>¿Eliminar todos los archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Conservar archivos</translation> </message> @@ -1169,107 +1169,107 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <translation>Hay conflictos sin resolver. Haz click para mas detalles.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>Buscando cambios en '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>Buscando cambios en local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Reconciliando cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Esperando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando por %n carpeta...</numerusform><numerusform>Esperando por %n otras carpetas...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1293,12 +1293,12 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Añadir Conexión para el Directorio de Sincronización</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Añadir Sincronización de Conexión</translation> </message> @@ -1368,23 +1368,28 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Ya ha sincronizado <i>%1</i>, el cual es la carpeta de <i>%2</i>.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> - <translation type="unfinished"/> + <translation>Usar archivos virtuales en lugar de descargar inmediatamente el contenido %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> - <translation type="unfinished"/> + <translation>(previsualización técnica)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(experimental)</translation> </message> </context> <context> @@ -1541,17 +1546,17 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <translation>&Reiniciar && Actualizar</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>No puede deshabilitar autoinicio porque el autoinicio del sistema principal está habilitado.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>¿Cambiar canal de actualizaciones?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1560,12 +1565,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Nota: esto solo selecciona el canal deseado y no permite vueltas atras. Por lo que volver atras desde el canal beta al canal estable, puede ser que tarde un cierto tiempo dado que los parches y nueva funcionalidades, deben acabar siendo trasladadas al canal "estable"</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>Cambiar canal de actualizaciones</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -1909,7 +1914,7 @@ Tenga en cuenta que el uso de cualquier opción de línea de comando de registro <message> <location filename="../src/gui/networksettings.ui" line="176"/> <source>Note: proxy settings have no effects for accounts on localhost</source> - <translation type="unfinished"/> + <translation>Nota: la configuración de proxy no tiene efecto para las cuentas en el servidor local</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="197"/> @@ -2119,17 +2124,17 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/> <source>Use &virtual files instead of downloading content immediately %1</source> - <translation type="unfinished"/> + <translation>Usar archivos &virtual en lugar de descargar inmediatamente el contenido %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/> <source>(tech preview)</source> - <translation type="unfinished"/> + <translation>(previsualización técnica)</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(experimental)</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/> @@ -2153,7 +2158,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2422,24 +2427,26 @@ No se recomienda usarla.</translation> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/> <source>Enable technical preview feature?</source> - <translation type="unfinished"/> + <translation>¿Activar la característica de previsualización técnica?</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu. The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source> - <translation type="unfinished"/> + <translation>Cuando el modo "archivos virtuales" está activado, inicialmente no se descargan archivos. En lugar de ello, se crea un archivo virtual para cada archivo que existe en el servidor. Cuando se abre un archivo, sus contenidos se descargan automáticamente. De manera alternativa, los archivos pueden descargarse manualmente usando el menú contextual. + +El modo de archivos virtuales y la sincronización selectiva son mutuamente excluyentes. Actualmente las carpetas no seleccionadas se trasladarán a carpetas disponibles solo online, y la configuración de sincronización selectiva se restablecerá.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/> <source>Enable virtual files</source> - <translation type="unfinished"/> + <translation>Activar archivos virtuales</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/> <source>Continue to use selective sync</source> - <translation type="unfinished"/> + <translation>Continuar con sincronización selectiva</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/> @@ -2449,7 +2456,7 @@ The virtual files mode is mutually exclusive with selective sync. Currently unse <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Enable experimental placeholder mode</source> - <translation type="unfinished"/> + <translation>Activar modalidad experimental de marcadores de posición</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> @@ -2600,7 +2607,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <message> <location filename="../src/libsync/discovery.cpp" line="1242"/> <source>Moved to invalid target, restoring</source> - <translation type="unfinished"/> + <translation>Movido a objetivo no válido, restaurando</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="1255"/> @@ -3057,33 +3064,33 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>Ajustes</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Actividad</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Red</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Salir de %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> - <translation type="unfinished"/> + <translation>¿Estás seguro de querer salir de %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Cuenta</translation> </message> @@ -3229,96 +3236,96 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>Quienquiera que posea el vínculo tendrá acceso al archivo/carpeta</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>Protegido por contr&aseña </translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>El archivo no puede compartirse; ya que fue compartido sin permisos correspondientes.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Se ha deshabilitado la compartición de enlaces</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Crear un enlace público compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Abrir enlace en el explorador</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Copiar enlace al portapapeles</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Copiar enlace al portapapeles (descarga directa)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Enviar enlace por e-mail</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Enviar enlace por e-mail (descarga directa)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation>Crear nuevo...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation>He compartido %1 contigo</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar eliminación de enlace de recurso compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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>¿Realmente desea borrar el enlace público compartido <i>%1</i>?</p><p>Nota: Esta acción no se puede deshacer</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Enlace Publico</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>Borrar el enlace compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Por favor establece una contraseña</translation> </message> @@ -3920,243 +3927,243 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Por favor, regístrese</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Archivo %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>No hay carpetas configuradas para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Abrir en navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Inicio de sesión...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Cerrar sesión</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Cambios recientes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Carpetas administradas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Abrir carpeta '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Abrir %1 en el navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>El servidor de la cuenta %1 ejecuta una versión %2 no compatible. Este cliente con versiones del servidor no compatibles es potencialmente peligroso. Continúa bajo tu responsabilidad.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Estado desconocido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Detalles...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Salir de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Desconectado de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Versión del servidor no soportada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>Desconectado desde varias cuentas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Desconectado desde cuentas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Cuenta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Cerrar sesión</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>La sincronización está deshabilitada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>La sincronización se ha detenido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>Conflictos sin resolver</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Error durante la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>No hay carpetas sincronizado configuradas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Reanudar todas las carpetas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Pausar todas las carpetas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Reanudar toda la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Reanudar la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Pausar todas las sincronizaciones</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Pausar la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Terminar sessión en todas las cuentas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Iniciar sesión en todas las cuentas...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Nueva cuenta ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>Acerca de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>No se han sincronizado elementos recientemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Buscando cambios en remoto: '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Buscando cambios en local '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sincronizando %1 de %2 (quedan %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Sincronizando %1 de %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizando %1 (quedan %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Actualizado</translation> </message> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index bc146a531..f5933705c 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -699,17 +699,17 @@ This action will abort any currently running synchronization.</source> <translation>ادامه</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>خطای دسترسی به پرونده پیکربندی</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>خطایی هنگام دسترسی به پرونده پیکربندی در 1% وحود دارد.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>خروج از ownCloud</translation> </message> @@ -781,8 +781,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -790,27 +790,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>رمزگذاری نام فایل معتبر نیست</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation type="unfinished"/> </message> @@ -912,41 +912,41 @@ This action will abort any currently running synchronization.</source> <translation>فعالیت همگام سازی</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <source>Could not read system exclude file</source> <translation>نمی توان پرونده خارجی سیستم را خواند.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <source>A folder from an external storage has been added. </source> <translation>یک پوشه از یک مخزن خارجی اضافه شده است. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -955,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="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -966,7 +966,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a اگر شما تصمیم بگیرید پرونده ها را حذف کنید، آن ها در دسترس شما نخواهند بود، مگر اینکه مالک باشید.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -975,17 +975,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>حذف تمام فایل ها؟</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>حذف تمام فایل ها</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>نگه داشتن فایل ها</translation> </message> @@ -1161,107 +1161,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>ناسازگاری های حل نشده ای وجود دارد. برای جزییات کلیک نمایید.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>تطبیق تغییرات</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>، '1%'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>رشته های ترجمه نشده</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>فایل %1 از %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>درحال انتظار...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>آمادهسازی همگامسازی ...</translation> </message> @@ -1285,12 +1285,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>اضافه کردن اتصال همگام سازی پوشه</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>افزودن اتصال همگام سازی</translation> </message> @@ -1360,21 +1360,26 @@ If this was an accident and you decide to keep your files, they will be re-synce <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>شما از قبل <i>1%</i> را همگام سازی کرده اید، که یک پوشه والد از <i>2%</i> است.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation type="unfinished"/> </message> @@ -1533,29 +1538,29 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>راه اندازی مجدد و به روز رسانی</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>لغو</translation> </message> @@ -2138,7 +2143,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3036,33 +3041,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>تنظیمات</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>فعالیت</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>عمومی</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>شبکه</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>خروج %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>حساب کاربری</translation> </message> @@ -3208,96 +3213,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>هر کسی با پیوند به پرونده/پوشه دسترسی دارد</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>رمز عبور محافظت می شود</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>پرونده نمی تواند به اشتراک گذاشته شود زیرا بدون مجوز به اشتراک گذاشته شده است.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>اشتراک های پیوند غیر فعال شده اند</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>اشتراک لینک عمومی بسازید</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>حذف</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>لینک را در مرورگر باز کنید</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>لینک را در کلیپ بورد کپی کنید</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>لینک را در کلیپ بورد کپی کنید (دانلود مستقیم)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>لینک را توسط ایمیل بفرست.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>لینک را با پست الکترونیکی ارسال کنید (دانلود مستقیم)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>حذف اشتراک گذاری لینک را تایید کنید</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>آیا شما واقعا می خواهید اشتراک لینک عمومی را حذف کنید<i>1%</i>؟</p><p> توجه: این عمل نمی تواند انجام نشود.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>لغو</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>پیوند عمومی</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>حذف پیوند اشتراک</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>لطفا رمزعبور را تعیین کنید</translation> </message> @@ -3896,243 +3901,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>لطفا وارد شوید</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>پوشه %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>هیچ پوشهای برای همگامسازی تنظیم نشده است.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>باز کردن در مرورگر</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>ورود...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>خروج</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>تغییرات اخیر</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>پوشه های مدیریت شده:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>بازکردن پوشهی '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>1% را در مرورگر باز کنید</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an 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="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>وضعیت نامعلوم</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>تنظیمات...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>جزئیات...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>راهنما</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>خروج %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>قطعشده از %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>نسخه سرور پشتیبانی نشده </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>قطع شده</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>قطع شده از برخی حساب ها</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>قطع شده از حساب ها:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>حسابکاربری %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>خارج شد</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>همگام سازی حساب غیر فعال است</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>همگام سازی متوقف شده است</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>خطا حین همگام سازی</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>هیچ پوشه همگام سازی پیکربندی شده</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>شروع مجدد تمام پوشهها</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>توقف تمام پوشهها</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>شروع مجدد تمام همگام سازی ها</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>شروع مجدد همگام سازی</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>توقف تمام همگام سازی ها</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>توقف همگام سازی</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>خروج از تمام حساب ها</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>ورود به تمام حساب ها...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>حساب جدید...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>درباره %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>هیچ موردی به تازگی همگامسازی نشده است</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>همگامسازی %1 از%2 (%3 باقیمانده)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>همگام سازی 1% از 2%</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>همگامسازی %1 (%2 باقیمانده)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>همگامسازی %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>تا تاریخ</translation> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index da6183ff1..e406bece2 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -703,17 +703,17 @@ Cette action stoppera toute synchronisation en cours.</translation> <translation>Continuer</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Erreur lors de l'accès au fichier de configuration</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Une erreur s'est produite lors de l'accès au fichier de configuration situé dans %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Quitter ownCloud</translation> </message> @@ -785,8 +785,8 @@ Cette action stoppera toute synchronisation en cours.</translation> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Erreur du serveur : la réponse PROPFIND n’est pas formatée en XML !</translation> </message> @@ -794,27 +794,27 @@ Cette action stoppera toute synchronisation en cours.</translation> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation>Erreur lors de l’ouverture du répertoire %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation>Répertoire non accessible depuis le client. Permission refusée</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>Répertoire non trouvé : %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>L'encodage du nom de fichier n'est pas valide</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>Erreur lors de la lecture du répertoire %1</translation> </message> @@ -916,19 +916,19 @@ Cette action stoppera toute synchronisation en cours.</translation> <translation>Activité de synchronisation</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <source>A folder from an external storage has been added. </source> <translation>Un nouveau dossier localisé sur un stockage externe a été ajouté. @@ -936,22 +936,22 @@ Cette action stoppera toute synchronisation en cours.</translation> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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 avait été exclu de la synchronisation auparavant. Les données à l'intérieur ne seront pas synchronisées.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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 avait été exclu de la synchronisation auparavant. Il ne sera pas synchronisé.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -964,7 +964,7 @@ Cela veut dire que le client de synchronisation ne peut pas téléverser les cha %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -975,7 +975,7 @@ Si vous décidez de conserver ces fichiers, ils seront synchronisés à nouveau Si vous décidez de supprimer ces fichiers, ils vous seront inaccessibles, sauf si vous en êtes le/la propriétaire.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -984,17 +984,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Supprimer tous les fichiers ?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Supprimer tous les fichiers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Conserver les fichiers</translation> </message> @@ -1170,107 +1170,107 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <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="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>Vérification des changements distants '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>Vérification des changements locaux '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Rapprochement des modifications</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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 sur %2, fichier %3 sur %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>fichier %1 sur %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>En attente ...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Préparation à la synchronisation</translation> </message> @@ -1294,12 +1294,12 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Ajouter une synchronisation de dossier</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Ajouter une Synchronisation</translation> </message> @@ -1369,21 +1369,26 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Vous synchronisez déja <i>%1</i>, qui est un dossier parent de <i>%2</i>.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation>(expérimental)</translation> </message> @@ -1542,17 +1547,17 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <translation>&Redémarrer && Mettre à jour</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>Changer le canal de mise à jour ?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1561,12 +1566,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Veuillez noter que cela sélectionne seulement la zone de mises à jour, et qu'il n'y a pas de retour à des versions antérieures : par conséquent retourner du canal bêta au canal stable ne peut s'effectuer de façon instantanée et nécessite d'attendre une version stable plus récente que la version bêta installée.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>Changer le canal de mise à jour</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Annuler</translation> </message> @@ -2153,7 +2158,7 @@ L'assistant de mise à jour peut vous demandez des autorisations supplémen </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3051,33 +3056,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Paramètres</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Activité</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Paramètres</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Réseau</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Quitter %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Compte</translation> </message> @@ -3223,97 +3228,97 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Quiconque dispose du lien a accès aux fichiers/dossiers</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>Protéger par mot de p&asse</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Le fichier ne peut pas être partagé car il a été partagé sans permission de repartage.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Les partages par lien ont été désactivés</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Créer une lien de partage public</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Ouvrir le lien dans le navigateur</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Copier le lien vers le presse-papier</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Copier le lien vers le presse-papier (téléchargement direct)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Envoyer le lien par email</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Envoyer le lien par courriel (téléchargement direct)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation>J'ai partagé %1 avec vous</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Confirmer la suppression du partage par lien</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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>Voulez-vous vraiment supprimer le partage par lien public<i>%1</i>? <p>Note: Cette action ne peut être annulée.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Anuler</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Lien public</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>Supprimer le partage par lien</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Veuillez choisir un mot de passe</translation> </message> @@ -3913,243 +3918,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Veuillez vous connecter</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Dossier %1 : %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Aucun dossier à synchroniser n'est configuré</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Ouvrir dans le navigateur web</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Connexion...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Se déconnecter</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Modifications récentes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Dossiers configurés</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Ouvrir le dossier local '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Ouvrir %1 dans le navigateur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an 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="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Statut inconnu</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Paramètres...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Toutes les modifications...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Aide...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Quitter %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Déconnecté de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Version du Serveur non prise en charge</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Déconnecté</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>Déconnecté de certains comptes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Déconnecté des comptes :</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Compte %1 : %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Session fermée</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>La synchronisation est en pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>La synchronisation est en pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>Conflits non résolus</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Erreur durant la synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>Aucun dossier de synchronisation configuré</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Relancer tous les dossiers </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Mettre en pause tous les dossiers</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Relancer toutes les synchronisations</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Relancer la synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Mettre en pause toutes les synchronisations</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Mettre en pause la synchronisation </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Se déconnecter de tous les comptes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Se connecter à tous les comptes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Nouveau compte…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>À propos de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Aucun élément synchronisé récemment</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Vérification des changements distants '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Vérification des changements locaux '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synchronisation de %1 sur %2 (%3 restantes)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Synchronisation %1 sur %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronisation de %1 (%2 restantes)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Synchronisation de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>À jour</translation> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 59375bea0..5d1eb1e7c 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -703,17 +703,17 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Produciuse un erro ao acceder ao ficheiro de configuración</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Produciuse un erro ao acceder ao ficheiro de configuración en %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Saír do ownCloud</translation> </message> @@ -785,8 +785,8 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Produciuse un erro no servidor: a réplica PROPFIND non está en formato XML!</translation> </message> @@ -794,27 +794,27 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation>Produciuse un erro ao abrir o directorio %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation>Directorio non accesíbel no cliente, permiso denegado </translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>Non se atopou o directorio: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>O nome de ficheiro codificado non é correcto</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>Produciuse un erro ao ler o directorio %1</translation> </message> @@ -916,41 +916,41 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <translation>Actividade de sincronización</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <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="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -963,7 +963,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="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -974,7 +974,7 @@ 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="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -984,17 +984,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Retirar todos os ficheiros?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Retirar todos os ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Manter os ficheiros</translation> </message> @@ -1170,107 +1170,107 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <translation>Hai conflitos sen resolver. Prema para obter máis detalles.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <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="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <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="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Reconciliando os cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>«%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>ficheiro %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Agardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1294,12 +1294,12 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Engadir a conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Engadir a conexión da sincronización</translation> </message> @@ -1369,21 +1369,26 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Xa está a sincronizar <i>%1</i>, é o cartafol pai de <i>%2</i>.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation>Usar ficheiros virtuais, no canto de descargar o contido inmediatamente %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation>(vista previa técnica)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation>(experimental)</translation> </message> @@ -1542,17 +1547,17 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <translation>&Reiniciar e actualizar</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Non pode desactivar o inicio automático porque está activado o inicio automático do sistema principal.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>Cambiar a canle de actualizacións?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1561,12 +1566,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Teña en conta que isto só selecciona a canle desexada e que non hai reversións: por iso, volver do canal de beta á canle estábel xeralmente non se pode facer de inmediato e significa agardar por unha versión estábel que sexa máis recente que a beta instalada actualmente.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>Cambiar a canle de actualizacións</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -2155,7 +2160,7 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3061,33 +3066,33 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>Axustes</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Actividade</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Xeral</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Rede</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Saír de %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> - <translation type="unfinished"/> + <translation>Confirma que quere saír de %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Conta</translation> </message> @@ -3233,96 +3238,96 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>Calquera que teña a ligazón terá acceso ao ficheiro/cartafol</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>Contr&asinal de protección</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Non é posíbel compartir o ficheiro, xa que foi compartido sen permisis para compartir.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Desactivouse a compartición de ligazóns</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Crear unha ligazón pública compartida</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Abrir a ligazón no navegador</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Copiar a ligazón no portapapeis</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Copiar a ligazón no portapapeis (descarga directa)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Enviar a ligazón por correo</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Enviar a ligazón por correo (descarga directa)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation>Crear novo…</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation>Compartin %1 con vostede</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar a eliminación da ligazón compartida</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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>Confirma que quere eliminar a ligazón pública compartida <i>%1</i>?</p><p>Nota: Esta acción non se pode desfacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Ligazón pública</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>Eliminar a ligazón compartida</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Estabeleza o contrasinal</translation> </message> @@ -3924,243 +3929,243 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Ten que rexistrarse</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Cartafol %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Non existen cartafoles de sincronización configurados.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Abrir no navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Acceder...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Desconectar</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Cambios recentes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Cartafoles xestionados:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Abrir o cartafol «%1»</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Abrir %1 nun navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>O servidor na conta %1 executa unha versión %2 que xa non é compatíbel. O uso deste cliente con versións de servidor non admitidas non está probado e é potencialmente perigoso. Proceda baixo a súa propia responsabilidade.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Estado descoñecido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Axustes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Detalles...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Axuda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Saír de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Desconectado de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Versión del servidor non compatíbel</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>Desconectado dalgunhas contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Desconectado das contas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Conta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>A sincronización está desactivada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>A sincronización está en pausa</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>Conflitos sen resolver</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Produciuse un erro durante a sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>Non hai cartafoles de sincronización configurados</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Continuar todos os cartafoles</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Pausar todos os cartafoles</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Continuar con todas as sincronizacións</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Continuar coa sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Pausar todas as sincronizacións</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Pausar a sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Saír de todas as contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Acceder a todas as contas...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Nova conta...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>Sobre %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Non hai elementos sincronizados recentemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Comprobando os cambios no cartafol remoto «%1»</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Comprobando os cambios no cartafol local «%1»</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sincronizando %1 of %2 (restan %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Sincronizando %1 de %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizando %1 (restan %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Actualizado</translation> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index 1da3ff1b0..7a83bec28 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -703,17 +703,17 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <translation>Continua</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Errore accedendo al file di configurazione</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Si è verificato un errore durante l'accesso al file di configurazione su %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Esci da ownCloud</translation> </message> @@ -785,8 +785,8 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Errore del server: La risposta di PROPFIND non è in formato XML!</translation> </message> @@ -794,27 +794,27 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation>Errore durante l'apertura della cartella %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation>Directory non accessibile sul client, autorizzazione negata</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>Cartella non trovata: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>La codifica del nome del file non è valida</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>Errore durante la lettura della cartella %1</translation> </message> @@ -916,19 +916,19 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <translation>Sincronizza attività</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <source>A folder from an external storage has been added. </source> <translation>Una nuova cartella da un'archiviazione esterna è stata aggiunta. @@ -936,22 +936,22 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>La cattella %1 è stata creata ma esclusa dalla sincronizzazione in prevecedenza. I dati al suo interno non saranno sincronzzati.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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 escluso in precedenza dalla sincronizzazione. Non sarà quindi sincronizzato.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -964,7 +964,7 @@ Ciò significa che il client di sincronizzazione potrebbe non inviare le modific %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -975,7 +975,7 @@ Se decidi di mantenere i file, saranno risincronizzati con il server se hai l&ap Se decidi di eliminarli, non ti saranno più disponibili, a meno che tu non sia il proprietario.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -984,17 +984,17 @@ Sei sicuro di voler sincronizzare queste azioni con il server? Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzati dal server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Vuoi rimuovere tutti i file?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Rimuovi tutti i file</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Mantieni i file</translation> </message> @@ -1170,107 +1170,107 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <translation>Ci sono conflitti irrisolti. Clicca per ulteriori dettagli. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>Controllo per cambiamenti in '%1' remoto</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>Controllo cambiamenti in '%1 ' locale</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Riconciliazione dei cambiamenti</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>file %1 di %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Attendere...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Preparazione della sincronizzazione...</translation> </message> @@ -1294,12 +1294,12 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Aggiungi connessioni di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Aggiungi connessione di sincronizzazione</translation> </message> @@ -1369,21 +1369,26 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Stai già sincronizzando <i>%1</i>, che è la cartella superiore di <i>%2</i>.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation>Usa file virtuali invece di scaricare il contenuto immediatamente %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation>(anteprima tech)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation>(sperimentale)</translation> </message> @@ -1542,17 +1547,17 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <translation>&Riavvia e aggiorna</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Non puoi disattivare l'avvio automatico perchè l'auto-avvio a livello di sistema è attivo.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>Cambiare canale di aggiornamento?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1561,12 +1566,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Nota che ciò seleziona solo da dove vengono presi gli aggiornamenti e che non c'è alcuna regressione: quindi tornare dal canale beta a quello stabile solitamente non può essere fatto immediatamente e significa attendere una versione stabile più recente della versione beta attualmente installata.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>Cambia canale di aggiornamento</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Annulla</translation> </message> @@ -2151,7 +2156,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3057,33 +3062,33 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Impostazioni</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Attività</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Generale</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Rete</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Esci da %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Account</translation> </message> @@ -3229,96 +3234,96 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Chiunque sia in possesso del collegamento ha accesso al file/cartella</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>Proteggi con p&assword</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Il file non può essere condiviso poiché è stato condiviso senza il permesso di condivisione.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>La condivisione tramite link è stata disabilitata</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Crea collegamento pubblico</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Elimina</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Apri collegamento nel browser</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Copia link negli appunti</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Copia negli appunti (download diretto)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Invia collegamento tramite email</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Invia link tramite email (download diretto)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation>Crea nuovo...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation>Ho condiviso %1 con te</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Conferma la cancellazione del link di condivisione</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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>Vuoi veramente eliminare il link di condivisione pubblico <i>%1</i>?</p><p>Nota: questa azione non può essere annullata.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Collegamento pubblico</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>Cancella link condiviso</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>imposta la password</translation> </message> @@ -3920,243 +3925,243 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Accedi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Cartella %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Non è stata configurata alcuna cartella per la sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Apri nel browser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Accedi...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Esci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Modifiche recenti</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Cartelle gestite:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Apri la cartella '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Apri %1 nel browser...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>Il server sull'account %1 esegue una versione %2 non supportata. L'uso di questo client con versioni di server non supportate non è stato testato ed è potenzialmente pericoloso. Procedi a tuo rischio.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Stato sconosciuto</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Impostazioni...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Dettagli...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Aiuto</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Esci da %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Disconnesso dal %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Versione del server non supportata</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Disconnesso</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>Disconnesso da un account</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Disconnesso dagli account:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Account %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Disconnesso</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>La sincronizzazione dell'account è disabilitata</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>La sincronizzazione è in pausa</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>Conflitti irrisolti</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Errore durante la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>Nessuna cartella configurata per la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Riprendi tutte le cartelle</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Sospendi tutte le cartelle</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Riprendi tutte le sincronizzazioni</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Riprendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Sospendi tutte le sincronizzazioni</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Sospendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Disconnetti tutti gli account</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Accedi a tutti gli account...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Nuovo account...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>Informazioni su %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Nessun elemento sincronizzato di recente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Controllo per cambiamenti in '%1' remoto</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Controllo cambiamenti in '%1 ' locale</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sincronizzazione di %1 di %2 (%3 rimanenti)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Sincronizzazione di %1 di %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizzazione di %1 (%2 rimanenti)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Sincronizzazione di %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Aggiornato</translation> </message> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index f69bafa5e..4f0ea1529 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -699,17 +699,17 @@ This action will abort any currently running synchronization.</source> <translation>続ける</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>設定ファイルのアクセスでエラーが発生しました</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>設定ファイルの %1 行目にアクセスしている時にエラーが発生しました。</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>ownCloudを終了</translation> </message> @@ -781,8 +781,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -790,27 +790,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>ファイル名のエンコーディングが無効です。</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation type="unfinished"/> </message> @@ -912,41 +912,41 @@ This action will abort any currently running synchronization.</source> <translation>同期アクティビティ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <source>Could not read system exclude file</source> <translation>システム上の除外ファイルを読み込めません</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <source>A folder from an external storage has been added. </source> <translation>外部ストレージからフォルダーが追加されました。 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -955,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="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -966,7 +966,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a 「すべてのファイルを削除」を選択すると、あなたが所有者でない限り、ファイルは使用できなくなります。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -975,17 +975,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>すべてのファイルを削除しますか？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>すべてのファイルを削除</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>ファイルを残す</translation> </message> @@ -1161,107 +1161,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>未解決の競合があります。クリックで詳細。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>%1 / %2 ファイル</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>待機中...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>%n 他のフォルダーの完了待ち...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>同期の準備中...</translation> </message> @@ -1285,12 +1285,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>同期フォルダーを追加</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>同期接続を追加</translation> </message> @@ -1360,21 +1360,26 @@ If this was an accident and you decide to keep your files, they will be re-synce <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation><i>%1</i>は、<i>%2</i>の親フォルダーですでに同期しています。</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation type="unfinished"/> </message> @@ -1533,29 +1538,29 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>再起動してアップデート(&R)</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>キャンセル</translation> </message> @@ -2138,7 +2143,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3035,33 +3040,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>設定</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>アクティビティ</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>一般</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>ネットワーク</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>%1 を終了</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>アカウント</translation> </message> @@ -3207,96 +3212,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>リンクを知っている人はファイル/フォルダーにアクセスできます</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>パスワード保護(&A)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>再共有権限がない共有ため、このファイルは共有できません。</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>削除</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>ブラウザでリンクを開く</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>クリップボードにリンクをコピー</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>メールでリンクを送信</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>キャンセル</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>パスワードを入力してください</translation> </message> @@ -3896,243 +3901,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>サインインしてください</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>フォルダー %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>同期するフォルダーがありません。</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>ブラウザーで開く</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>ログイン...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>ログアウト</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>最近変更されたファイル</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>管理フォルダー:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>フォルダー ’%1’ を開く</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>%1をブラウザーで開く</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an 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="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>不明な状態</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>設定...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>詳細...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>ヘルプ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>%1 を終了</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>%1 から切断されました</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>サポートされていないサーバーバージョン</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>切断しました</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>アカウントから切断:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>アカウント %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>サインアウト</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>アカウントの同期は無効になっています</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>すべてのフォルダーの同期を再開</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>すべてのフォルダーの同期を一時停止</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>すべての同期を再開</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>同期を再開</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>すべての同期を一時停止</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>同期を一時停止</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>全てのアカウントからログアウト</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>全てのアカウントにログイン</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>新規アカウント...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>%1 について</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>最近同期されたアイテムはありません。</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>同期中 %2 中 %1 (残り %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>%2 の %1 を同期しています</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>同期中 %1 (残り %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>同期中 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>最新です</translation> </message> diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index fc5a96abf..f568e81f5 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -699,17 +699,17 @@ This action will abort any currently running synchronization.</source> <translation>Fortsett</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Feil ved lesing av konfigurasjonsfil</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>En feil oppstod ved aksessering av konfigurasjonsfilen på %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Avslutt ownCloud</translation> </message> @@ -781,8 +781,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -790,27 +790,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>Filnavn-koding er ikke gyldig</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation type="unfinished"/> </message> @@ -912,40 +912,40 @@ This action will abort any currently running synchronization.</source> <translation>Synkroniseringsaktivitet</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <source>Could not read system exclude file</source> <translation>Klarte ikke å lese systemets ekskluderingsfil</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <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="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Mappen %1 var laget, men har tidligere blitt ekskludert fra synkronisering. Data i mappen vil derfor ikke bli synkronisert. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -954,7 +954,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="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -965,7 +965,7 @@ Hvis du velger å beholde filene, vil de bli synkronisert tilbake til serveren h Hvis du velger å slette filene, blir de utilgjengelige for deg hvis du ikke er eieren av filen.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -974,17 +974,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Fjerne alle filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Fjern alle filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Behold filer</translation> </message> @@ -1160,107 +1160,107 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <translation>Det er uløste konflikter. Klikk for detaljer.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>Sjekker for endringer i ekstern '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>Sjekker for endringer i lokal '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Sammenslår endringer</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>fil %1 av %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Venter..</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Forbereder synkronisering...</translation> </message> @@ -1284,12 +1284,12 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Legg til mappe-synkronisering</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Legg til tilkobling for synkronisering</translation> </message> @@ -1359,21 +1359,26 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Du synkroniserer allerede <i>%1</i>, som er foreldremappe for <i>%2</i>.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation type="unfinished"/> </message> @@ -1532,17 +1537,17 @@ Hvis det var et uhell og du velger å beholde filene, vil de bli synkronisert ti <translation>&Omstart && Oppdater</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>Bytt oppdateringskanal? </translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1551,12 +1556,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Vær oppmerksom på at dette bare velger hvor oppgraderinger kommer ifra, og at nedgraderinger ikke er mulig. Så å gå tilbake fra beta-kanalen til den stabile kanalen, kan ikke gjøres umiddelbart og betyr å vente på en stabil versjon som er nyere enn den nåværende installerte betaen versjon.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>Bytt oppdateringskanal</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -2141,7 +2146,7 @@ kan be om flere rettigheter underveis.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3039,33 +3044,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Innstillinger</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Aktivitet</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Generelt</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Nettverk</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Avslutt %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Konto</translation> </message> @@ -3211,96 +3216,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Alle med linken har tilgang til filen/mappen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>P&assordbeskyttelse</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Filen kan ikke deles fordi den ble delt uten adgang til å dele.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Lenker har blitt deaktivert</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Opprett offentlig kobling deling</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Slett</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Åpne lenke i nettleser</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Kopier link til utklippstavlen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Kopier link til utklippstavlen (direkte nedlasting)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Send link i e-post</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Send link i e-post (direkte nedlasting)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Bekreft Sletting av Link</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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>Ønsker du virkelig å slette delingen av den offentlige lenken<i>%1</i>? </p> <p>Merk: Denne handlingen kan ikke omgjøres.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Offentlig lenke</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>Slett link</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Sett passord</translation> </message> @@ -3900,243 +3905,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Vennligst logg inn</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Mappe %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Ingen synkroniseringsmapper er konfigurert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Åpne i nettleser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Logg inn..</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Logg ut</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Siste endringer</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Administrerte mapper:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Åpne mappe '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Åpne %1 i nettleser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an 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="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Ukjent status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Innstillinger...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Detaljer...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Hjelp</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Avslutt %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Koble fra %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Server-versjonen støttes ikke</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Frakoblet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>Frakoblet noen kontoer</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Koblet fra kontoer:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Konto %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Logget ut</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>Kontosynkronisering er deaktivert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>Synkronisering er satt på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>Uløste konflikter</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Feil under synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>Ingen synkronisering-mapper konfigurert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Fortsett alle mapper</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Sett alle mapper på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Fortsett all synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Fortsett synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Sett all synkronisering på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Sett synkronisering på pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Logg ut av alle kontoer</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Logg inn på alle kontoer...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Ny konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>Om %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Ingenting synkronisert nylig</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Sjekker for endringer i ekstern '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Sjekker for endringer i lokal '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synkroniserer %1 av %2 (%3 gjenstår)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Synkroniserer %1 av %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Synkroniserer %1 (%2 gjenstår)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Synkroniserer %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Oppdatert</translation> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 627a23951..257372d64 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -703,17 +703,17 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <translation>Verder</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Fout bij benaderen configuratiebestand</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Er trad een fout op bij het benaderen configuratiebestand op %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Verlaten ownCloud</translation> </message> @@ -785,8 +785,8 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -794,27 +794,27 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>Bestandsnaamcodering is niet geldig</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation type="unfinished"/> </message> @@ -916,41 +916,41 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <translation>Synchronisatie-activiteit</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <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="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -959,7 +959,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="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -970,7 +970,7 @@ Als u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de serv Als u de bestanden wilt verwijderen, worden ze niet beschikbaar, tenzij u de eigenaar bent.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -978,17 +978,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Verwijder alle bestanden?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Verwijder alle bestanden</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Bewaar bestanden</translation> </message> @@ -1165,107 +1165,107 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <translation>Er zijn onopgeloste conflicten. Klik voor details.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Wijzigingen doorvoeren</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>bestand %1 van %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Aan het wachten...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Voorbereiden op sync...</translation> </message> @@ -1289,12 +1289,12 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Voeg map-synchronisatie verbinding toe</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Toevoegen Sync verbinding</translation> </message> @@ -1364,21 +1364,26 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>U synchroniseert <i>%1</i> al, dat is de bovenliggende map van <i>%2</i>.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation type="unfinished"/> </message> @@ -1537,29 +1542,29 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <translation>&Herstarten en &Bijwerken</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Annuleren</translation> </message> @@ -2147,7 +2152,7 @@ vragen om extra autorisaties tijdens installatie.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3045,33 +3050,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Instellingen</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Activiteit</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Algemeen</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Netwerk</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>%1 afsluiten</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Account</translation> </message> @@ -3149,7 +3154,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.ui" line="207"/> <source>Upload only (File Drop)</source> - <translation type="unfinished"/> + <translation>Alleen uploaden (File Drop)</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.ui" line="220"/> @@ -3217,96 +3222,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Iedereen met de link heeft toegang tot het bestand of de map</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>&Wachtwoord beveiligd</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Het bestand kan niet worden gedeeld, omdat het werd gedeeld zonder verder delen toestemming.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Link delen zijn uitgeschakeld</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Maak een verdeelbare publieke link aan</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Verwijderen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Openen link in browser</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Kopiëren link naar klembord</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Kopieer de link naar het klembord (directe download)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Versturen links via e-mail</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Verzend link met email (directe download)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Bevestig Gedeelde Link Verwijdering</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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>1 Wilt u echt de verdeelbare publieke link verwijderen 2 %1 2 ? 1 3 Let op: deze actie kan niet ongedaan gemaakt worden. 3</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Annuleren</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Openbare Link</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>Verwijder verdeelbare link</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Stel uw wachtwoord in</translation> </message> @@ -3907,243 +3912,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Log alstublieft in</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Map %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Er zijn geen synchronisatie-mappen geconfigureerd.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Open in browser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Inloggen...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Afmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Recente wijzigingen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Beheerde mappen:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Open map '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Open %1 in browser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an 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="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Onbekende status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Instellingen...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Details ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Help</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>%1 afsluiten</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Losgekoppeld van %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Niet-ondersteunde server versie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Niet verbonden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Losgekoppeld van account:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Account %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Afgemeld</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>Account synchronisatie is uitgeschakeld</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Hervat alle mappen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Pauzeer alle mappen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Hervat alle synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Hervat synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Pauzeer alle synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Pauzeer synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Uitloggen van alle accounts...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Inloggen op alle accounts...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Nieuw account...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>About %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Recent niets gesynchroniseerd</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sync %1 van %2 (%3 over)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Synchroniseren %1 van %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Sync %1 (%2 over)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Synchroniseren %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Bijgewerkt</translation> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 1cfba5409..4bbbc2507 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -20,7 +20,7 @@ <message> <location filename="../src/libsync/filesystem.cpp" line="167"/> <source>Error removing '%1': %2</source> - <translation type="unfinished"/> + <translation>Błąd usuwania '%1': %2</translation> </message> <message> <location filename="../src/libsync/filesystem.cpp" line="183"/> @@ -94,7 +94,7 @@ <message> <location filename="../src/libsync/propagatedownload.cpp" line="197"/> <source>We received an unexpected download Content-Length.</source> - <translation type="unfinished"/> + <translation>Otrzymaliśmy nieoczekiwane pobranie Content-Length.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="224"/> @@ -241,17 +241,17 @@ <message> <location filename="../src/gui/accountsettings.cpp" line="353"/> <source>Enable virtual file support %1...</source> - <translation type="unfinished"/> + <translation>Włącz obsługę plików wirtualnych %1...</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="353"/> <source>(tech preview)</source> - <translation type="unfinished"/> + <translation>(podgląd techniczny)</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="353"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(eksperymentalne)</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="442"/> @@ -276,7 +276,7 @@ <message> <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> - <translation type="unfinished"/> + <translation>Wyłączyć obsługę plików wirtualnych?</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="606"/> @@ -285,7 +285,12 @@ The only advantage of disabling virtual file support is that the selective sync feature will become available again. This action will abort any currently running synchronization.</source> - <translation type="unfinished"/> + <translation>Ta czynność wyłączy obsługę plików wirtualnych. W konsekwencji zawartość folderów, które są obecnie oznaczone jako "dostępne tylko online", zostanie pobrana. + +Jedyną zaletą wyłączenia obsługi plików wirtualnych jest to, że funkcja selektywnej synchronizacji będzie ponownie dostępna. + +Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. +</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="613"/> @@ -335,7 +340,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="864"/> <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source> - <translation type="unfinished"/> + <translation>Uzyskanie autoryzacji z przeglądarki. Kliknij tutaj, aby ponownie otworzyć przeglądarkę.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="868"/> @@ -396,12 +401,12 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="262"/> <source>Open local folder</source> - <translation type="unfinished"/> + <translation>Otwórz folder lokalny</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="270"/> <source>Open folder in browser</source> - <translation type="unfinished"/> + <translation>Otwórz folder w przeglądarce</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="321"/> @@ -416,12 +421,12 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="328"/> <source>Availability</source> - <translation type="unfinished"/> + <translation>Dostępność</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Disable virtual file support...</source> - <translation type="unfinished"/> + <translation>Wyłącz obsługę plików wirtualnych...</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="500"/> @@ -658,7 +663,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/addcertificatedialog.ui" line="71"/> <source>An encrypted pkcs12 bundle is strongly recommended as a copy will be stored in the configuration file.</source> - <translation type="unfinished"/> + <translation>Zaszyfrowany pakiet pkcs12 jest zdecydowanie zalecany, ponieważ kopia będzie przechowywana w pliku konfiguracyjnym.</translation> </message> <message> <location filename="../src/gui/addcertificatedialog.cpp" line="38"/> @@ -699,17 +704,17 @@ This action will abort any currently running synchronization.</source> <translation>Kontynuuj </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Błąd przy dostępie do pliku konfiguracji</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Wystąpił błąd podczas próby dostępu do pliku konfiguracyjnego %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Wyłącz ownCloud</translation> </message> @@ -781,38 +786,38 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> - <translation type="unfinished"/> + <translation>Błąd serwera: Odpowiedź PROPFIND nie jest sformatowana w formacie XML!</translation> </message> </context> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> - <translation type="unfinished"/> + <translation>Błąd podczas otwierania katalogu %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> - <translation type="unfinished"/> + <translation>Katalog niedostępny dla klienta, brak zezwolenia</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> - <translation type="unfinished"/> + <translation>Nie znaleziono katalogu: %1 </translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> - <translation type="unfinished"/> + <translation>Kodowanie nazw plików nie jest poprawne.</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> - <translation type="unfinished"/> + <translation>Błąd podczas odczytu katalogu %1</translation> </message> </context> <context> @@ -912,50 +917,52 @@ This action will abort any currently running synchronization.</source> <translation>Aktywności synchronizacji</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <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="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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 poprzednio został wykluczony z synchronizacji. Dane wewnątrz folderu nie będą zsynchronizowane.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Plik %1 został utworzony ale poprzednio został wykluczony z synchronizacji. Nie będzie zsynchronizowany.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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>Zmiany w zsynchronizowanych folderach nie mogły być wiarygodnie śledzone. + +Oznacza to, że klient synchronizacji może nie przesyłać zmian lokalnych od razu i zamiast tego będzie tylko skanować w poszukiwaniu zmian lokalnych i przesyłać je sporadycznie (domyślnie co dwie godziny).</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -966,24 +973,26 @@ Jeśli zdecydujesz się zatrzymać pliki i posiadasz odpowiednie uprawnienia, zo Jeśli zdecydujesz je usunąć, nie będą więcej dostępne. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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>Wszystkie pliki w lokalnym folderze synchronizacji "%1" zostały usunięte. Te pliki zostaną zsynchronizowane z serwerem, przez co będą niedostępne, chyba że zostaną przywrócone. +Czy na pewno chcesz zsynchronizować te działania z serwerem? +Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchronizowane z serwera.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Usunąć wszystkie pliki?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Usuń wszystkie pliki</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Pozostaw pliki</translation> </message> @@ -1068,7 +1077,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> - <translation type="unfinished"/> + <translation>Wybrana ścieżka nie istnieje!</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1376"/> @@ -1083,7 +1092,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/gui/folderman.cpp" line="1445"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> - <translation type="unfinished"/> + <translation>Istnieje już synchronizacja z serwera do tego lokalnego folderu. Proszę wybrać inny folder lokalny!</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1425"/> @@ -1141,7 +1150,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> <source>Virtual file support is enabled.</source> - <translation type="unfinished"/> + <translation>Obsługa plików wirtualnych jest włączona.</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> @@ -1159,107 +1168,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Istnieją nierozwiązane konflikty. Kliknij aby poznać szczegóły.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>Sprawdzanie zmian w lokalizacji zdalnej '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>Sprawdzanie zmian w lokalizacji lokalnej '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> - <translation type="unfinished"/> + <translation>Uzgodnienie zmian</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>plik %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Czekaj...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Przygotowanie do synchronizacji ...</translation> </message> @@ -1283,12 +1292,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Dodaj folder połączenia synchronizacji</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Dodaj połączenie synchronizacji</translation> </message> @@ -1358,23 +1367,28 @@ If this was an accident and you decide to keep your files, they will be re-synce <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Synchronizujesz już <i>%1</i>, który jest folderem nadrzędnym <i>%2</i>.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> - <translation type="unfinished"/> + <translation>Używaj plików wirtualnych zamiast natychmiastowego pobierania zawartości %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> - <translation type="unfinished"/> + <translation>(podgląd techniczny)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(eksperymentalne)</translation> </message> </context> <context> @@ -1395,7 +1409,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/libsync/propagatedownloadzsync.cpp" line="149"/> <source>Unable to parse zsync.</source> - <translation type="unfinished"/> + <translation>Nie można przetworzyć zsync.</translation> </message> <message> <location filename="../src/libsync/propagatedownloadzsync.cpp" line="171"/> @@ -1493,7 +1507,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Enable Delta-Synchronization for files larger than</source> - <translation type="unfinished"/> + <translation>Włącz synchronizację Delta dla plików większych niż</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="216"/> @@ -1531,29 +1545,29 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>&Zrestartuj && Aktualizuj</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>Czy zmienić kanał aktualizacji?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>Zmiana kanału aktualizacji</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Anuluj</translation> </message> @@ -1628,7 +1642,9 @@ Note that this selects only what pool upgrades are taken from, and that there ar <source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are 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>Pliki lub foldery pasujące do wzorca nie będą synchronizowane. Zmiany zaczną obowiązywać przy następnej synchronizacji folderów. + +Elementy, których usunięcie jest dozwolone, zostaną usunięte, jeśli uniemożliwią usunięcie katalogu. Jest to przydatne w przypadku metadanych.</translation> </message> <message> <location filename="../src/gui/ignorelisteditor.cpp" line="125"/> @@ -2108,12 +2124,12 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/> <source>(tech preview)</source> - <translation type="unfinished"/> + <translation>(podgląd techniczny)</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(eksperymentalne)</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/> @@ -2137,7 +2153,7 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3035,33 +3051,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ustawienia</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Aktywność</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Ogólne</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Sieć</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Wyjdź %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Konto</translation> </message> @@ -3207,96 +3223,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Każdy posiadający link ma dostęp do pliku/katalogu.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>Z&abezpieczenie hasłem</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Plik nie może być udostępniony, ponieważ został udostępniony bez uprawnień.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Link udostępniania został wyłączony</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Utwórz publiczny link do udostępnienia</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Usuń</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Otwórz link w przeglądarce</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Skopuj link to schowka</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Skopiuj link do schowa (pobieranie bezpośrednie)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Wyślij link mailem</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Wyślij link e-mailem (pobieranie bezpośrednie)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation>Udostępniłem Tobie %1</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Potwierdź usunięcie linku do udostępniania</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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>Czy na pewno chcesz usunąć publiczny link do udostępnienia <i>%1</i>?</p><p>Uwaga: Tej operacji nie można cofnąć.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Link publiczny</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>Usuń link udostępniania</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Proszę podać hasło</translation> </message> @@ -3896,243 +3912,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Proszę się zalogować</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Folder %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Nie skonfigurowano żadnych folderów synchronizacji.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Otwórz w przeglądarce</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Zaloguj...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Wyloguj</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Ostatnie zmiany</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Zarządzane foldery:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Otwórz katalog '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Otwórz %1 w przeglądarce</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an 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="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Nieznany status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Ustawienia...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Szczegóły...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Wyjdź %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Rozłączony z %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Nie wspierana wersja serwera</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Rozłączony</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>Rozłącz od wybranych kont</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Rozłączony z kontami:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Dostęp %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Odłączony</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>Konto synchronizacji jest wyłączone</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>Synchronizacja wstrzymana</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>Nierozwiązane konfilkty</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Błąd podczas synchronizacji</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>Nie ustawiono katalogów do synchronizacji</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Wznów wszystkie katalogi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Wstrzymaj wszystkie katalogi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Wznów wszystkie synchronizacje</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Wznów synchronizację</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Wstrzymaj wszystkie synchronizacje</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Wstrzymaj synchronizację</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Wyloguj się się ze wszystkich kont</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Zaloguj się do wszystkich kont</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Nowe konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>O %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Brak ostatnich synchronizacji</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Sprawdzanie zmian w lokalizacji zdalnej '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Sprawdzanie zmian w lokalizacji lokalnej '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synchronizacja %1 z %2 (%3 pozostało)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Synchronizowanie %1 of %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronizuję %1 (%2 pozostało)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Synchronizowanie %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Aktualne</translation> </message> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 7926d99c1..0ad3e1dbb 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -699,17 +699,17 @@ This action will abort any currently running synchronization.</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Erro a aceder ao ficheiro de configuração</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Ocorreu um erro enquanto se acedia ao ficheiro de configuração em %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Sair do ownCloud</translation> </message> @@ -781,8 +781,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -790,27 +790,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>Codificação de nome de ficheiro não é válida</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation type="unfinished"/> </message> @@ -912,41 +912,41 @@ This action will abort any currently running synchronization.</source> <translation>Atividade de Sincronização</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <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="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -955,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="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -966,7 +966,7 @@ Se decidir manter os ficheiros, eles serão sincronizados novamento para o servi Se decidir apagar os ficheiros, eles ficaram indisponíveis para si, a não ser que seja o seu proprietário.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -975,17 +975,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Remover todos os ficheiros?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Remover todos os ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Manter ficheiros</translation> </message> @@ -1161,107 +1161,107 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>ficheiro %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>A aguardar...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>A preparar para sincronizar...</translation> </message> @@ -1285,12 +1285,12 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Adicionar Ligação de Sincronização de Pasta</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Adicionar Ligação de Sincronização</translation> </message> @@ -1360,21 +1360,26 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Já está a sincronizar <i>%1</i>, que é uma pasta de origem de <i>%2</i>.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation type="unfinished"/> </message> @@ -1533,29 +1538,29 @@ Se foi acidental e decidir manter os seus ficheiros, eles serão sincronizados n <translation>&Reiniciar e Atualizar</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -2139,7 +2144,7 @@ poderá pedir por privilégios adicionais durante o processo.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3037,33 +3042,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Definições</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Atividade</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Geral</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Rede</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Sair do %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Conta</translation> </message> @@ -3209,96 +3214,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Qualquer pessoa com a hiperligação terá acesso ao ficheiro/pasta</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>Protegida por senha</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>O ficheiro não pode ser partilhado porque foi partilhado sem permissão de partilha.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Abrir ligação no navegador</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Copiar endereço para a área de transferência</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Enviar hiperligação por correio eletrónico</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Hiperligação Pública</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Por favor, Definir Senha</translation> </message> @@ -3898,243 +3903,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Por favor inicie a sessão</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Pasta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Não há pastas de sincronização configurado.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Abrir no navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Iniciar sessão...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Terminar sessão</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Alterações recentes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Pastas Geridas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Abrir pasta '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Abrir %1 no navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an 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="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Estado desconhecido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Configurações...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Detalhes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Sair do %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Desconetado de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Versão de servidor não suportada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Desligado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Desconetado das contas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Conta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Sessão terminada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>A sincronização de contas está desactivada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Erro durante a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Continuar todas as pastas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Pausar todas as pastas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Continuar toda a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Continuar sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Pausar toda a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Pausar sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Sair de todas as contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Entrar em todas as contas...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Nova conta...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>Sobre %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Sem itens sincronizados recentemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sincronizar %1 de %2 (%3 faltando)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>A sincronizar %1 de %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>A sincronizar %1 (%2 em falta)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>A sincronizar %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Atualizado</translation> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index db6981b7b..9e45a32b0 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -703,17 +703,17 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Erro acessando o arquivo de configuração</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Ocorreu um erro ao acessar o arquivo de configuração em %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Sair do ownCloud</translation> </message> @@ -785,8 +785,8 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Erro do servidor: resposta PROPFIND não está formatada em XML!</translation> </message> @@ -794,27 +794,27 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation>Erro ao abrir o diretório %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation>Diretório não acessível no cliente, permissão negada</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>Diretório não encontrado: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>A codificação do nome do arquivo não é válida</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>Erro ao ler o diretório %1</translation> </message> @@ -916,41 +916,41 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <translation>Atividade de Sincronização</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <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="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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 você deseja baixá-lo.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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. Os dados dentro dela não serão sincronizados.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>A arquivo %1 foi criado, mas foi excluído da sincronização anteriormente. Ele não será sincronizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -963,7 +963,7 @@ Isso significa que o cliente de sincronização pode não fazer envios de altera %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -974,24 +974,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a Se você decidir excluir os arquivos, eles não estarão disponíveis para você, a menos que você seja o proprietário.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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>Todos os arquivos na pasta de sincronização local '%1' foram excluídos. Essas exclusões serão sincronizadas com o servidor, tornando tais arquivos indisponíveis, a menos que restaurados.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 re-sincronizados a partir do servidor.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Deseja Remover Todos os Arquivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Remover todos os arquivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Manter arquivos</translation> </message> @@ -1167,107 +1167,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Existem conflitos não resolvidos. Clique para detalhes.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>Verificando alterações remotamente '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <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="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Reconciliando mudanças</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>arquivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Esperando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1291,12 +1291,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Adicionar Conexão de Sincronização de pasta</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Adicionar Conexão de Sincronização</translation> </message> @@ -1366,21 +1366,26 @@ If this was an accident and you decide to keep your files, they will be re-synce <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Você já está sincronizando <i>%1</i>, que é uma pasta mãe de <i>%2</i>.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation>Use arquivos virtuais em vez de baixar o conteúdo imediatamente %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation> (visualização técnica)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation>(experimental)</translation> </message> @@ -1540,17 +1545,17 @@ If this was an accident and you decide to keep your files, they will be re-synce </translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Não é possível desativar a inicialização automática porque a inicialização automática em todo o sistema está ativada.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>Alterar canal de atualização?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1558,12 +1563,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Observe que isso seleciona apenas de qual conjunto de atualizações são retiradas e que não há rebaixamentos: Portanto, voltar do canal beta para o canal estável geralmente não pode ser feito imediatamente e significa esperar por uma versão estável que seja mais recente do que a versão beta atualmente instalada.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>Alterar canal de atualização</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -2152,7 +2157,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3058,33 +3063,33 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Configurações</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Atividade</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Geral</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Rede</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Sair %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> - <translation type="unfinished"/> + <translation>Você tem certeza que deseja sair %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Conta</translation> </message> @@ -3230,96 +3235,96 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Qualquer pessoa com o link tem acesso ao arquivo/pasta</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>S&enha de proteção</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>O arquivo não pode ser partilhado, pois foi compartilhado sem permissão de compartilhamento.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Os compartilhamentos de linque foram desativados</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Criar linque de compartilhamento público</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Excluir</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Abrir linque no navegador</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Copiar o linque para a área de transferência</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Copiar o linque para a área de transferência (download direto)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Enviar linque por e-mail</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Enviar linque por e-mail (download direto)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation>Criar novo...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation>Eu compartilhei %1 com você</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar o Link de Eliminação de Compartilhamento</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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>Você realmente deseja excluir o compartilhamento de links públicos <i>%1</i>?</p><p>Nota: Esta ação não pode ser desfeita.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Linque público</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>Excluir linque de compartilhamento</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Por favor, Definir senha</translation> </message> @@ -3922,243 +3927,243 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Favor conectar</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Pasta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Não há pastas de sincronização configuradas.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Abrir no navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Entrar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Sair</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Alterações Recentes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Pastas Gerenciadas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Abrir pasta '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Abrir %1 no navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>O servidor na conta %1 executa uma versão não suportada %2. A utilização deste cliente com versões de servidor não suportadas não foi testada e é potencialmente perigosa. Prossiga por sua conta e risco.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Status desconhecido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Configurações...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Detalhes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Sair %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Desconectado de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Versão do Servidor Não Suportada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>Desconectado de algumas contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Desconectado de contas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Conta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>A sincronização de conta está desativada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>A sincronização está pausada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>Conflitos não resolvidos</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Erro durante a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>Nenhuma pasta de sincronização configurada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Retomar todas as pastas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Pausar todas as pastas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Retomar toda a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Retomar sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Dar uma pausa em toda a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Dar uma pausa na sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Desconectar todas as contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Conectar todas as contas...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Nova conta...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>Sobre %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Não há itens sincronizados recentemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Verificando alterações remotamente '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Verificação de alterações local '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sincronizar %1 de %2 (%3 faltando)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Sincronizando %1 de %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizando %1 (%2 faltando)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Até a data</translation> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 7071ddb62..343c65d8c 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -703,17 +703,17 @@ This action will abort any currently running synchronization.</source> <translation>Продолжить</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Ошибка при доступе к файлу конфигурации</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>При обращении к файлу конфигурации %1 произошла ошибка.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Выйти из ownCloud</translation> </message> @@ -785,8 +785,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Ошибка сервера: Ответ на PROPFIND не в формате XML!</translation> </message> @@ -794,27 +794,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation>Ошибка при открытии каталога %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation>Каталог не доступен на клиенте, доступ запрещён</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>Каталог не найден: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>Кодировка имени файла не верна</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>Ошибка при чтении каталога %1</translation> </message> @@ -916,41 +916,41 @@ This action will abort any currently running synchronization.</source> <translation>Журнал синхронизации</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <source>Could not read system exclude file</source> <translation>Невозможно прочесть системный файл исключений</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <source>A folder from an external storage has been added. </source> <translation>Добавлен каталог из внешнего хранилища. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -963,7 +963,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -974,7 +974,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a Если вы решили удалить файлы, они станут вам недоступны, крмое случая, когда вы сам владелец.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -983,17 +983,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Удалить все файлы?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Удалить все файлы</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Сохранить файлы</translation> </message> @@ -1169,107 +1169,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Есть неразрешенные конфликты. Нажми для просмотра подробностей.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>Проверяю измененеия в удалённом '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>Проверяю изменения в локальном '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Согласование изменений</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation>↓ %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation>↑ %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>файл %1 из %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Ожидание...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Ожидание %n директории...</numerusform><numerusform>Ожидание %n директорий...</numerusform><numerusform>Ожидание %n директорий...</numerusform><numerusform>Ожидание %n директорий...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Подготовка к синхронизации...</translation> </message> @@ -1293,12 +1293,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Добавить папку для синхронизации</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Добавить подключение для синхронизации</translation> </message> @@ -1368,21 +1368,26 @@ If this was an accident and you decide to keep your files, they will be re-synce <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Каталог <i>%1</i> уже настроен для синхронизации, и он является родительским для каталога <i>%2</i>.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation>Использовать виртуальные файлы вместо загрузки содержимого %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation>(техническая демонстрация)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation>(экспериментальное)</translation> </message> @@ -1541,17 +1546,17 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>&Перезапуск и обновление</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Нельзя отключить автозапуск, так как включён общесистемный автозапуск.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>Изменить канал обновлений?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1560,12 +1565,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar Заметьте, что это задаёт лишь место, откуда берутся обновления, нет возможности их отката назад. Таким образом, переключение канала с беты на стабильный не будет выполнено немедленно, оно подразумевает ожидание, когда выйдет стабильная версия, которая будет более свежей, чем установленная в данный момент бета-версия.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>Изменить канал обновлений</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -2154,7 +2159,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3060,33 +3065,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Настройки</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>События</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Основные</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Сеть</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Закрыть %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> - <translation type="unfinished"/> + <translation>Вы уверены, что хотите выйти из?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Уч.запись</translation> </message> @@ -3232,96 +3237,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Каждый, у кого есть эта ссылка, имеет доступ к файлу/каталогу</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>Защитить паролем</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Невозможно предоставить общий доступ к файлу: нет разрешения на предоставление общего доступа.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Доступ по ссылкам был отключён</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Создать ссылку общего доступа</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Открыть ссылку в браузере</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Копировать ссылку в буфер обмена</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Скопировать ссылку в буфер обмена (прямое скачивание)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Отправить ссылку по email</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Отправить ссылку по почте (прямое скачивание)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation>Создать новое…</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation>Я даю вам доступ к %1</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>Подтвердите удаление доступа по ссылке</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Вы действтиельно хотите удалить доступ по общей ссылке <i>%1</i>?</p><p>Внимание: это действие будет невозможно отменить.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Общедоступная ссылка</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>Удалить доступ по ссылке</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Пожалуйста, установите пароль</translation> </message> @@ -3923,243 +3928,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Пожалуйста войдите в систему</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Каталог %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Нет настроенных каталогов для синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Открыть в браузере</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Вход...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Выйти</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Недавние изменения</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Управляемые каталоги:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Открыть каталог '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Открыть %1 в браузере</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>Учётная запись сервера %1 работает с неподдерживаемой версией %2. Использование клиента с неподдерживаемой версией сервера не тестировалось и потенциально опасно. Продолжайте на свой страх и риск.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Неизвестный статус</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Настройки...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Детали...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Закрыть %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Отключен от %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Версия сервера не поддерживается</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Отключено</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>Отключено от некоторых учётных записей</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Отключен от учетных записей:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Учетная запись %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Вышли из аккаунта</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>Синхронизация учётной записи отключена</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>Синхронизация приостановлена</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>Неразрешённые конфликты</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Ошибка во время синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>Не настроено ни одного каталога для синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Снять с паузы все папки</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Поставить на паузу все папки</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Возобновить все синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Возобновить синхронизацию</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Приостановить все синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Приостановить синхронизацию</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Выйти из всех учетных записей</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Войти во все учетные записи...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Новая учётная запись…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>Про %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Недавно ничего не синхронизировалось</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Проверяю измененеия в удалённом '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Проверяю изменения в локальном '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Синхронизация %1 из %2 (осталось %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Синхронизирую %1 из %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Синхронизация %1 (осталось %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Синхронизация %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Актуальная версия</translation> </message> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 53c2f0b83..4bfc219a8 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -699,17 +699,17 @@ This action will abort any currently running synchronization.</source> <translation>Nadaljuj</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Napaka dostopa do nastavitvene datoteke</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Med dostopom do nastavitvene datoteke na %1 je prišlo do napake.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Končaj ownCloud</translation> </message> @@ -781,8 +781,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -790,27 +790,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>Kodni zapis imena datoteke ni veljaven.</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation type="unfinished"/> </message> @@ -912,41 +912,41 @@ This action will abort any currently running synchronization.</source> <translation>Dejavnost usklajevanja</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <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="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -955,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="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -966,7 +966,7 @@ V kolikor se odločite te datoteke ohraniti, in so na voljo ustrezna dovoljenja, Nasprotno, če potrdite izbris in niste lastnik datotek, te ne bodo več na voljo.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -975,17 +975,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Ali naj bodo odstranjene vse datoteke?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Odstrani vse datoteke</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Ohrani datoteke</translation> </message> @@ -1161,107 +1161,107 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>datoteka %1 od %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Čakanje na povezavo ...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Priprava na usklajevanje ...</translation> </message> @@ -1285,12 +1285,12 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Dodaj povezavo za usklajevanje mape</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Dodaj povezavo za usklajevanje</translation> </message> @@ -1360,21 +1360,26 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Datoteke se že usklajujejo na ravni mape <i>%1</i>, ki je nadrejena mapi <i>%2</i>.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation type="unfinished"/> </message> @@ -1533,29 +1538,29 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? <translation>&Ponovno zaženi && posodobi</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Prekliči</translation> </message> @@ -2139,7 +2144,7 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3037,33 +3042,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nastavitve</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Dejavnosti</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Splošno</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Omrežje</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Končaj %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Račun</translation> </message> @@ -3209,96 +3214,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Vsak, ki ima povezavo ima dostop do datoteke ali mape</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>&Zaščiti z geslom</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Datoteke ni mogoče dodeliti v souporabo, ker je ni navedenih ustreznih dovoljenj.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Izbriši</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Odpri povezavo v brskalniku</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Kopiraj povezavo v odložišče</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Pošlji povezavo po elektronski pošti</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Prekliči</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Javna povezava</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Določite geslo</translation> </message> @@ -3898,243 +3903,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Pred nadaljevanjem je zahtevana prijava</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Mapa %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Ni nastavljenih map za usklajevanje.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Odpri v brskalniku</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Prijava ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Odjava</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Nedavne spremembe</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Upravljane mape:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Odpri mapo '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Odpri %1 v brskalniku</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an 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="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Neznano stanje</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Nastavitve ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Podrobnosti ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Pomoč</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Končaj %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Prekinjena povezava z %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Nepodprta različica strežnika</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Brez povezave</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Prekinjena je povezava z računi:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Račun %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Odjavljeno</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>Usklajevanje računa je onemogočeno</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>Usklajevanje je v premoru</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Med usklajevanjem je prišlo do napake</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>Ni nastavljenih map za usklajevanje.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Nadaljuj usklajevanje vseh map</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Ustavi usklajevanje vseh map</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Nadaljuj usklajevanje vsega</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Nadaljuj usklajevanje</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Ustavi vse usklajevanje</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Ustavi usklajevanje</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Odjavi vse račune</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Prijavi z vsemi računi ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Nov račun ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>O %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Ni nedavno usklajenih predmetov</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Poteka usklajevanje %1 od %2 (preostaja %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Poteka usklajevanje %1 od %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Usklajevanje %1 (%2 do konca)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Usklajevanje %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Ni posodobitev</translation> </message> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 518fc8f49..fae46c28b 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -699,17 +699,17 @@ This action will abort any currently running synchronization.</source> <translation>Fortsätt</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Kunde inte komma åt konfigurationsfilen</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Ett fel uppstod vid läsning av konfigurationsfil vid %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>Avsluta ownCloud</translation> </message> @@ -781,8 +781,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"/> </message> @@ -790,27 +790,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>Filnamnskodning är inte giltig</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation type="unfinished"/> </message> @@ -912,41 +912,41 @@ This action will abort any currently running synchronization.</source> <translation>Synk aktivitet</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <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="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <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="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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 ner den.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -955,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="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -963,24 +963,24 @@ 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="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Ta bort alla filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Ta bort alla filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Behåll filer</translation> </message> @@ -1156,107 +1156,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Det finns olösta konflikter. Klicka för detaljer.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ladda ner %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>fil %1 av %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Väntar...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Förbereder för att synkronisera...</translation> </message> @@ -1280,12 +1280,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Lägg till mapp att synka.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Lägg till anslutning.</translation> </message> @@ -1355,21 +1355,26 @@ If this was an accident and you decide to keep your files, they will be re-synce <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Du synkar redan <i>%1</i>, vilket är övermapp till <i>%2</i></translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation type="unfinished"/> </message> @@ -1528,29 +1533,29 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>%Starta om && Uppdatera</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -2134,7 +2139,7 @@ ytterligare rättigheter under processen.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3032,33 +3037,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Inställningar</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Aktivitet</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Allmänt</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Nätverk</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>Avsluta %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Konto</translation> </message> @@ -3204,96 +3209,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Vem som helst med länken kan komma åt filen eller mappen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>L&ösenordsskydda</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Filen kan inte delas eftersom den delades utan delningsrättigheter.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Delningslänkar har inaktiverats</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Skapa publik delningslänk</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Ta bort</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Öppna länk i webbläsare</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Kopiera länk till urklipp</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>Kopiera länk till urklipp (direktnedladdning)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Skicka länk via e-post</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>Skicka länk med e-post (direktnedladdning)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Publik länk</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Var vänlig sätt lösenord</translation> </message> @@ -3893,243 +3898,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Vänliga logga in</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Mapp %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Det finns inga synkmappar konfigurerade.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Öppna i webbläsare</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Logga in...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Logga ut</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Senaste ändringar</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Hanterade mappar:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>Öppna mapp '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>Öppna %1 i webbläsaren</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an 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="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Okänd status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Inställningar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Detaljer...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Hjälp</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>Avsluta %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>Koppla från %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Serverversion stöds inte</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Bortkopplad</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Bortkopplad från dessa konton:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Konto %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Utloggad</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>Synkronisering för konto är avstängd</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>Fel vid synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>Inga mappar valda för synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Sluta pausa alla mappar</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Pausa alla mappar</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Sluta pausa all synkroinisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Sluta pausa synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Pausa all synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Pausa synkronisering</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Logga ut från alla konton</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Logga in på alla konton...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Nytt konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>Om %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Inga filer har synkroniseras nyligen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synkroniserar %1 av %2 (%3 kvar)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>Synkroniserar %1 av %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Synkroniserar %1 (%2 kvar)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>Synkroniserar %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Aktuell version</translation> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index 371f6c1a3..3fef67068 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -524,7 +524,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitylistmodel.cpp" line="74"/> <source>%1 %2 on %3</source> - <translation type="unfinished"/> + <translation>%1 %2 บน %3</translation> </message> </context> <context> @@ -703,17 +703,17 @@ This action will abort any currently running synchronization.</source> <translation>ดำเนินการต่อ</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>เกิดข้อผิดพลาดขณะกำลังเข้าถึงไฟล์กำหนดค่า</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>เกิดข้อผิดพลาดขณะกำลังเข้าถึงไฟล์กำหนดค่า %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>ออกจาก ownCloud</translation> </message> @@ -785,8 +785,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>ข้อผิดพลาดเซิร์ฟเวอร์: การตอบกลับ PROPFIND ไม่ใช่รูปแบบ XML!</translation> </message> @@ -794,27 +794,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation>เกิดข้อผิดพลาดขณะเปิดไดเรกทอรี %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation>การเข้าถึงถูกปฏิเสธไม่สามารถเข้าถึงไดเรกทอรีบนไคลเอนต์</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>ไม่พบไดเรกทอรี: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>การเข้ารหัสชื่อไฟล์ไม่ถูกต้อง</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>เกิดข้อผิดพลาดขณะอ่านไดเรกทอรี %1</translation> </message> @@ -916,41 +916,41 @@ This action will abort any currently running synchronization.</source> <translation>ความเคลื่อนไหวของการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <source>Could not read system exclude file</source> <translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <source>A folder from an external storage has been added. </source> <translation>โฟลเดอร์ที่มีพื้นที่จัดเก็บข้อมูลภายนอกได้ถูกเพิ่ม </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -961,7 +961,7 @@ This means that the synchronization client might not upload local changes immedi หมายความว่าการประสานข้อมูลของไคลเอ็นต์อาจยังไม่ได้อัปโหลดการเปลี่ยนแปลงในระบบทันทีและจะสแกนเฉพาะการเปลี่ยนแปลงในเครื่องและอัปโหลดไฟล์เหล่านั้นเป็นครั้งคราว (ทุกสองชั่วโมงตามค่าเริ่มต้น)</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -972,7 +972,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a หากคุณตัดสินใจลบไฟล์ก็จะทำให้ไม่มีใครสามารถใช้งานโฟลเดอร์นี้ได้เพราะคุณเป็นเจ้าของ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -982,17 +982,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>ลบไฟล์ทั้งหมด?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>ลบไฟล์ทั้งหมด</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>เก็บไฟล์เอาไว้</translation> </message> @@ -1168,107 +1168,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>มีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข คลิกเพื่อดูรายละเอียด</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในรีโมต '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในเครื่อง '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>คืนค่าการเปลี่ยนแปลง</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>หรือ</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation>↑ %1/วินาที</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>ไฟล์ %1 จาก %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>กรุณารอซักครู่...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>กำลังรออีก (%n) โฟลเดอร์...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>กำลังเตรียมพร้อมในการประสานข้อมูล</translation> </message> @@ -1292,12 +1292,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>เพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>เพิ่มการประสานข้อมูลให้ตรงกัน</translation> </message> @@ -1367,21 +1367,26 @@ If this was an accident and you decide to keep your files, they will be re-synce <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>คุณประสานข้อมูล <i>%1</i> อยู่แล้ว ซึ่งมีโฟลเดอร์หลักเป็น <i>%2</i></translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation>ใช้ไฟล์เสมือนแทนการดาวน์โหลดเนื้อหาแบบทันที</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation>(ตัวอย่างทางเทคนิค)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation>(ทดลอง)</translation> </message> @@ -1540,17 +1545,17 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>และเริ่มต้นใหม่ && อัปเดต</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>คุณไม่สามารถปิดใช้งานระบบเริ่มต้นอัตโนมัติได้เนื่องจาก system-wide ได้ถูกเปิดใช้งานแล้ว</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>เปลี่ยนช่องทางการอัปเดต?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1559,12 +1564,12 @@ Note that this selects only what pool upgrades are taken from, and that there ar โปรดทราบว่าการเลือกนี้จะไม่สามารถดาวน์เกรดจากรุ่นเบต้าไปยังรุ่นเสถียรได้ ต้องรอให้รุ่นเสถียรใหม่กว่ารุ่นเบต้าก่อนถึงจะอัปเกรดเป็นรุ่นเสถียรได้</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>ตกลง</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>ยกเลิก</translation> </message> @@ -1908,7 +1913,7 @@ Note that using any logging command line options will override the settings.</so <message> <location filename="../src/gui/networksettings.ui" line="176"/> <source>Note: proxy settings have no effects for accounts on localhost</source> - <translation type="unfinished"/> + <translation>หมายเหตุ: การตั้งค่าพร็อกซีไม่มีผลกับบัญชีใน localhost</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="197"/> @@ -2152,7 +2157,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3054,33 +3059,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ตั้งค่า</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>กิจกรรม</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>ทั่วไป</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>เครือข่าย</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>ออก %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> - <translation type="unfinished"/> + <translation>แน่ใจหรือไม่ว่าคุณต้องการออกจาก %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>บัญชี</translation> </message> @@ -3226,96 +3231,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ทุกคนที่มีลิงก์สามารถเข้าถึงไฟล์หรือโฟลเดอร์ได้</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>ป้องกันด้วยรหัสผ่าน</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>ไม่สามารถแชร์ไฟล์เพราะไม่ได้รับอนุญาต</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>แชร์ลิงก์แล้วถูกปิดใช้งาน</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>สร้างแชร์ลิงก์สาธารณะ</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>ลบ</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>เปิดลิงก์ในเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>คัดลอกลิงก์ทางอีเมล (ดาวน์โหลดโดยตรง)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>ส่งลิงก์ทางอีเมล</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>ส่งลิงก์ทางอีเมล (ดาวน์โหลดโดยตรง)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation>สร้างใหม่...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation>ฉันได้แชร์ %1 กับคุณ</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>ยืนยันการลบลิงก์ที่แชร์</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>คุณต้องการลบลิงก์ที่แชร์แบบสาธารณะ<i>%1</i>?</p><p>หมายเหตุ: ไม่สามารถยกเลิกการดำเนินการนี้ได้</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>ยกเลิก</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>ลิงก์สาธารณะ</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>ลบลิงก์ที่แชร์</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>กรุณาตั้งรหัสผ่าน</translation> </message> @@ -3915,243 +3920,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>กรุณาเข้าสู่ระบบ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>โฟลเดอร์ %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>ไม่มีการกำหนดค่าการประสานข้อมูลโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>เปิดในเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>เข้าสู่ระบบ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>การเปลี่ยนแปลงล่าสุด</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>เปิดโฟลเดอร์ '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>เปิด %1 ในเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>เซิร์ฟเวอร์ในบัญชี %1 ไม่รองรับการทำงานกับ %2 ซึ่งอาจเป็นอันตราย ดำเนินการตามความเสี่ยงของคุณเอง</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>สถานะที่ไม่รู้จัก</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>ตั้งค่า...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>รายละเอียด...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>ช่วยเหลือ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>ออก %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>ถูกตัดการเชื่อมต่อจาก %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>ไม่สนับสนุนรุ่นของ Server</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>ยกเลิกการเชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>ยกเลิกการเชื่อมต่อจากบางบัญชี</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>ยกเลิกการเชื่อมต่อจากบัญชี:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>บัญชี %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>บัญชีประสานข้อมูลถูกปิดใช้งาน</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>หยุดการประสานข้อมูลแล้ว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>มีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>เกิดข้อผิดพลาดขณะทำการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>ไม่ได้กำหนดค่าโฟลเดอร์ที่จะประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>ทำโฟลเดอร์ทั้งหมดต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>หยุดโฟลเดอร์ทั้งหมดชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>ประสานข้อมูลทั้งหมดต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>ประสานข้อมูลต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>หยุดการประสานข้อมูลทั้งหมดชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>หยุดการประสานข้อมูลชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>ออกจากระบบของบัญชีทั้งหมด</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>เข้าสู่ระบบของบัญชีทั้งหมด...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>สร้างบัญชีใหม่...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>เกี่ยวกับ %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>ไม่มีรายการที่ถูกประสานข้อมูลเมื่อเร็วๆ นี้</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในรีโมต '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในเครื่อง '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>กำลังประสานข้อมูล %1 จาก %2 (เหลือ %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>กำลังประสานข้อมูล %1 จากทั้งหมด %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>กำลังประสานข้อมูล %1 (เหลือ %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>กำลังประสานข้อมูล %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>ถึงวันที่</translation> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 1b9e3e6d2..8de344033 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -20,7 +20,7 @@ <message> <location filename="../src/libsync/filesystem.cpp" line="167"/> <source>Error removing '%1': %2</source> - <translation type="unfinished"/> + <translation>'%1' kaldırılırken hata: %2</translation> </message> <message> <location filename="../src/libsync/filesystem.cpp" line="183"/> @@ -94,7 +94,7 @@ <message> <location filename="../src/libsync/propagatedownload.cpp" line="197"/> <source>We received an unexpected download Content-Length.</source> - <translation type="unfinished"/> + <translation>Beklenmeyen bir içerik veya uzunlukta indirme alındı.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="224"/> @@ -140,7 +140,7 @@ <message> <location filename="../src/libsync/abstractnetworkjob.cpp" line="449"/> <source>Server replied "%1 %2" to "%3 %4"</source> - <translation>sunucu "%1 %2" tarafından "%3 %4" tarafına cevap verdi.</translation> + <translation>Sunucu "%1 %2" tarafından "%3 %4" tarafına cevap verdi.</translation> </message> </context> <context> @@ -178,7 +178,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="212"/> <source>Apply manual changes</source> - <translation>Değişiklikleri manuel uygula</translation> + <translation>Elle yapılan değişiklikleri uygula</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="260"/> @@ -241,17 +241,17 @@ <message> <location filename="../src/gui/accountsettings.cpp" line="353"/> <source>Enable virtual file support %1...</source> - <translation type="unfinished"/> + <translation>%1 sanal dosya sistemi desteğini etkinleştir...</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="353"/> <source>(tech preview)</source> - <translation type="unfinished"/> + <translation>(teknik önizleme)</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="353"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(deneysel)</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="442"/> @@ -276,7 +276,7 @@ <message> <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> - <translation type="unfinished"/> + <translation>Sanal dosya desteği devre dışı bırakılsın mı?</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="606"/> @@ -285,12 +285,16 @@ The only advantage of disabling virtual file support is that the selective sync feature will become available again. This action will abort any currently running synchronization.</source> - <translation type="unfinished"/> + <translation>Bu eylem sanal dosya sistemi desteğini devre dışı bırakır. Sonuç olarak, şu anda "yalnızca çevrimiçi kullanılabilir" olarak işaretlenmiş klasörlerin içeriği indirilecektir. + +Sanal dosya sistemi desteğini devre dışı bırakmanın tek avantajı, seçmeli senkronizasyon özelliğinin tekrar kullanılabilir hale gelmesidir. + +Bu eylem, o anda çalışan senkronizasyonu iptal edecektir.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> - <translation type="unfinished"/> + <translation>Desteği devre dışı bırak</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="718"/> @@ -365,7 +369,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="999"/> <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 harici depolama alanında oldukları için eşitlenmeyen klasörler var:</translation> + <translation>Çok büyük oldukları ya da harici depolama alanında oldukları için eşitlenmeyen klasörler var:</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="1045"/> @@ -396,12 +400,12 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="262"/> <source>Open local folder</source> - <translation type="unfinished"/> + <translation>Yerel klasörü aç</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="270"/> <source>Open folder in browser</source> - <translation type="unfinished"/> + <translation>Klasörü tarayıcıda aç</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="321"/> @@ -421,7 +425,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Disable virtual file support...</source> - <translation type="unfinished"/> + <translation>Sanal dosya desteğini devre dışı bırak...</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="500"/> @@ -520,7 +524,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitylistmodel.cpp" line="74"/> <source>%1 %2 on %3</source> - <translation type="unfinished"/> + <translation>%3 üzerinde %1 %2</translation> </message> </context> <context> @@ -605,12 +609,12 @@ This action will abort any currently running synchronization.</source> <message numerus="yes"> <location filename="../src/gui/activitywidget.cpp" line="351"/> <source>%n notifications(s) for %1.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%1 için %n bildirim var.</numerusform><numerusform>%1 için %n bildirim var.</numerusform></translation> </message> <message numerus="yes"> <location filename="../src/gui/activitywidget.cpp" line="357"/> <source>%n notifications(s) for %1 and %2.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%1 ve %2 için %n bildirim var.</numerusform><numerusform>%1 ve %2 için %n bildirim var.</numerusform></translation> </message> <message> <location filename="../src/gui/activitywidget.cpp" line="359"/> @@ -620,7 +624,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.cpp" line="362"/> <source>Open the activity view for details.</source> - <translation type="unfinished"/> + <translation>Ayrıntılar için etkinlik görünümünü açın.</translation> </message> <message> <location filename="../src/gui/activitywidget.cpp" line="145"/> @@ -658,7 +662,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/addcertificatedialog.ui" line="71"/> <source>An encrypted pkcs12 bundle is strongly recommended as a copy will be stored in the configuration file.</source> - <translation type="unfinished"/> + <translation>Konfigürasyon dosyasında bir kopya saklanacağı için şifreli bir pkcs12 paketi şiddetle tavsiye edilir.</translation> </message> <message> <location filename="../src/gui/addcertificatedialog.cpp" line="38"/> @@ -681,12 +685,12 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/application.cpp" line="130"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> - <translation>Devam etmek <b>bu ayarları iptal etmek anlamına gelir</b>.</translation> + <translation>Devam etmek <b>bu ayarları yoksaymak anlamına gelir</b>.</translation> </message> <message> <location filename="../src/gui/application.cpp" line="136"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> - <translation type="unfinished"/> + <translation>Bazı ayarlar bu istemcinin daha yeni sürümlerinde yapılandırıldığından ötürü bu sürümde bulunmayan özellikleri kullanıyor. <br><br>%1 <br><br> Geçerli yapılandırma dosyası <i>%2</i> olarak yedeklendi.</translation> </message> <message> <location filename="../src/gui/application.cpp" line="143"/> @@ -699,17 +703,17 @@ This action will abort any currently running synchronization.</source> <translation>Devam et</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>Konfigürasyon dosyasına erişimde hata</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> - <translation>Konfigürasyon dosyası %1 satirina erişimde hata</translation> + <translation>Konfigürasyon dosyası %1 satırına erişimde hata</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>ownCloud'dan çık</translation> </message> @@ -781,36 +785,36 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> - <translation type="unfinished"/> + <translation>Sunucu hatası: PROPFIND cevabı XML formatında değil!</translation> </message> </context> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> - <translation>Dizin %1'i açılırken hata oluştu</translation> + <translation>Dizin %1 açılırken hata oluştu</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> - <translation type="unfinished"/> + <translation>İstemci klasöre erişemiyor, izin reddedildi.</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>Dizin bulunamadı: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>Dosya adı kodlaması geçerli değil</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>Dizin %1 okunurken hata oluştu</translation> </message> @@ -863,13 +867,13 @@ This action will abort any currently running synchronization.</source> <message numerus="yes"> <location filename="../src/gui/folder.cpp" line="419"/> <source>%1 and %n other file(s) have been added.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%1 ve %n diğer dosya eklendi.</numerusform><numerusform>%1 ve %n diğer dosya eklendi.</numerusform></translation> </message> <message> <location filename="../src/gui/folder.cpp" line="421"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> - <translation type="unfinished"/> + <translation>%1 eklendi.</translation> </message> <message numerus="yes"> <location filename="../src/gui/folder.cpp" line="426"/> @@ -912,41 +916,41 @@ This action will abort any currently running synchronization.</source> <translation>Eşitleme Etkinliği</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <source>Could not read system exclude file</source> <translation>Sistem hariç tutulma dosyası okunamadı</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>%1 MB dan büyük yeni klasör eklendi: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <source>A folder from an external storage has been added. </source> <translation>Harici depolama ünitesinden bir klasör eklendi. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>İndirmek isterseniz, lütfen "Ayarlar" bölümünden seçin.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> - <translation>%1 klasörü yaratıldı ama daha önce senkronizasyondan hariç tutuldu. İçerik senkronize edilmeyecek.</translation> + <translation>%1 klasörü yaratıldı ama daha önce senkronizasyondan hariç tutuldu. İçerik eşitlenmeyecek.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> - <translation>%1 dosyası yaratıldı ama daha önce senkronizasyondan hariç tutuldu, senkronize edilmeyecek.</translation> + <translation>%1 dosyası yaratıldı ama daha önce senkronizasyondan hariç tutuldu, İçerik eşitlenmeyecek.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -959,7 +963,7 @@ Bu yüzden senkronizasyon yerel değişiklikler anlık olarak karşı tarafa yü %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -970,7 +974,7 @@ Dosyalar silinmesin istiyorsanız, yetkiniz olduğu sürece sunucu ile tekrar se Silmeye karar verdiyseniz, sahibi olana kadar dosyalar kullanım dışıdır.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -979,17 +983,17 @@ Bu işlemlerin sunucuda da gerçekleşmesini istiyor musunuz? Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, dosyalar sunucudan tekrar senkronize edilecektir.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>Tüm Dosyalar Kaldırılsın mı?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>Tüm dosyaları kaldır</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>Dosyaları koru</translation> </message> @@ -1074,7 +1078,7 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <message> <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> - <translation type="unfinished"/> + <translation>Seçilen dosya yolu mevcut değil!</translation> </message> <message> <location filename="../src/gui/folderman.cpp" line="1376"/> @@ -1147,7 +1151,7 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <message> <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> <source>Virtual file support is enabled.</source> - <translation type="unfinished"/> + <translation>Sanal dosya sistemi desteği etkinleştirildi.</translation> </message> <message> <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> @@ -1165,107 +1169,107 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <translation>Çözüm gereken eşleşmeler var. Detaylar için tıklayın.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>Uzaktaki '%1' için değişiklikler kontrol ediliyor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>Yereldeki '%1' için değişiklikler kontrol ediliyor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>Değişikliklerin bağlama kavuşturulması</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> - <translation type="unfinished"/> + <translation>↓ %1/sn</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> - <translation type="unfinished"/> + <translation>↑ %1/sn</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>gönderme %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>dosya %1/%2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>Bekleniyor...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <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="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>Eşitleme için hazırlanıyor...</translation> </message> @@ -1275,7 +1279,7 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <message> <location filename="../src/gui/folderwatcher.cpp" line="115"/> <source>The watcher did not receive a test notification.</source> - <translation type="unfinished"/> + <translation>İzleyici bir test bildirimi almamıştır.</translation> </message> </context> <context> @@ -1289,12 +1293,12 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Klasör Eşitleme Bağlantısı Ekle</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Eşitleme Bağlantısı Ekle</translation> </message> @@ -1364,23 +1368,28 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation><i>%1</i> zaten eşitleniyor. Bu, <i>%2</i> klasörünün üst klasörü.</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> - <translation type="unfinished"/> + <translation>İçeriği hemen indirmek yerine sanal dosya sistemini kullan %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> - <translation type="unfinished"/> + <translation>(teknik önizleme)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(deneysel)</translation> </message> </context> <context> @@ -1401,22 +1410,22 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <message> <location filename="../src/libsync/propagatedownloadzsync.cpp" line="149"/> <source>Unable to parse zsync.</source> - <translation type="unfinished"/> + <translation>Zsync aracı bulunamadı.</translation> </message> <message> <location filename="../src/libsync/propagatedownloadzsync.cpp" line="171"/> <source>Failed to get zsync byte ranges.</source> - <translation type="unfinished"/> + <translation>Zsync aracından bayt aralıkları alınamadı.</translation> </message> <message> <location filename="../src/libsync/propagatedownloadzsync.cpp" line="194"/> <source>Failed to initialize zsync receive structure.</source> - <translation type="unfinished"/> + <translation>Zsync veri alım yapısı başlatılamadı.</translation> </message> <message> <location filename="../src/libsync/propagatedownloadzsync.cpp" line="319"/> <source>We received a different E-Tag for delta. Retrying next time.</source> - <translation type="unfinished"/> + <translation>Delta için farklı bir E-Etiket aldık. Sonraki işlemde yeniden denenecek.</translation> </message> </context> <context> @@ -1499,7 +1508,7 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <message> <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Enable Delta-Synchronization for files larger than</source> - <translation type="unfinished"/> + <translation>Şundan büyük dosyalar için delta eşitlemesini etkinleştir</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="216"/> @@ -1537,29 +1546,31 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <translation>&Yeniden Başlat ve Güncelle</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Otomatik başlatmayı kapatamazsınız, çünkü sistem bütününde aktif edildi.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>Güncelleme kanalı değiştirilsin mi?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> - <translation type="unfinished"/> + <translation>Güncelleme kanalı, kurulum için hangi istemci güncellemelerinin sunulacağını belirler. "Kararlı" kanal yalnızca güvenilir kabul edilen yükseltmeleri içerirken "Beta" kanalındaki sürümler daha yeni özellikler ve hata düzeltmeleri içerebilir, ancak henüz tam olarak test edilmemiştir. + +Bunun yalnızca hangi güncelleme kanalından alınacağını seçtiğini ve herhangi bir sürüm indirgeme olmadığını seçtiğini unutmayın. Bu nedenle beta kanalından kararlı kanala geri dönmek genellikle hemen yapılamaz ve bu, şu anda yüklü olan betadan daha yeni kararlı bir sürümü beklemek anlamına gelir.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>Güncelleme kanalını değiştir</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>İptal</translation> </message> @@ -1635,7 +1646,9 @@ Note that this selects only what pool upgrades are taken from, and that there ar <source>Files or folders matching a pattern will not be synchronized. Changes take effect the next time folders are 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>Bir kalıpla eşleşen dosya veya klasörler eşitlenmez. Değişiklikler klasörlerin bir sonraki eşitlenmesinde geçerli olur. + +Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir. Bu, üst veri için kullanışlıdır.</translation> </message> <message> <location filename="../src/gui/ignorelisteditor.cpp" line="125"/> @@ -1710,8 +1723,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/issueswidget.ui" line="147"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> - <translation>Eşleşmemeler mevcut. Nasıl çözüleceğini dokümantasyondan kontrol edin. -</translation> + <translation>Çakışmalar mevcut. Nasıl çözüleceğini dokümantasyondan kontrol edin.</translation> </message> <message> <location filename="../src/gui/issueswidget.ui" line="180"/> @@ -1741,7 +1753,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/issueswidget.cpp" line="126"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> - <translation>Eşleşmemeler mevcut. <a href="%1">Nasıl çözüleceğini dokümantasyondan kontrol edin.</a></translation> + <translation>Çakışmalar mevcut. <a href="%1">Nasıl çözüleceğini dokümantasyondan kontrol edin.</a></translation> </message> </context> <context> @@ -1764,23 +1776,26 @@ Items where deletion is allowed will be deleted if they prevent a directory from <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems. Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space. If enabled, logs will be written to %1</source> - <translation type="unfinished"/> + <translation>İstemci geçici bir klasöre hata ayıklama günlükleri yazabilir. Bu günlükler sorunları teşhis etmek için çok faydalıdır. +Günlük dosyaları büyüyebileceğinden, istemci her eşitleme çalıştırması için yeni bir tane başlatır ve eskilerini sıkıştırır. Çok fazla disk alanı tüketmemek için günlük dosyalarının birkaç saat sonra silinmesinin etkinleştirilmesi de önerilir. +Etkinleştirilirse, günlükler %1 konumuna yazılır.</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="66"/> <source>Enable logging to temporary folder</source> - <translation type="unfinished"/> + <translation>Günlüğü geçici klasöre kaydetmeyi etkinleştir</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="72"/> <source>Delete logs older than %1 hours</source> - <translation type="unfinished"/> + <translation>%1 saatten eski günlükleri sil</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="78"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> - <translation type="unfinished"/> + <translation>Bu ayarlar istemci yeniden başlatmalarında devam eder. +Günlüğe kaydetme komut satırı seçeneklerinin kullanılmasında bu ayarları geçersiz kılacağını unutmayın.</translation> </message> <message> <location filename="../src/gui/logbrowser.cpp" line="85"/> @@ -1832,27 +1847,27 @@ Note that using any logging command line options will override the settings.</so <message> <location filename="../src/gui/updater/ocupdater.cpp" line="441"/> <source>Update Failed</source> - <translation type="unfinished"/> + <translation>Güncelleme Başarısız</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="447"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> - <translation type="unfinished"/> + <translation><p>%1 İstemcisinin yeni bir sürümü mevcut ancak güncelleme başarısız oldu.</p><p><b>%2</b> indirildi. Yüklü sürüm %3.</p></translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="461"/> <source>Ask again later</source> - <translation type="unfinished"/> + <translation>Sonra tekrar deneyin</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="462"/> <source>Restart and update</source> - <translation type="unfinished"/> + <translation>Yeniden başlat ve güncelle</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> <source>Update manually</source> - <translation type="unfinished"/> + <translation>Elle güncelle</translation> </message> </context> <context> @@ -1900,7 +1915,7 @@ Note that using any logging command line options will override the settings.</so <message> <location filename="../src/gui/networksettings.ui" line="176"/> <source>Note: proxy settings have no effects for accounts on localhost</source> - <translation type="unfinished"/> + <translation>Not: Proxy ayarlarının localhost üzerindeki hesaplar için hiçbir etkisi yoktur</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="197"/> @@ -2008,12 +2023,12 @@ Note that using any logging command line options will override the settings.</so <message> <location filename="../src/gui/creds/oauth.cpp" line="122"/> <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> + <translation>OAuth2 yönlendirmesinden boş JSON döndü</translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="127"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> - <translation>Sunucudan gelen JSON okunabilir hale getirilemedi: <br><em>%1</em></translation> + <translation>Sunucudan gelen JSON ayrıştırılamadı: <br><em>%1</em></translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="130"/> @@ -2023,7 +2038,7 @@ Note that using any logging command line options will override the settings.</so <message> <location filename="../src/gui/creds/oauth.cpp" line="134"/> <source><h1>Login Error</h1><p>%1</p></source> - <translation><h1>Sisteme giriş hatası</h1><p>%1</p></translation> + <translation><h1>Sisteme Giriş Hatası</h1><p>%1</p></translation> </message> <message> <location filename="../src/gui/creds/oauth.cpp" line="140"/> @@ -2057,17 +2072,17 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> <source>Downloading %1. Please wait...</source> - <translation type="unfinished"/> + <translation>%1 yükleniyor. Lütfen bekleyin...</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> <source>%1 available. Restart application to start the update.</source> - <translation type="unfinished"/> + <translation>%1 sürümü mevcut. Güncellemeyi başlatmak için uygulamayı yeniden başlatın.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>New %1 available. Please use the system's update tool to install it.</source> - <translation type="unfinished"/> + <translation>Yeni %1 sürümü mevcut. Lütfen kurulum için sistem güncelleştirme aracını kullanın.</translation> </message> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> @@ -2110,17 +2125,17 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/> <source>Use &virtual files instead of downloading content immediately %1</source> - <translation type="unfinished"/> + <translation>İçeriği hemen indirmek yerine sanal dosya sistemini kullan %1</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/> <source>(tech preview)</source> - <translation type="unfinished"/> + <translation>(teknik önizleme)</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/> <source>(experimental)</source> - <translation type="unfinished"/> + <translation>(deneysel)</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/> @@ -2144,7 +2159,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2215,7 +2230,7 @@ for additional privileges during the process.</source> <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="56"/> <source>Copy link to clipboard</source> - <translation>Linki panoya kopyala</translation> + <translation>Bağlantıyı panoya kopyala</translation> </message> </context> <context> @@ -2413,34 +2428,36 @@ Kullanmanız önerilmez.</translation> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/> <source>Enable technical preview feature?</source> - <translation type="unfinished"/> + <translation>Teknik önizleme özelliği etkinleştirilsin mi?</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/> <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu. The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source> - <translation type="unfinished"/> + <translation>"Sanal dosyalar" modu etkinleştirildiğinde, başlangıçta hiçbir dosya indirilmez. Bunun yerine, sunucuda bulunan her dosya için bir sanal dosya oluşturulur. Bir dosya açıldığında içeriği otomatik olarak indirilir. Alternatif olarak, dosyalar içerik menüleri kullanılarak el ile indirilebilir. + +Sanal dosyalar modu, seçici senkronizasyon ile birbirini dışlar. Şu anda seçili olmayan klasörler yalnızca çevrimiçi klasörlere çevrilecek ve seçici senkronizasyon ayarlarınız sıfırlanacaktır.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/> <source>Enable virtual files</source> - <translation type="unfinished"/> + <translation>Sanal dosyaları etkinleştir</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/> <source>Continue to use selective sync</source> - <translation type="unfinished"/> + <translation>Seçmeli eşitlemeyi kullanmaya devam et</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/> <source>Enable experimental feature?</source> - <translation>Deneysel özelliği etkinleştirilsin mi?</translation> + <translation>Deneysel özellik etkinleştirilsin mi?</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Enable experimental placeholder mode</source> - <translation type="unfinished"/> + <translation>Deneysel yer tutucu modunu etkinleştir</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> @@ -2451,7 +2468,13 @@ The virtual files mode is mutually exclusive with selective sync. Currently unse Switching to this mode will abort any currently running synchronization. This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source> - <translation type="unfinished"/> + <translation>"Sanal dosyalar" modu etkinleştirildiğinde, başlangıçta hiçbir dosya indirilmez. Bunun yerine, sunucuda bulunan her dosya için küçük bir "%1" dosyası oluşturulur. İçindekiler bu dosyalar çalıştırılarak veya içerik menüleri kullanılarak indirilebilir. + +Sanal dosyalar modu, seçici eşleme ile beraber çalışır. Şu anda seçili olmayan klasörler yalnızca çevrimiçi sanal klasörlere çevrilecek ve seçici senkronizasyon ayarlarınız sıfırlanacaktır. + +Bu moda geçmek, o anda çalışan eşlemeyi iptal edecektir. + +Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıkan sorunları bildirin.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> @@ -2500,12 +2523,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/discovery.cpp" line="245"/> <source>File names ending with a period are not supported on this file system.</source> - <translation type="unfinished"/> + <translation>Nokta ile biten dosya adları bu dosya sisteminde desteklenmez.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> - <translation type="unfinished"/> + <translation>'%1' karakterini içeren dosya adları bu dosya sisteminde desteklenmiyor.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="259"/> @@ -2520,7 +2543,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/discovery.cpp" line="266"/> <source>Filename contains trailing spaces.</source> - <translation type="unfinished"/> + <translation>Dosya adı sonunda boşluk mevcut.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="269"/> @@ -2540,52 +2563,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> - <translation type="unfinished"/> + <translation>Çakışma: Sunucu sürümü indirildi, yerel kopya yeniden adlandırıldı ve yüklenmedi.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="282"/> <source>The filename cannot be encoded on your file system.</source> - <translation type="unfinished"/> + <translation>Dosya adı dosya sisteminizde görüntülenemeyecek karakterler içeriyor.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename is blacklisted on the server.</source> - <translation type="unfinished"/> + <translation>Dosya adı sunucuda kara listeye alınmıştır.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="338"/> <source>File has extension reserved for virtual files.</source> - <translation type="unfinished"/> + <translation>Dosyada sanal dosyalar için ayrılmış olan uzantı mevcut.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="400"/> <source>size</source> - <translation type="unfinished"/> + <translation>boyut</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="402"/> <source>permissions</source> - <translation type="unfinished"/> + <translation>izinler</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="404"/> <source>etag</source> - <translation type="unfinished"/> + <translation>e-etiket</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="406"/> <source>file id</source> - <translation type="unfinished"/> + <translation>dosya kimliği</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="410"/> <source>server reported no %1</source> - <translation type="unfinished"/> + <translation>sunucu bildirimi no %1</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="1242"/> <source>Moved to invalid target, restoring</source> - <translation type="unfinished"/> + <translation>Geçersiz hedefe taşıma yapıldı, geri yükleniyor</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="1255"/> @@ -2615,12 +2638,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/discovery.cpp" line="1364"/> <source>Error while reading the database</source> - <translation type="unfinished"/> + <translation>Veri tabanını okunurken hata oluştu.</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="1425"/> <source>Server replied with an error while reading directory '%1' : %2</source> - <translation type="unfinished"/> + <translation>Dizin '%1' okunurken sunucu hata cevabı verdi: %2</translation> </message> </context> <context> @@ -2651,7 +2674,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagatedownload.cpp" line="641"/> <source>Download slot finished, but there was no reply!</source> - <translation type="unfinished"/> + <translation>İndirme aralığı tükendi, ancak yanıt gelmedi!</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="694"/> @@ -2745,7 +2768,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagatorjobs.cpp" line="261"/> <source>Error setting pin state</source> - <translation type="unfinished"/> + <translation>Pin durumu ayarlanırken hata oluştu</translation> </message> </context> <context> @@ -2774,7 +2797,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagateremotemove.cpp" line="142"/> <source>Could not rename %1 to %2, error: %3</source> - <translation type="unfinished"/> + <translation>%1 konumu %2 şeklinde yeniden isimlendirilemedi, hata: %3</translation> </message> <message> <location filename="../src/libsync/propagateremotemove.cpp" line="191"/> @@ -2790,7 +2813,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagateremotemove.cpp" line="233"/> <source>Error setting pin state</source> - <translation type="unfinished"/> + <translation>Pin durumu ayarlanırken hata oluştu</translation> </message> </context> <context> @@ -2832,12 +2855,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagateuploadng.cpp" line="76"/> <source>Failed to get zsync byte ranges.</source> - <translation type="unfinished"/> + <translation>Zsync aracından bayt aralıkları alınamadı.</translation> </message> <message> <location filename="../src/libsync/propagateuploadng.cpp" line="634"/> <source>Failed to generate zsync file.</source> - <translation type="unfinished"/> + <translation>Zsync dosyası oluşturulamadı.</translation> </message> <message> <location filename="../src/libsync/propagateuploadng.cpp" line="701"/> @@ -3042,33 +3065,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ayarlar</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>Etkinlik</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>Genel</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>Ağ</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>%1'tan çık</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> - <translation type="unfinished"/> + <translation>%1 çıkmak istediğinizden emin misiniz?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>Hesap</translation> </message> @@ -3151,7 +3174,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.ui" line="220"/> <source>Receive files from others without revealing the contents of the folder.</source> - <translation type="unfinished"/> + <translation>Klasörün içeriğini göstermeden başkalarından dosya alın.</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.ui" line="237"/> @@ -3161,17 +3184,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.ui" line="297"/> <source>Name:</source> - <translation type="unfinished"/> + <translation>Ad:</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.ui" line="304"/> <source>Enter name of new share...</source> - <translation type="unfinished"/> + <translation>Yeni paylaşımın ismini girin...</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.ui" line="311"/> <source>&Create</source> - <translation type="unfinished"/> + <translation>&Oluştur</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.ui" line="364"/> @@ -3214,96 +3237,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Dosya/klasör linkine sahip Herkes erişebilir </translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>&Parola koruması</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Dosya paylaşılamaz, çünkü sizinle paylaşım izni olmaksızın paylaşılmış.</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>Link paylaşma devre dışı bırakıldı</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>Herkese açık bağlantı paylaşımı oluştur</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>Sil</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>Bağlantıyı tarayıcıda aç</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>Linki panoya kopyala</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> - <translation type="unfinished"/> + <translation>Bağlantıyı panoya kopyala (doğrudan indirme)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>Bağlantıyı e-posta ile gönder</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> - <translation type="unfinished"/> + <translation>Bağlantıyı e-postayla gönder (doğrudan indirme)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> - <translation type="unfinished"/> + <translation>Yeni oluştur...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> - <translation type="unfinished"/> + <translation>Seninle %1 paylaştım</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> - <translation type="unfinished"/> + <translation>Paylaşım Bağlantısını Silmeyi Onaylayın</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <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>Paylaşım bağlantısını gerçekten silmek istiyor musun <i>%1</i>?</p><p>Not: Bu işlem geri alınamaz.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>İptal</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>Herkese açık bağlantı</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> - <translation type="unfinished"/> + <translation>Bağlantı paylaşımını sil</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>Lütfen Parola Atayın</translation> </message> @@ -3323,12 +3346,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/shareusergroupwidget.ui" line="108"/> <source><html><head/><body><p>You can direct people to this shared file or folder <a href="private link menu"><span style=" text-decoration: underline; color:#0000ff;">by giving them a private link</span></a>.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p><a href="private link menu"><span style=" text-decoration: underline; color:#0000ff;">Gizli bir bağlantı vererek</span></a> kişileri bu paylaşılan dosyaya veya klasöre yönlendirebilirsiniz.</p></body></html></translation> </message> <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="210"/> <source>The item is not shared with any users or groups</source> - <translation type="unfinished"/> + <translation>Bu öge hiçbir kullanıcı veya grupla paylaşılmıyor</translation> </message> <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="241"/> @@ -3353,7 +3376,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/shareusergroupwidget.cpp" line="343"/> <source>I shared something with you</source> - <translation type="unfinished"/> + <translation>Seninle bir şey paylaştım</translation> </message> </context> <context> @@ -3420,32 +3443,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/socketapi.cpp" line="522"/> <source>Context menu share</source> - <translation type="unfinished"/> + <translation>İçerik menüsü paylaşımı</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="527"/> <source>Context menu share %1</source> - <translation type="unfinished"/> + <translation>İçerik menüsü paylaşımı %1</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="716"/> <source>Confirm deletion</source> - <translation type="unfinished"/> + <translation>Silmeyi onayla</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="718"/> <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source> - <translation type="unfinished"/> + <translation><i>%1</i> dizinini ve tüm içeriğini kalıcı olarak silmek istiyor musunuz?</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="719"/> <source>Do you want to delete the file <i>%1</i> permanently?</source> - <translation type="unfinished"/> + <translation><i>%1</i> dosyasını kalıcı olarak silmek istiyor musunuz?</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="758"/> <source>Select new location...</source> - <translation type="unfinished"/> + <translation>Yeni konum seçin...</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="768"/> @@ -3457,12 +3480,14 @@ This is a new, experimental mode. If you decide to use it, please report any iss <source>Moving file failed: %1</source> - <translation type="unfinished"/> + <translation>Dosya taşınamadı: + +%1</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="776"/> <source>I shared something with you</source> - <translation type="unfinished"/> + <translation>Seninle bir şey paylaştım</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="789"/> @@ -3474,28 +3499,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/gui/socketapi.cpp" line="791"/> <location filename="../src/gui/socketapi.cpp" line="836"/> <source>Copy private link to clipboard</source> - <translation type="unfinished"/> + <translation>Özel bağlantıyı panoya kopyala</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="792"/> <source>Send private link by email...</source> - <translation type="unfinished"/> + <translation>Özel bağlantıyı e-posta ile gönder...</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="818"/> <source>Resharing this file is not allowed</source> - <translation type="unfinished"/> + <translation>Bu dosyanın yeniden paylaşılmasına izin verilmiyor</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="818"/> <source>Resharing this folder is not allowed</source> - <translation type="unfinished"/> + <translation>Bu klasörün yeniden paylaşılmasına izin verilmiyor</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="830"/> <location filename="../src/gui/socketapi.cpp" line="832"/> <source>Copy public link to clipboard</source> - <translation type="unfinished"/> + <translation>Herkese açık bağlantıyı panoya kopyala</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="923"/> @@ -3505,37 +3530,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/socketapi.cpp" line="931"/> <source>Show file versions in browser</source> - <translation type="unfinished"/> + <translation>Dosya sürümlerini tarayıcıda göster</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="954"/> <source>Rename...</source> - <translation type="unfinished"/> + <translation>Yeniden adlandır...</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="957"/> <source>Rename and upload...</source> - <translation type="unfinished"/> + <translation>Yeniden adlandır ve yükle...</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="962"/> <source>Move and rename...</source> - <translation type="unfinished"/> + <translation>Taşı ve yeniden adlandır...</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="965"/> <source>Move, rename and upload...</source> - <translation type="unfinished"/> + <translation>Taşı, yeniden adlandır ve yükle...</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="968"/> <source>Delete local changes</source> - <translation type="unfinished"/> + <translation>Yerel değişiklikleri sil</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="973"/> <source>Move and upload...</source> - <translation type="unfinished"/> + <translation>Taşı ve yükle...</translation> </message> <message> <location filename="../src/gui/socketapi.cpp" line="974"/> @@ -3645,7 +3670,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sslbutton.cpp" line="191"/> <source>Server version: %1</source> - <translation type="unfinished"/> + <translation>Sunucu sürümü: %1</translation> </message> <message> <location filename="../src/gui/sslbutton.cpp" line="205"/> @@ -3660,7 +3685,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sslbutton.cpp" line="244"/> <source>The connection is not secure</source> - <translation type="unfinished"/> + <translation>Bu bağlantı güvenli değil</translation> </message> <message> <location filename="../src/gui/sslbutton.cpp" line="177"/> @@ -3753,7 +3778,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/syncengine.cpp" line="186"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> - <translation type="unfinished"/> + <translation>%1 (daha önceki hatadan ötürü atlandı, %2 içinde tekrar deneniyor)</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="454"/> @@ -3764,32 +3789,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/syncengine.cpp" line="487"/> <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>Yerel eşleme veritabanı açılamıyor veya oluşturulamıyor. Eşleme klasöründe yazma iznine sahip olduğunuzdan emin olun.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="1027"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> - <translation type="unfinished"/> + <translation>Disk alanı az: Boş alanı %1 altına indirecek indirmeler atlandı.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="1034"/> <source>There is insufficient space available on the server for some uploads.</source> - <translation type="unfinished"/> + <translation>Bazı yüklemeler için sunucuda yeterli alan yok.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="373"/> <source>Unresolved conflict.</source> - <translation type="unfinished"/> + <translation>Çözümlenmemiş çakışma mevcut.</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="351"/> <source>Could not update virtual file metadata: %1</source> - <translation type="unfinished"/> + <translation>Sanal dosya üstverileri güncellenemedi: %1</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="503"/> <source>Using virtual files with suffix, but suffix is not set</source> - <translation type="unfinished"/> + <translation>Son ek içeren sanal dosyalar kullanılıyor, ancak henüz son ek ayarlanmadı</translation> </message> <message> <location filename="../src/libsync/syncengine.cpp" line="515"/> @@ -3833,12 +3858,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/theme.cpp" line="343"/> <source><p>Version %2. For more information visit <a href="%3">https://%4</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, and others.</small></p></source> - <translation type="unfinished"/> + <translation><p>Versiyon %2. Daha fazla bilgi için <a href="%3">https://%4</a>adresini ziyaret edin.</p><p>Bilinen sorunlar ve yardım için <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p></small> Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, ve diğerleri.</small></p></translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="350"/> <source><p>Copyright ownCloud GmbH</p></source> - <translation type="unfinished"/> + <translation><p>Telif hakkı ownCloud GmbH</p></translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="351"/> @@ -3869,22 +3894,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagatecommonzsync.cpp" line="186"/> <source>Failed to open input file %1: %2</source> - <translation type="unfinished"/> + <translation>Girdi dosyası açılmasında hata %1: %2</translation> </message> <message> <location filename="../src/libsync/propagatecommonzsync.cpp" line="195"/> <source>Failed to open input file: %1</source> - <translation type="unfinished"/> + <translation>Girdi dosyası açılmasında hata: %1</translation> </message> <message> <location filename="../src/libsync/propagatecommonzsync.cpp" line="208"/> <source>Failed to write block sums:</source> - <translation type="unfinished"/> + <translation>Blok özetleri yazımında hata:</translation> </message> <message> <location filename="../src/libsync/propagatecommonzsync.cpp" line="229"/> <source>Failed to write zsync metadata file:</source> - <translation type="unfinished"/> + <translation>Zsync üstveri dosyası yazılamadı:</translation> </message> </context> <context> @@ -3892,254 +3917,254 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagatecommonzsync.cpp" line="115"/> <source>Unable to parse zsync file.</source> - <translation type="unfinished"/> + <translation>Zsync dosyası ayrıştırılamadı.</translation> </message> <message> <location filename="../src/libsync/propagatecommonzsync.cpp" line="132"/> <source>Unable to open file: %1</source> - <translation type="unfinished"/> + <translation>Dosya açılamadı: %1</translation> </message> </context> <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>Lütfen oturum açın</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>Klasör %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>Yapılandırılmış eşitleme klasörü yok.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>Tarayıcıda aç</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>Giriş yap...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>Çıkış yap</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>Son Değişiklikler</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>Yönetilen Klasörler:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>'%1' klasörünü aç</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>%1'ı tarayıcıda aç</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an 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>%1 hesabındaki sunucu desteklenmeyen %2 sürümünde. Bu istemciyi desteklenmeyen sunucu sürümlerinde kullanmak hem test edilmemiştir hem de tehlikelidir. Kullanmak kendi sorumluluğunuzdadır.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>Bilinmeyen durum</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>Ayarlar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>Ayrıntılar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>Yardım</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>%1'tan çık</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>%1 ile bağlantı kesildi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>Desteklenmeyen Sunucu Sürümü</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>Bağlantı kesildi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> - <translation type="unfinished"/> + <translation>Bazı hesapların bağlantısı kesildi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>Bu hesapların bağlantıları kesildi:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>Hesap %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>Oturum sonlandırıldı</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>Hesap eşitlemesi devre dışı bırakıldı.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> - <translation type="unfinished"/> + <translation>Eşitleme duraklatıldı</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> - <translation type="unfinished"/> + <translation>Çözümlenmemiş çakışma mevcut.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> - <translation type="unfinished"/> + <translation>Eşitleme sırasında hata oluştu</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> - <translation type="unfinished"/> + <translation>Yapılandırılmış eşitleme klasörü yok</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>Tüm klasörleri devam ettir</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>Tüm klasörleri durdur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>Tüm eşitlemeleri devam ettir</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>Eşitlemeyi devam ettir</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>Tüm eşitlemeleri durdur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>Eşitlemeyi durdur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>Tüm hesaplardan çıkış yap</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>Tüm hesaplara giriş yap...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>Yeni hesap...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>%1 hakkında</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>Yakın zamanda eşitlenen öge yok</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>Uzaktaki '%1' için değişiklikler kontrol ediliyor.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>Yereldeki '%1' için değişiklikler kontrol ediliyor.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Eşitlenen %1/%2 (%3 kaldı)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>%2 nin %1 i eşitleniyor</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>Eşitlenen %1 (%2 kaldı)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>%1 eşitleniyor</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>Güncel</translation> </message> @@ -4180,7 +4205,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="301"/> <source>Ask for confirmation before synchroni&zing folders larger than</source> - <translation type="unfinished"/> + <translation>Şundan büyük klasörleri eşlemeden önce onay isteyin:</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/> @@ -4191,7 +4216,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="327"/> <source>Ask for confirmation before synchronizing e&xternal storages</source> - <translation type="unfinished"/> + <translation>Harici depoları eşlemeden önce onay isteyin</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="354"/> @@ -4202,12 +4227,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="394"/> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="397"/> <source><html><head/><body><p>When this option is selected, the wizard will close without synchronizing anything. You can use the &quot;Add Folder Sync Connection&quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Bu seçenek seçildiğinde ayarlama sihirbazı hiçbir şey eşitlemeden kapanır. Hesap ayarlarından yerel ve uzak klasörü eşitlemek için &quot;Klasör Eşleme Bağlantısı Ekle&quot; seçeneğini kullanabilirsiniz</p></body></html></translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="400"/> <source>Manually create folder sync connections </source> - <translation type="unfinished"/> + <translation>El ile klasör eşitleme bağlantıları oluştur</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="150"/> @@ -4227,7 +4252,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="243"/> <source>S&ynchronize everything from server (recommended)</source> - <translation type="unfinished"/> + <translation>Sunucudaki her şeyi eşitle (tavsiye edilir)</translation> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="460"/> @@ -4263,17 +4288,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/> <source>Please switch to your browser to proceed.</source> - <translation type="unfinished"/> + <translation>Devam etmek için lütfen tarayıcınıza geçin.</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>Bağlanırken bir hata oluştu. Lütfen tekrar deneyin.</translation> </message> <message> <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Tarayıcıyı Yeniden Aç</translation> </message> </context> <context> @@ -4292,7 +4317,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> <source>Ser&ver Address</source> - <translation type="unfinished"/> + <translation>Sunucu Adresi</translation> </message> <message> <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> @@ -4457,12 +4482,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/progressdispatcher.cpp" line="33"/> <source>Virtual file created</source> - <translation type="unfinished"/> + <translation>Sanal dosya oluşturuldu</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="35"/> <source>Replaced by virtual file</source> - <translation type="unfinished"/> + <translation>Sanal dosya ile değiştirilmiştir</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="37"/> @@ -4507,7 +4532,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/progressdispatcher.cpp" line="56"/> <source>Updated local metadata</source> - <translation type="unfinished"/> + <translation>Yerel üstveri güncellendi</translation> </message> <message> <location filename="../src/libsync/progressdispatcher.cpp" line="59"/> @@ -4549,7 +4574,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/progressdispatcher.cpp" line="87"/> <source>updating local metadata</source> - <translation type="unfinished"/> + <translation>yerel üstveri güncelleniyor</translation> </message> </context> <context> @@ -4610,17 +4635,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/guiutility.cpp" line="36"/> <source>Could not open browser</source> - <translation type="unfinished"/> + <translation>Tarayıcı açılamadı</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="37"/> <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>%1 bağlantısına gitmek için tarayıcı başlatılırken bir hata oluştu. Herhangi bir varsayılan tarayıcı yapılandırılmamış olabilir.</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="60"/> <source>Could not open email client</source> - <translation>E posta istemcisi açılamadı</translation> + <translation>E-posta istemcisi açılamadı</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="61"/> @@ -4630,33 +4655,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/guiutility.cpp" line="76"/> <source>Always available locally</source> - <translation type="unfinished"/> + <translation>Yerel olarak her zaman kullanılabilir</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="80"/> <source>Some available online only</source> - <translation type="unfinished"/> + <translation>Yalnızca bazıları çevrimiçi kullanılabilir</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="82"/> <location filename="../src/gui/guiutility.cpp" line="84"/> <source>Available online only</source> - <translation type="unfinished"/> + <translation>Sadece çevrimiçi kullanılabilir</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="78"/> <source>Currently available locally</source> - <translation type="unfinished"/> + <translation>Şu anda yerel olarak kullanılabilir</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="91"/> <source>Make always available locally</source> - <translation type="unfinished"/> + <translation>Her zaman yerel olarak erişilebilir yapın</translation> </message> <message> <location filename="../src/gui/guiutility.cpp" line="96"/> <source>Free up local space</source> - <translation type="unfinished"/> + <translation>Yerel kapasite alanında yer açın</translation> </message> </context> </TS>
\ No newline at end of file diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 1fa568820..38247fdbc 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -699,17 +699,17 @@ This action will abort any currently running synchronization.</source> <translation>继续</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="297"/> + <location filename="../src/gui/application.cpp" line="299"/> <source>Error accessing the configuration file</source> <translation>访问配置文件时发生错误</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="298"/> + <location filename="../src/gui/application.cpp" line="300"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>访问配置文件 %1 时发生错误。</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="301"/> + <location filename="../src/gui/application.cpp" line="303"/> <source>Quit ownCloud</source> <translation>退出 ownCloud</translation> </message> @@ -781,8 +781,8 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="467"/> - <location filename="../src/libsync/discoveryphase.cpp" line="489"/> + <location filename="../src/libsync/discoveryphase.cpp" line="468"/> + <location filename="../src/libsync/discoveryphase.cpp" line="490"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>服务器错误: PROPFIND 返回的不是XML格式！</translation> </message> @@ -790,27 +790,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="237"/> + <location filename="../src/libsync/discoveryphase.cpp" line="238"/> <source>Error while opening directory %1</source> <translation>打开目录 %1 时出现错误</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="239"/> + <location filename="../src/libsync/discoveryphase.cpp" line="240"/> <source>Directory not accessible on client, permission denied</source> <translation>无法在客户端上访问目录，没有权限</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="243"/> + <location filename="../src/libsync/discoveryphase.cpp" line="244"/> <source>Directory not found: %1</source> <translation>无法找到目录：%1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="274"/> + <location filename="../src/libsync/discoveryphase.cpp" line="275"/> <source>Filename encoding is not valid</source> <translation>文件名编码无效</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="293"/> + <location filename="../src/libsync/discoveryphase.cpp" line="294"/> <source>Error while reading directory %1</source> <translation>读取目录 %1 时出错</translation> </message> @@ -912,41 +912,41 @@ This action will abort any currently running synchronization.</source> <translation>同步活动</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="806"/> + <location filename="../src/gui/folder.cpp" line="808"/> <source>Could not read system exclude file</source> <translation>无法读取系统排除的文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1054"/> + <location filename="../src/gui/folder.cpp" line="1056"/> <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="1057"/> + <location filename="../src/gui/folder.cpp" line="1059"/> <source>A folder from an external storage has been added. </source> <translation>一个来自外部存储的文件夹已被添加。 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1060"/> <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="1118"/> + <location filename="../src/gui/folder.cpp" line="1120"/> <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="1121"/> + <location filename="../src/gui/folder.cpp" line="1123"/> <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="1132"/> + <location filename="../src/gui/folder.cpp" line="1134"/> <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). @@ -955,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="1207"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <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. @@ -966,7 +966,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a 如果您决定删除这些文件，它们将不再可用，除非您是其所有者。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1214"/> <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> @@ -975,17 +975,17 @@ 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="1216"/> + <location filename="../src/gui/folder.cpp" line="1218"/> <source>Remove All Files?</source> <translation>删除所有文件？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1219"/> + <location filename="../src/gui/folder.cpp" line="1221"/> <source>Remove all files</source> <translation>删除所有文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1222"/> <source>Keep files</source> <translation>保持所有文件</translation> </message> @@ -1161,107 +1161,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>有未解决的冲突。点击显示详细信息。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="899"/> <source>Checking for changes in remote '%1'</source> <translation>检查远端文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> <source>Checking for changes in local '%1'</source> <translation>检查本地文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="909"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="910"/> <source>Reconciling changes</source> <translation>调整变更</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="944"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="945"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="947"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="972"/> <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="973"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="974"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>, </source> <translation>，</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <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="979"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="980"/> <source>↓ %1/s</source> <translation>↓ %1/秒</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="990"/> <source>↑ %1/s</source> <translation>↑ %1/秒</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="987"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <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="995"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="996"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <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="1024"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/> <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="1031"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1032"/> <source>file %1 of %2</source> <translation>第 %1 个文件，共 %2 个</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1078"/> <source>Waiting...</source> <translation>请稍等...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>等待 %n 个其他文件(文件夹)</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1086"/> <source>Preparing to sync...</source> <translation>准备同步...</translation> </message> @@ -1285,12 +1285,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="572"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>添加同步文件夹</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="574"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>添加同步连接</translation> </message> @@ -1360,21 +1360,26 @@ If this was an accident and you decide to keep your files, they will be re-synce <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>你已经在同步 <i>%1</i>，<i>%2</i> 是它的一个子文件夹。</translation> </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="449"/> + <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="488"/> <source>Use virtual files instead of downloading content immediately %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(tech preview)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="487"/> + <location filename="../src/gui/folderwizard.cpp" line="489"/> <source>(experimental)</source> <translation type="unfinished"/> </message> @@ -1533,29 +1538,29 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>重启并更新 (&R)</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="58"/> + <location filename="../src/gui/generalsettings.cpp" line="279"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="189"/> <source>Change update channel?</source> <translation>更改升级渠道?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="190"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="203"/> <source>Change update channel</source> <translation>更改升级渠道</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="204"/> <source>Cancel</source> <translation>取消</translation> </message> @@ -2139,7 +2144,7 @@ for additional privileges during the process.</source> </message> <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="351"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="384"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="386"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -3036,33 +3041,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>设置</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="114"/> + <location filename="../src/gui/settingsdialog.cpp" line="107"/> <source>Activity</source> <translation>动态</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="123"/> + <location filename="../src/gui/settingsdialog.cpp" line="116"/> <source>General</source> <translation>常规</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="130"/> + <location filename="../src/gui/settingsdialog.cpp" line="123"/> <source>Network</source> <translation>网络</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="140"/> - <location filename="../src/gui/settingsdialog.cpp" line="143"/> + <location filename="../src/gui/settingsdialog.cpp" line="133"/> + <location filename="../src/gui/settingsdialog.cpp" line="136"/> <source>Quit %1</source> <translation>退出 %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="144"/> + <location filename="../src/gui/settingsdialog.cpp" line="137"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="257"/> + <location filename="../src/gui/settingsdialog.cpp" line="248"/> <source>Account</source> <translation>账户</translation> </message> @@ -3150,7 +3155,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/sharelinkwidget.ui" line="237"/> <source>Download / View / Edit</source> - <translation type="unfinished"/> + <translation>下载 / 查看 / 编辑</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.ui" line="297"/> @@ -3208,96 +3213,96 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>任何查看此链接的人都可以访问文件、文件夹</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="119"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="343"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="118"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="353"/> <source>P&assword protect</source> <translation>密码保护(&a)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="97"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="96"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>未分配共享权限，无法共享文件。</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="94"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="93"/> <source>Link shares have been disabled</source> <translation>分享链接已被关闭</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="108"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="107"/> <source>Create public link share</source> <translation>创建公共分享链接</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="170"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="582"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> <source>Delete</source> <translation>删除</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="163"/> <source>Open link in browser</source> <translation>在浏览器中打来链接</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="164"/> <source>Copy link to clipboard</source> <translation>复制链接到剪贴板</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="165"/> <source>Copy link to clipboard (direct download)</source> <translation>复制链接到剪贴板 (直接下载)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="166"/> <source>Send link by email</source> <translation>通过邮件发送链接</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="169"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="167"/> <source>Send link by email (direct download)</source> <translation>通过电子邮件发送链接 (直接下载)</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="287"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="285"/> <source>Create new...</source> <translation>创造新的....</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="561"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> <source>I shared %1 with you</source> <translation>我向你分享了 %1 </translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="575"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> <source>Confirm Link Share Deletion</source> <translation>确认删除分享链接</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="576"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>你真的想删除一个公共分享链接 <i>%1</i>?</p><p>提示：这个操作不可逆.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="583"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="63"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="599"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> <source>Public link</source> <translation>公开链接</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="271"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="269"/> <source>Delete link share</source> <translation>删除链接分享</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="351"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="529"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> <source>Please Set Password</source> <translation>请设置密码</translation> </message> @@ -3899,243 +3904,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="268"/> + <location filename="../src/gui/owncloudgui.cpp" line="269"/> <source>Please sign in</source> <translation>请登录</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <location filename="../src/gui/owncloudgui.cpp" line="315"/> <source>Folder %1: %2</source> <translation>文件夹 %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="332"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>There are no sync folders configured.</source> <translation>没有已配置的同步文件夹。</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="341"/> + <location filename="../src/gui/owncloudgui.cpp" line="342"/> <source>Open in browser</source> <translation>在浏览器中打开</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="390"/> - <location filename="../src/gui/owncloudgui.cpp" line="708"/> - <location filename="../src/gui/owncloudgui.cpp" line="805"/> + <location filename="../src/gui/owncloudgui.cpp" line="391"/> + <location filename="../src/gui/owncloudgui.cpp" line="709"/> + <location filename="../src/gui/owncloudgui.cpp" line="806"/> <source>Log in...</source> <translation>登录</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="394"/> - <location filename="../src/gui/owncloudgui.cpp" line="700"/> - <location filename="../src/gui/owncloudgui.cpp" line="807"/> + <location filename="../src/gui/owncloudgui.cpp" line="395"/> + <location filename="../src/gui/owncloudgui.cpp" line="701"/> + <location filename="../src/gui/owncloudgui.cpp" line="808"/> <source>Log out</source> <translation>注销</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="495"/> + <location filename="../src/gui/owncloudgui.cpp" line="496"/> <source>Recent Changes</source> <translation>最近修改</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="368"/> + <location filename="../src/gui/owncloudgui.cpp" line="369"/> <source>Managed Folders:</source> <translation>管理的文件夹：</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="371"/> + <location filename="../src/gui/owncloudgui.cpp" line="372"/> <source>Open folder '%1'</source> <translation>打开文件夹“%1”</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="343"/> + <location filename="../src/gui/owncloudgui.cpp" line="344"/> <source>Open %1 in browser</source> <translation>在浏览器中打开%1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="200"/> + <location filename="../src/gui/owncloudgui.cpp" line="201"/> <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source> <translation>账户 %1 的服务器运行着不受支持的版本 %2。使用该客户端未支持的服务器版本未经测试并且可能存在潜在危险。继续操作需要自行承担风险。</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Unknown status</source> <translation>未知状态</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="790"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Settings...</source> <translation>设置...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="792"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Details...</source> <translation>细节...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="798"/> + <location filename="../src/gui/owncloudgui.cpp" line="799"/> <source>Help</source> <translation>帮助</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="803"/> <source>Quit %1</source> <translation>退出 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="249"/> + <location filename="../src/gui/owncloudgui.cpp" line="250"/> <source>Disconnected from %1</source> <translation>已从服务器断开 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="199"/> + <location filename="../src/gui/owncloudgui.cpp" line="200"/> <source>Unsupported Server Version</source> <translation>不支持的服务器版本</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="239"/> + <location filename="../src/gui/owncloudgui.cpp" line="240"/> <source>Disconnected</source> <translation>连接已断开</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="241"/> + <location filename="../src/gui/owncloudgui.cpp" line="242"/> <source>Disconnected from some accounts</source> <translation>与一些账号断开连接</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Disconnected from accounts:</source> <translation>已断开账户: </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="254"/> + <location filename="../src/gui/owncloudgui.cpp" line="255"/> <source>Account %1: %2</source> <translation>账户 %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="269"/> + <location filename="../src/gui/owncloudgui.cpp" line="270"/> <source>Signed out</source> <translation>已退出</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="273"/> + <location filename="../src/gui/owncloudgui.cpp" line="274"/> <source>Account synchronization is disabled</source> <translation>帐户同步被禁用</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="274"/> - <location filename="../src/gui/owncloudgui.cpp" line="327"/> + <location filename="../src/gui/owncloudgui.cpp" line="275"/> + <location filename="../src/gui/owncloudgui.cpp" line="328"/> <source>Synchronization is paused</source> <translation>同步操作被暂停</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>Unresolved conflicts</source> <translation>尚未解决的冲突</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="329"/> + <location filename="../src/gui/owncloudgui.cpp" line="330"/> <source>Error during synchronization</source> <translation>同步中出错</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="334"/> <source>No sync folders configured</source> <translation>未设置同步文件夹</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="379"/> + <location filename="../src/gui/owncloudgui.cpp" line="380"/> <source>Unpause all folders</source> <translation>解除暂停所有文件夹</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="384"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> <source>Pause all folders</source> <translation>暂停所有文件夹</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="680"/> <source>Unpause all synchronization</source> <translation>解除暂停所有同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="681"/> + <location filename="../src/gui/owncloudgui.cpp" line="682"/> <source>Unpause synchronization</source> <translation>解除暂停同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="689"/> + <location filename="../src/gui/owncloudgui.cpp" line="690"/> <source>Pause all synchronization</source> <translation>暂停所有同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="691"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Pause synchronization</source> <translation>暂停同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="698"/> + <location filename="../src/gui/owncloudgui.cpp" line="699"/> <source>Log out of all accounts</source> <translation>注销所有账户</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="706"/> + <location filename="../src/gui/owncloudgui.cpp" line="707"/> <source>Log in to all accounts...</source> <translation>登录所有账户</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="792"/> <source>New account...</source> <translation>新账号……</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> - <location filename="../src/gui/owncloudgui.cpp" line="1155"/> + <location filename="../src/gui/owncloudgui.cpp" line="801"/> + <location filename="../src/gui/owncloudgui.cpp" line="1156"/> <source>About %1</source> <translation>关于%1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="833"/> + <location filename="../src/gui/owncloudgui.cpp" line="834"/> <source>No items synced recently</source> <translation>近期没有项目被同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="855"/> + <location filename="../src/gui/owncloudgui.cpp" line="856"/> <source>Checking for changes in remote '%1'</source> <translation>检查远端文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="858"/> + <location filename="../src/gui/owncloudgui.cpp" line="859"/> <source>Checking for changes in local '%1'</source> <translation>检查本地文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>同步 %2 中的 %1 (剩余 %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="878"/> + <location filename="../src/gui/owncloudgui.cpp" line="879"/> <source>Syncing %1 of %2</source> <translation>正在同步 %1，共 %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="887"/> + <location filename="../src/gui/owncloudgui.cpp" line="888"/> <source>Syncing %1 (%2 left)</source> <translation>同步 %1 (剩余 %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="890"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>Syncing %1</source> <translation>正在同步 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="908"/> + <location filename="../src/gui/owncloudgui.cpp" line="909"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="325"/> <source>Up to date</source> <translation>更新</translation> </message> |