Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannah von Reth <hannah.vonreth@owncloud.com>2022-04-29 15:40:21 +0300
committerHannah von Reth <hannah.vonreth@owncloud.com>2022-04-29 15:40:21 +0300
commite27b973ecbd83ef910af9b0251781cb0f4006782 (patch)
treeeb925bf80a872f52e87b56c3193fb72eea29a199
parent1a1b9fe27871eef12add7f1ffab511b263e83c7c (diff)
parentca7f788b1ca68ad3ea8062c3f3e537793df89b93 (diff)
Merge remote-tracking branch 'origin/2.10'
-rw-r--r--.drone.star47
-rw-r--r--changelog/unreleased/95715
-rw-r--r--changelog/unreleased/96005
-rw-r--r--src/gui/folder.cpp23
-rw-r--r--src/gui/folder.h13
-rw-r--r--src/gui/folderstatusmodel.cpp3
-rw-r--r--src/gui/ignorelisteditor.cpp10
-rw-r--r--src/gui/syncrunfilelog.cpp72
-rw-r--r--src/gui/syncrunfilelog.h2
-rw-r--r--test/gui/shared/scripts/bdd_hooks.py11
-rw-r--r--test/gui/shared/scripts/pageObjects/Activity.py10
-rw-r--r--test/gui/shared/steps/steps.py48
-rw-r--r--test/gui/tst_syncing/test.feature61
-rw-r--r--translations/client_ar.ts68
-rw-r--r--translations/client_bg_BG.ts68
-rw-r--r--translations/client_cs.ts68
-rw-r--r--translations/client_de-informal.ts68
-rw-r--r--translations/client_de.ts68
-rw-r--r--translations/client_de_AT.ts68
-rw-r--r--translations/client_de_CH.ts454
-rw-r--r--translations/client_el.ts68
-rw-r--r--translations/client_en.ts68
-rw-r--r--translations/client_en_GB.ts68
-rw-r--r--translations/client_es.ts68
-rw-r--r--translations/client_fr.ts108
-rw-r--r--translations/client_gl.ts68
-rw-r--r--translations/client_he.ts90
-rw-r--r--translations/client_it.ts68
-rw-r--r--translations/client_ko.ts68
-rw-r--r--translations/client_nl.ts68
-rw-r--r--translations/client_pt_BR.ts80
-rw-r--r--translations/client_ru.ts68
-rw-r--r--translations/client_sq.ts68
-rw-r--r--translations/client_th.ts70
-rw-r--r--translations/client_tr.ts68
-rw-r--r--translations/client_zh_CN.ts344
-rw-r--r--translations/client_zh_TW.ts68
37 files changed, 1455 insertions, 1225 deletions
diff --git a/.drone.star b/.drone.star
index 217287400..3552b242b 100644
--- a/.drone.star
+++ b/.drone.star
@@ -22,7 +22,7 @@ OC_CI_DRONE_CANCEL_PREVIOUS_BUILDS = "owncloudci/drone-cancel-previous-builds"
OC_CI_PHP = "owncloudci/php:%s"
OC_CI_SQUISH = "owncloudci/squish:6.7-20220106-1008-qt515x-linux64"
OC_CI_TRANSIFEX = "owncloudci/transifex:latest"
-OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.4.0"
+OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.5.0"
OC_UBUNTU = "owncloud/ubuntu:20.04"
PLUGINS_GIT_ACTION = "plugins/git-action:1"
PLUGINS_S3 = "plugins/s3"
@@ -30,6 +30,7 @@ PLUGINS_SLACK = "plugins/slack"
PYTHON = "python"
THEGEEKLAB_DRONE_GITHUB_COMMENT = "thegeeklab/drone-github-comment:1"
TOOLHIPPIE_CALENS = "toolhippie/calens:latest"
+OC_CI_DRONE_SKIP_PIPELINE = "owncloudci/drone-skip-pipeline"
dir = {
"base": "/drone",
@@ -178,7 +179,7 @@ def build_and_test_client(ctx, c_compiler, cxx_compiler, build_type, generator,
"os": "linux",
"arch": "amd64",
},
- "steps": [
+ "steps": skipIfUnchanged(ctx, "unit-tests") + [
{
"name": "submodules",
"image": DOCKER_GIT,
@@ -224,7 +225,7 @@ def gui_tests(ctx, trigger = {}, depends_on = [], filterTags = [], version = "da
"os": "linux",
"arch": "amd64",
},
- "steps": [
+ "steps": skipIfUnchanged(ctx, "gui-tests") + [
{
"name": "submodules",
"image": DOCKER_GIT,
@@ -688,3 +689,43 @@ def cancelPreviousBuilds():
],
},
}
+
+def skipIfUnchanged(ctx, type):
+ if ("full-ci" in ctx.build.title.lower()):
+ return []
+
+ base = [
+ "^.github/.*",
+ "^.vscode/.*",
+ "^changelog/.*",
+ "README.md",
+ ".gitignore",
+ "CHANGELOG.md",
+ "CONTRIBUTING.md",
+ "COPYING",
+ "COPYING.documentation",
+ ]
+
+ skip = []
+ if type == "unit-tests":
+ skip = base + [
+ "^test/gui/.*",
+ ]
+
+ if type == "gui-tests":
+ skip = base + [
+ "^test/([^g]|g[^u]|gu[^i]).*",
+ ]
+
+ return [{
+ "name": "skip-if-unchanged",
+ "image": OC_CI_DRONE_SKIP_PIPELINE,
+ "settings": {
+ "ALLOW_SKIP_CHANGED": skip,
+ },
+ "when": {
+ "event": [
+ "pull_request",
+ ],
+ },
+ }]
diff --git a/changelog/unreleased/9571 b/changelog/unreleased/9571
new file mode 100644
index 000000000..d39902b83
--- /dev/null
+++ b/changelog/unreleased/9571
@@ -0,0 +1,5 @@
+Bugfix: Use UTF-8 for .owncloudsync.log
+
+We fixed a bug where unicode file names were not correctly displayed in .owncloudsync.log.
+
+https://github.com/owncloud/client/pull/9571
diff --git a/changelog/unreleased/9600 b/changelog/unreleased/9600
new file mode 100644
index 000000000..21d8fca2b
--- /dev/null
+++ b/changelog/unreleased/9600
@@ -0,0 +1,5 @@
+Bugfix: Crash when interacting with a folder in an error state
+
+We fixed a crash wher using the context menu on a folder that encountered an error and was not using virutal files.
+
+https://github.com/owncloud/client/issues/9600
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 148399879..6f34cee2c 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -629,6 +629,7 @@ int Folder::slotWipeErrorBlacklist()
void Folder::slotWatchedPathChanged(const QString &path, ChangeReason reason)
{
+ Q_ASSERT(isReady());
if (!FileSystem::isChildPathOf(path, this->path())) {
qCDebug(lcFolder) << "Changed path is not contained in folder, ignoring:" << path;
return;
@@ -839,22 +840,25 @@ void Folder::removeFromSettings() const
bool Folder::isFileExcludedAbsolute(const QString &fullPath) const
{
+ if (!_engine) {
+ return true;
+ }
return _engine->excludedFiles().isExcluded(fullPath, path(), _definition.ignoreHiddenFiles);
}
bool Folder::isFileExcludedRelative(const QString &relativePath) const
{
- return _engine->excludedFiles().isExcluded(path() + relativePath, path(), _definition.ignoreHiddenFiles);
+ return isFileExcludedAbsolute(path() + relativePath);
}
void Folder::slotTerminateSync()
{
- qCInfo(lcFolder) << "folder " << path() << " Terminating!";
-
- if (_engine->isSyncRunning()) {
- _engine->abort();
-
- setSyncState(SyncResult::SyncAbortRequested);
+ if (isReady()) {
+ qCInfo(lcFolder) << "folder " << path() << " Terminating!";
+ if (_engine->isSyncRunning()) {
+ _engine->abort();
+ setSyncState(SyncResult::SyncAbortRequested);
+ }
}
}
@@ -905,6 +909,9 @@ void Folder::wipeForRemoval()
bool Folder::reloadExcludes()
{
+ if (!_engine) {
+ return true;
+ }
return _engine->excludedFiles().reloadExcludeFiles();
}
@@ -970,6 +977,7 @@ void Folder::startSync()
void Folder::setDirtyNetworkLimits()
{
+ Q_ASSERT(isReady());
ConfigFile cfg;
int downloadLimit = -75; // 75%
int useDownLimit = cfg.useDownloadLimit();
@@ -1005,6 +1013,7 @@ void Folder::slotSyncStarted()
void Folder::slotSyncFinished(bool success)
{
+ Q_ASSERT(isReady());
qCInfo(lcFolder) << "Client version" << Theme::instance()->aboutVersions(Theme::VersionFormat::OneLiner);
bool syncError = !_syncResult.errorStrings().isEmpty();
diff --git a/src/gui/folder.h b/src/gui/folder.h
index 712d3921c..f151cb235 100644
--- a/src/gui/folder.h
+++ b/src/gui/folder.h
@@ -257,9 +257,16 @@ public:
bool ignoreHiddenFiles();
void setIgnoreHiddenFiles(bool ignore);
- // Used by the Socket API
- SyncJournalDb *journalDb() { return &_journal; }
- SyncEngine &syncEngine() { return *_engine; }
+ // TODO: don't expose
+ SyncJournalDb *journalDb()
+ {
+ return &_journal;
+ }
+ // TODO: don't expose
+ SyncEngine &syncEngine()
+ {
+ return *_engine;
+ }
Vfs &vfs()
{
OC_ENFORCE(_vfs);
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index ff2062eb1..916c6b9b2 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -564,6 +564,9 @@ bool FolderStatusModel::canFetchMore(const QModelIndex &parent) const
void FolderStatusModel::fetchMore(const QModelIndex &parent)
{
+ if (!data(parent, FolderStatusDelegate::IsReady).toBool()) {
+ return;
+ }
auto info = infoForIndex(parent);
if (!info || info->_fetched || info->_fetchingJob)
diff --git a/src/gui/ignorelisteditor.cpp b/src/gui/ignorelisteditor.cpp
index dd030dab7..bd2cf98a9 100644
--- a/src/gui/ignorelisteditor.cpp
+++ b/src/gui/ignorelisteditor.cpp
@@ -120,10 +120,12 @@ void IgnoreListEditor::slotUpdateLocalIgnoreList()
// Otherwise we would not download the files/directories that are no longer
// ignored (because the remote etag did not change) (issue #3172)
for (auto *folder : folderMan->folders()) {
- folder->journalDb()->forceRemoteDiscoveryNextSync();
- folder->reloadExcludes();
- folder->slotNextSyncFullLocalDiscovery();
- folderMan->scheduleFolder(folder);
+ if (folder->isReady()) {
+ folder->journalDb()->forceRemoteDiscoveryNextSync();
+ folder->reloadExcludes();
+ folder->slotNextSyncFullLocalDiscovery();
+ folderMan->scheduleFolder(folder);
+ }
}
}
diff --git a/src/gui/syncrunfilelog.cpp b/src/gui/syncrunfilelog.cpp
index 496c8d892..220c46e49 100644
--- a/src/gui/syncrunfilelog.cpp
+++ b/src/gui/syncrunfilelog.cpp
@@ -51,15 +51,19 @@ void SyncRunFileLog::start(const QString &folderPath)
QFile::rename(filename, newFilename);
}
_file.reset(new QFile(filename));
-
_file->open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text);
- _out.reset(new QDebug(_file.data()));
- _out->noquote();
+
+
+ // we use a text stream to ensure the encoding is ok
+ // when outputting info, we use QDebug to ensure we can use the debug operators
+ _out.reset(new QTextStream(_file.data()));
+ _out->setCodec("UTF-8");
if (!exists) {
// We are creating a new file, add the note.
- *_out << "# timestamp | duration | file | instruction | dir | modtime | etag | "
+ *_out << "Log for:" << folderPath << endl
+ << "# timestamp | duration | file | instruction | dir | modtime | etag | "
"size | fileId | status | errorString | http result code | "
"other size | other modtime | X-Request-ID"
<< endl;
@@ -81,38 +85,50 @@ void SyncRunFileLog::logItem(const SyncFileItem &item)
return;
}
const QChar L = QLatin1Char('|');
- *_out << dateTimeStr(QDateTime::fromString(QString::fromUtf8(item._responseTimeStamp), Qt::RFC2822Date)) << L
- << ((item._instruction != CSYNC_INSTRUCTION_RENAME) ? item.destination() : item._file + QStringLiteral(" -> ") + item._renameTarget) << L
- << item._instruction << L
- << item._direction << L
- << L
- << item._modtime << L
- << item._etag << L
- << item._size << L
- << item._fileId << L
- << item._status << L
- << item._errorString << L
- << item._httpErrorCode << L
- << item._previousSize << L
- << item._previousModtime << L
- << item._requestId << L
- << endl;
+ QString tmp;
+ {
+ QDebug(&tmp).noquote() << dateTimeStr(QDateTime::fromString(QString::fromUtf8(item._responseTimeStamp), Qt::RFC2822Date)) << L
+ << ((item._instruction != CSYNC_INSTRUCTION_RENAME) ? item.destination() : item._file + QStringLiteral(" -> ") + item._renameTarget) << L
+ << item._instruction << L
+ << item._direction << L
+ << L
+ << item._modtime << L
+ << item._etag << L
+ << item._size << L
+ << item._fileId << L
+ << item._status << L
+ << item._errorString << L
+ << item._httpErrorCode << L
+ << item._previousSize << L
+ << item._previousModtime << L
+ << item._requestId << L
+ << endl;
+ }
+ *_out << tmp;
}
void SyncRunFileLog::logLap(const QString &name)
{
- *_out << "#=#=#=#=#" << name << dateTimeStr()
- << "(last step:" << _lapDuration.restart() << "msec"
- << ", total:" << _totalDuration.elapsed() << "msec)"
- << endl;
+ QString tmp;
+ {
+ QDebug(&tmp).noquote() << "#=#=#=#=#" << name << dateTimeStr()
+ << "(last step:" << _lapDuration.restart() << "msec"
+ << ", total:" << _totalDuration.elapsed() << "msec)"
+ << endl;
+ }
+ *_out << tmp;
}
void SyncRunFileLog::finish()
{
- *_out << "#=#=#=# Syncrun finished" << dateTimeStr()
- << "(last step:" << _lapDuration.elapsed() << "msec"
- << ", total:" << _totalDuration.elapsed() << "msec)"
- << endl;
+ QString tmp;
+ {
+ QDebug(&tmp).noquote() << "#=#=#=# Syncrun finished" << dateTimeStr()
+ << "(last step:" << _lapDuration.elapsed() << "msec"
+ << ", total:" << _totalDuration.elapsed() << "msec)"
+ << endl;
+ }
+ *_out << tmp;
_file->close();
}
}
diff --git a/src/gui/syncrunfilelog.h b/src/gui/syncrunfilelog.h
index 8a5fb0e1d..d4496a891 100644
--- a/src/gui/syncrunfilelog.h
+++ b/src/gui/syncrunfilelog.h
@@ -43,7 +43,7 @@ private:
QScopedPointer<QFile> _file;
QElapsedTimer _totalDuration;
QElapsedTimer _lapDuration;
- QScopedPointer<QDebug> _out;
+ QScopedPointer<QTextStream> _out;
};
}
diff --git a/test/gui/shared/scripts/bdd_hooks.py b/test/gui/shared/scripts/bdd_hooks.py
index bcdf2c1a4..b8e8e490c 100644
--- a/test/gui/shared/scripts/bdd_hooks.py
+++ b/test/gui/shared/scripts/bdd_hooks.py
@@ -16,6 +16,7 @@
# See the section 'Performing Actions During Test Execution Via Hooks' in the Squish
# manual for a complete reference of the available API.
import shutil
+from tempfile import gettempdir
import urllib.request
import os
import builtins
@@ -34,18 +35,19 @@ def hook(context):
'middlewareUrl': 'MIDDLEWARE_URL',
'clientConfigFile': 'CLIENT_LOG_FILE',
'clientRootSyncPath': 'CLIENT_ROOT_SYNC_PATH',
+ 'tempFolderPath': 'TEMP_FOLDER_PATH',
}
DEFAULT_CONFIG = {
'localBackendUrl': 'https://localhost:9200/',
'secureLocalBackendUrl': 'https://localhost:9200/',
- 'maxSyncTimeout': 10,
+ 'maxSyncTimeout': 60,
'minSyncTimeout': 5,
'middlewareUrl': 'http://localhost:3000/',
'clientConfigFile': '-',
'clientRootSyncPath': '/tmp/client-bdd/',
+ 'tempFolderPath': gettempdir(),
}
-
# read configs from environment variables
context.userData = {}
for key, value in CONFIG_ENV_MAP.items():
@@ -67,7 +69,7 @@ def hook(context):
context.userData[key] = DEFAULT_CONFIG[key]
elif key == 'maxSyncTimeout' or key == 'minSyncTimeout':
context.userData[key] = builtins.int(value)
- elif key == 'clientRootSyncPath':
+ elif key == 'clientRootSyncPath' or 'tempFolderPath':
# make sure there is always one trailing slash
context.userData[key] = value.rstrip('/') + '/'
@@ -79,6 +81,9 @@ def hook(context):
if not os.path.exists(context.userData['clientRootSyncPath']):
os.makedirs(context.userData['clientRootSyncPath'])
+ if not os.path.exists(context.userData['tempFolderPath']):
+ os.makedirs(context.userData['tempFolderPath'])
+
req = urllib.request.Request(
os.path.join(context.userData['middlewareUrl'], 'init'),
headers={"Content-Type": "application/json"},
diff --git a/test/gui/shared/scripts/pageObjects/Activity.py b/test/gui/shared/scripts/pageObjects/Activity.py
index 518fa7b14..136605c84 100644
--- a/test/gui/shared/scripts/pageObjects/Activity.py
+++ b/test/gui/shared/scripts/pageObjects/Activity.py
@@ -79,3 +79,13 @@ class Activity:
"type": "QModelIndex",
}
)
+
+ def checkAtLeastABlacklistedFile(self):
+ squish.waitForObjectExists(
+ {
+ "column": 6,
+ "container": names.oCC_IssuesWidget_tableView_QTableView,
+ "text": "Blacklisted",
+ "type": "QModelIndex",
+ }
+ )
diff --git a/test/gui/shared/steps/steps.py b/test/gui/shared/steps/steps.py
index 93ded9da8..fe7dc32ee 100644
--- a/test/gui/shared/steps/steps.py
+++ b/test/gui/shared/steps/steps.py
@@ -8,6 +8,7 @@ import re
import urllib.request
import json
import requests
+import builtins
import shutil
from objectmaphelper import RegularExpression
@@ -484,10 +485,14 @@ def step(context, username, foldername):
createFolder(context, foldername, username)
-def createFolder(context, foldername, username=None):
+# To create folders in a temporary directory, we set isTempFolder True
+# And if isTempFolder is True, the createFolder function create folders in tempFolderPath
+def createFolder(context, foldername, username=None, isTempFolder=False):
syncPath = None
- if username:
+ if username and not isTempFolder:
syncPath = getUserSyncPath(context, username)
+ elif isTempFolder:
+ syncPath = context.userData['tempFolderPath']
else:
syncPath = context.userData['currentUserSyncPath']
path = join(syncPath, foldername)
@@ -500,6 +505,21 @@ def renameFileFolder(context, source, destination):
rename(source, destination)
+@When('user "|any|" creates a file "|any|" with size "|any|" inside the sync folder')
+def step(context, username, filename, filesize):
+ createFileWithSize(context, filename, filesize)
+
+
+def createFileWithSize(context, filename, filesize, isTempFolder=False):
+ if isTempFolder:
+ path = context.userData['tempFolderPath']
+ else:
+ path = context.userData['currentUserSyncPath']
+ file = join(path, filename)
+ cmd = "truncate -s {filesize} {file}".format(filesize=filesize, file=file)
+ os.system(cmd)
+
+
@When('the user copies the folder "|any|" to "|any|"')
def step(context, sourceFolder, destinationFolder):
source_dir = join(context.userData['currentUserSyncPath'], sourceFolder)
@@ -688,6 +708,12 @@ def step(context, filename):
activity.checkBlackListedFileExist(filename)
+@When('the user waits until at least a file is blacklisted')
+def step(context):
+ activity = Activity()
+ activity.checkAtLeastABlacklistedFile()
+
+
@When('the user selects "|any|" tab in the activity')
def step(context, tabName):
activity = Activity()
@@ -1419,3 +1445,21 @@ def step(context, username):
filename = syncPath + row[0]
f = open(join(syncPath, filename), "w")
f.close()
+
+
+@Given(
+ 'the user has created a folder "|any|" with "|any|" files each of size "|any|" bytes in temp folder'
+)
+def step(context, foldername, filenumber, filesize):
+ createFolder(context, foldername, isTempFolder=True)
+ filesize = builtins.int(filesize)
+ for i in range(0, builtins.int(filenumber)):
+ filename = f"file{i}.txt"
+ createFileWithSize(context, join(foldername, filename), filesize, True)
+
+
+@When('user "|any|" moves folder "|any|" from the temp folder into the sync folder')
+def step(context, username, foldername):
+ source_dir = join(context.userData['tempFolderPath'], foldername)
+ destination_dir = getUserSyncPath(context, username)
+ shutil.move(source_dir, destination_dir)
diff --git a/test/gui/tst_syncing/test.feature b/test/gui/tst_syncing/test.feature
index 3e32e59d5..e733019e6 100644
--- a/test/gui/tst_syncing/test.feature
+++ b/test/gui/tst_syncing/test.feature
@@ -327,4 +327,63 @@ Feature: Syncing files
And as "Alice" file "testavatar.jpeg" should exist on the server
And as "Alice" file "testaudio.mp3" should exist on the server
And as "Alice" file "test_video.mp4" should exist on the server
- And as "Alice" file "simple.txt" should exist on the server \ No newline at end of file
+ And as "Alice" file "simple.txt" should exist on the server
+
+
+ Scenario Outline: File with long name can be synced
+ Given user "Alice" has set up a client with default settings
+ When user "Alice" creates a file "<filename>" with the following content inside the sync folder
+ """
+ test content
+ """
+ And the user waits for file "<filename>" to be synced
+ Then as "Alice" file "<filename>" should exist on the server
+ Examples:
+ | filename |
+ | thisIsAVeryLongFileNameToCheckThatItWorks-thisIsAVeryLongFileNameToCheckThatItWorks-thisIsAVeryLongFileNameToCheckThatItWorks-thisIsAVeryLongFileNameToCheckThatItWorks-thisIsAVeryLongFileNameToCheckThatItWorks-thisIs.txt |
+
+
+ Scenario Outline: File with long name (>228 characters) is blacklisted
+ Given user "Alice" has set up a client with default settings
+ When user "Alice" creates a file "<filename>" with the following content inside the sync folder
+ """
+ test contents
+ """
+ And the user clicks on the activity tab
+ And the user selects "Not Synced" tab in the activity
+ And the user waits until at least a file is blacklisted
+ Then the file "<filename>" should be blacklisted
+ Examples:
+ | filename |
+ | aQuickBrownFoxJumpsOverAVeryLazyDog-aQuickBrownFoxJumpsOverAVeryLazyDog-aQuickBrownFoxJumpsOverAVeryLazyDog-aQuickBrownFoxJumpsOverAVeryLazyDog-aQuickBrownFoxJumpsOverAVeryLazyDog-aQuickBrownFoxJumpsOverAVeryLazyDog-aQuickBro.txt |
+
+
+ Scenario: Syncing file of 1 GB size
+ Given user "Alice" has set up a client with default settings
+ When user "Alice" creates a file "newfile.txt" with size "1GB" inside the sync folder
+ And the user waits for file "newfile.txt" to be synced
+ Then as "Alice" file "newfile.txt" should exist on the server
+
+
+ Scenario: File with spaces in the name can sync
+ Given user "Alice" has set up a client with default settings
+ When user "Alice" creates a file "file with space.txt" with the following content inside the sync folder
+ """
+ test contents
+ """
+ And the user waits for file "file with space.txt" to be synced
+ Then as "Alice" file "file with space.txt" should exist on the server
+
+
+ Scenario: Syncing folders each having 500 files
+ Given user "Alice" has set up a client with default settings
+ And the user has created a folder "folder1" with "500" files each of size "1048576" bytes in temp folder
+ And the user has created a folder "folder2" with "500" files each of size "1048576" bytes in temp folder
+ When user "Alice" moves folder "folder1" from the temp folder into the sync folder
+ And user "Alice" moves folder "folder2" from the temp folder into the sync folder
+ And the user waits for folder "folder1" to be synced
+ And the user waits for folder "folder2" to be synced
+ Then as "Alice" folder "folder1" should exist on the server
+ And as user "Alice" folder "folder1" should contain "500" items on the server
+ And as "Alice" folder "folder2" should exist on the server
+ And as user "Alice" folder "folder2" should contain "500" items on the server \ No newline at end of file
diff --git a/translations/client_ar.ts b/translations/client_ar.ts
index 9d4523509..84b308b35 100644
--- a/translations/client_ar.ts
+++ b/translations/client_ar.ts
@@ -1080,41 +1080,41 @@ File synchronization desktop utility.</source>
<translation>نشاط المزامنة</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>تعذّرت قراءة ملف استبعاد النظام</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>تمت إضافة مجلد من وحدات التخزين الخارجية.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1127,7 +1127,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1138,7 +1138,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1147,17 +1147,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>هل تريد إزالة كل الملفات؟</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>إزالة كل الملفات</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>حفظ الملفات</translation>
</message>
@@ -1345,62 +1345,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>لم يتم حل التعارضات. انقر للحصول على التفاصيل.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>البحث عن تغييرات في &apos;%1&apos; البعيد</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>البحث عن تغييرات في &apos;%1&apos; المحلي</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>توافق التغييرات</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>، &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>مزامنة %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>، </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>تنزيل %1/ثانية</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/ثانية</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/ثانية</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>تحميل %1/ثانية</translation>
@@ -1411,46 +1411,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 من %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 متبقٍّ %1 من %2، ملف %3 من %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 من %2، ملف %3 من %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>ملف %1 من %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>جارٍ الانتظار...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>جارٍ انتظار %n مجلد آخر ...</numerusform><numerusform>جارٍ انتظار %n مجلد آخر ...</numerusform><numerusform>جارٍ انتظار %n مجلدين آخر ...</numerusform><numerusform>جارٍ انتظار %n مجلدات أخرى ...</numerusform><numerusform>جارٍ انتظار %n مجلدات أخرى ...</numerusform><numerusform>جارٍ انتظار %n مجلدات أخرى ...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>جارٍ تحضير المزامنة...</translation>
</message>
@@ -1875,12 +1875,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>تعذّرت كتابة التغييرات في &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>إضافة نمط تجاهل</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>أضف نمط تجاهل جديدًا:</translation>
</message>
diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts
index c8c5dbc64..d53ec4447 100644
--- a/translations/client_bg_BG.ts
+++ b/translations/client_bg_BG.ts
@@ -1080,41 +1080,41 @@ File synchronization desktop utility.</source>
<translation>Активност на Синхронизацията</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>Неуспешно прочитане на системния файл за пренебрегване на файлове. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>Добавена е папка от външно дисково устройство.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1127,7 +1127,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1138,7 +1138,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1147,17 +1147,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Премахни Всички Файлове?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Премахни всички файлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Запази файловете</translation>
</message>
@@ -1345,62 +1345,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Има нерешени конфликти. Кликнете за повече подробности.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Проверка за промени в отдалечената „%1“</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Проверка за промени в локалната „%1“</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Запис на промените</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Синхронизиране на %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>теглене с %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>качване с %1/s</translation>
@@ -1411,46 +1411,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Локална папка: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 от %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>още %5, %1 от %2, файл %3 от %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 от %2, файл %3 от %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>файл %1 от %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Изчакване...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Подготовка за синхронизация...</translation>
</message>
@@ -1875,12 +1875,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>Неуспешно записване на промените в &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Добави Шаблон за Игнориране</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Добави нов шаблон за игнориране:</translation>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 583abfbdf..65a617cd9 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -1076,40 +1076,40 @@ File synchronization desktop utility.</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<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="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<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="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1118,7 +1118,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="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1128,7 +1128,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1137,17 +1137,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -1335,62 +1335,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Jsou zde nevyřešené konflikty. Klikněte pro detaily.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Zjišťuji změny ve vzdáleném &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Zjišťuji změny v místním &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Srovnávám změny</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Synchronizuji %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>stahování %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>nahrávání %1/s</translation>
@@ -1401,46 +1401,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 ze %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 zbývá, %1 ze %2, soubor %3 z %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 z %2, soubor %3 z %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>soubor %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Chvíli strpení...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Synchronizace se připravuje...</translation>
</message>
@@ -1861,12 +1861,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>Nelze zapsat změny do &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Přidat masku ignorovaných</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Přidat novou masku ignorovaných souborů:</translation>
</message>
diff --git a/translations/client_de-informal.ts b/translations/client_de-informal.ts
index 1ad3e76a0..f4786b335 100644
--- a/translations/client_de-informal.ts
+++ b/translations/client_de-informal.ts
@@ -1079,41 +1079,41 @@ Datei Synchronisations-Applikation.</translation>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<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="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Ein neues Verzeichnis, welcher größer als %1 MB ist, wurde hinzugefügt: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<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="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Bitte wechsele zu den Einstellungen, falls du das Verzeichnis herunterladen möchtest.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Ordner %1 wurde angelegt, aber früher von der Synchronisation ausgeschlossen. Daten im Ordner werden nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Datei %1 wurde angelegt, aber früher von der Synchronisation ausgeschlossen, sie wird nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1126,7 +1126,7 @@ Dies bedeutet, dass der Synchronisationsclient lokale Änderungen möglicherweis
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1137,7 +1137,7 @@ Wenn du dich entscheidest, diese Dateien zu behalten, werden diese wieder zum Se
Wenn du dich zum Löschen der Dateien entscheidest, sind diese nicht mehr verfügbar, außer du bist der Eigentümer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1146,17 +1146,17 @@ Bist du dir sicher, dass du diese Aktion mit Ihrem Server synchronisieren möcht
Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, werden diese wieder vom Server synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Alle Dateien löschen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -1346,62 +1346,62 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin
<translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Prüfe Änderungen der entfernten &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Prüfe Änderungen der lokalen &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Änderungen zusammenführen</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>,&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Synchronisiere %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Download %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Upload %1/s</translation>
@@ -1412,46 +1412,46 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin
<translation>Lokaler Ordner: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 von %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 übrig, %1 von %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 von %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>Datei %1 von %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>warten...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Warte auf ein Verzeichnis...</numerusform><numerusform>Warte auf %n andere Verzeichnisse...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Synchronisation vorbereiten...</translation>
</message>
@@ -1875,12 +1875,12 @@ Elemente, für die Löschen erlaubt ist, werden gelöscht, wenn sie andernfalls
<translation>Konnte Änderungen nicht in &apos;%1&apos; schreiben.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Ignoriermuster hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Neues Ignoriermuster hinzufügen:</translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 0aee41742..1814baf3b 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -1081,41 +1081,41 @@ Datei Synchronisations-Applikation.</translation>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<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="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<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="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1128,7 +1128,7 @@ Dies bedeutet, dass der Synchronisationsclient lokale Änderungen möglicherweis
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1139,7 +1139,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1148,17 +1148,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -1348,62 +1348,62 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin
<translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Änderungen der entfernten Ressource &apos;%1&apos; werden geprüft</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Änderungen der lokalen Ressource &apos;%1&apos; werden geprüft</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Änderungen zusammenführen</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Synchronisiere %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Download %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Upload %1/s</translation>
@@ -1414,46 +1414,46 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin
<translation>Lokaler Ordner: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 von %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 übrig, %1 von %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 of %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>Datei %1 von %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Warte...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Bereite Synchronisation vor...</translation>
</message>
@@ -1877,12 +1877,12 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn sie die Löschun
<translation>Konnte Änderungen nicht in &apos;%1&apos; schreiben.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Ignoriermuster hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Neues Ignoriermuster hinzufügen:</translation>
</message>
diff --git a/translations/client_de_AT.ts b/translations/client_de_AT.ts
index bdc161cdc..f155b0f22 100644
--- a/translations/client_de_AT.ts
+++ b/translations/client_de_AT.ts
@@ -1079,41 +1079,41 @@ Datei Synchronisations-Applikation.</translation>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<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="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Ein neues Verzeichnis, welcher grösser als %1 MB ist, wurde hinzugefügt: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<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="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Ordner %1 wurde angelegt, aber von der vorhergehenden Synchronisation ausgeschlossen. Daten im Ordner werden nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Datei %1 wurde angelegt, aber früher von der Synchronisation ausgeschlossen, sie wird nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1126,7 +1126,7 @@ Dies bedeutet, dass der Synchronisationsclient lokale Änderungen möglicherweis
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1137,7 +1137,7 @@ Wenn du dich entscheidest, diese Dateien zu behalten, werden diese wieder zum Se
Wenn du dich zum Löschen der Dateien entscheidest, sind diese nicht mehr verfügbar, ausser du bist der Eigentümer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1146,17 +1146,17 @@ Bist du dir sicher, dass du diese Aktion mit Ihrem Server synchronisieren möcht
Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, werden diese wieder vom Server synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Alle Dateien löschen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -1346,62 +1346,62 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin
<translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Änderungen der entfernten Ressource &apos;%1&apos; werden geprüft</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Änderungen der lokalen Ressource &apos;%1&apos; werden geprüft</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Änderungen zusammenführen</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>,&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Synchronisiere %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Download %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Upload %1/s</translation>
@@ -1412,46 +1412,46 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin
<translation>Lokaler Ordner: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 von %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 übrig, %1 von %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 von %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>Datei %1 von %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Warte...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Warte auf %n andere Verzeichnisse...</numerusform><numerusform>Warte auf %n andere Verzeichnisse...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Bereite Synchronisation vor...</translation>
</message>
@@ -1875,12 +1875,12 @@ Elemente, für die Löschen erlaubt ist, werden gelöscht, wenn sie andernfalls
<translation>Konnte Änderungen nicht in &apos;%1&apos; schreiben.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Ignoriermuster hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Neues Ignoriermuster hinzufügen:</translation>
</message>
diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts
index b50b65940..3c0c39eab 100644
--- a/translations/client_de_CH.ts
+++ b/translations/client_de_CH.ts
@@ -4,17 +4,17 @@
<message>
<location filename="../src/gui/commonstrings.cpp" line="27"/>
<source>file manager</source>
- <translation type="unfinished"/>
+ <translation>Dateimanager</translation>
</message>
<message>
<location filename="../src/gui/commonstrings.cpp" line="33"/>
<source>Show in %1</source>
- <translation type="unfinished"/>
+ <translation>In %1 anzeigen</translation>
</message>
<message>
<location filename="../src/gui/commonstrings.cpp" line="38"/>
<source>Show in web browser</source>
- <translation type="unfinished"/>
+ <translation>Im Webrowser anzeigen</translation>
</message>
<message>
<location filename="../src/gui/commonstrings.cpp" line="43"/>
@@ -24,7 +24,7 @@
<message numerus="yes">
<location filename="../src/gui/commonstrings.cpp" line="48"/>
<source>%n Filter(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n Filter</numerusform><numerusform>%n Filter</numerusform></translation>
</message>
</context>
<context>
@@ -32,12 +32,12 @@
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="29"/>
<source>Tomahawk Crash Reporter</source>
- <translation type="unfinished"/>
+ <translation>Tomahawk Crash-Reporter</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="104"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="213"/>
@@ -47,24 +47,24 @@
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="257"/>
<source>Send this report</source>
- <translation type="unfinished"/>
+ <translation>Diesen Bericht senden</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="264"/>
<source>Don&apos;t send</source>
- <translation type="unfinished"/>
+ <translation>Nicht senden</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="284"/>
<source>You can disable sending crash reports in the configuration dialog.</source>
- <translation type="unfinished"/>
+ <translation>Sie können das Versenden von Crash-Reports im Konfigurations-Dialog abschalten.</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="112"/>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="119"/>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="155"/>
<source>We cannot gather useful debug information on your system.</source>
- <translation type="unfinished"/>
+ <translation>Es konnte keine brauchbare Debug-Information vom System eingesammelt werden.</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="113"/>
@@ -78,22 +78,22 @@
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="148"/>
<source>Ready to send debug information (&lt;a href=&quot;%1&quot;&gt;view backtrace&lt;/a&gt;).</source>
- <translation type="unfinished"/>
+ <translation>Bereit zum Senden von Debug Informationen (&lt;a href=&quot;%1&quot;&gt; backtrace ansehen &lt;/a&gt;).</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="164"/>
<source>Gathering debug information...</source>
- <translation type="unfinished"/>
+ <translation>Einsammeln von Debug-Informationen...</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="273"/>
<source>Uploaded %L1 of %L2 KB.</source>
- <translation type="unfinished"/>
+ <translation>%L1 of %L2 KB hochgeladen.</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="300"/>
<source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;. Please refer to crash &lt;a href=&quot;clipboard://%1&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/a&gt; (click to copy) in bug reports.</source>
- <translation type="unfinished"/>
+ <translation>Gesendet! &lt;b&gt;Vielen Dank&lt;/b&gt;. Bitte referenziere Crash &lt;a href=&quot;clipboard://%1&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/a&gt; (anklicken zum Kopieren) in Ihren Bug-Reports.</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="309"/>
@@ -405,7 +405,7 @@ Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bric
<message>
<location filename="../src/gui/accountsettings.cpp" line="714"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
- <translation>Die Synchronisation läuft gerade.&lt;br/&gt;Willst Du sie beenden?</translation>
+ <translation>Die Synchronisation läuft gerade.&lt;br/&gt;Wollen Sie sie beenden?</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="811"/>
@@ -475,7 +475,7 @@ Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bric
<message>
<location filename="../src/gui/accountsettings.cpp" line="1044"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
- <translation>&lt;p&gt;Möchtest Du den Zugang zum Nutzerkonto &lt;i&gt;%1&lt;/i&gt; wirklich löschen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Hinweis:&lt;/b&gt;Es werden &lt;b&gt;keine&lt;/b&gt; lokalen Daten gelöscht.&lt;/p&gt;</translation>
+ <translation>&lt;p&gt;Möchten Sie den Zugang zum Benutzerkonto &lt;i&gt;%1&lt;/i&gt; wirklich löschen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Hinweis:&lt;/b&gt;Es werden &lt;b&gt;keine&lt;/b&gt; lokalen Daten gelöscht.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1049"/>
@@ -511,7 +511,7 @@ Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bric
<message>
<location filename="../src/gui/accountsettings.cpp" line="510"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
- <translation>&lt;P&gt;Willst Du die Synchronisation des Verzeichnisses &lt;i&gt;%1&lt;/i&gt; wirklich aufgeben?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Hinweis:&lt;/b&gt; Diese Aktion wird &lt;b&gt;keine&lt;/b&gt; Dateien löschen.&lt;/p&gt;</translation>
+ <translation>&lt;p&gt;Möchten Sie den Ordner &lt;i&gt;%1&lt;/i&gt; wirklich nicht mehr synchronisieren?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anmerkung:&lt;/b&gt; Dies wird &lt;b&gt;keine&lt;/b&gt; Dateien löschen.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="798"/>
@@ -531,7 +531,7 @@ Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bric
<message>
<location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Die Server Version %1 wird nicht unterstützt. Auf eigenes Risiko weitermachen?</translation>
+ <translation>Die Serverversion %1 ist nicht unterstützt! Fortfahren auf eigenes Risiko.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="865"/>
@@ -541,7 +541,7 @@ Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bric
<message>
<location filename="../src/gui/accountsettings.cpp" line="878"/>
<source>Server configuration error: %1 at %2.</source>
- <translation>Fehler in der Serverkonfiguration: %1 at %2.</translation>
+ <translation>Fehler in der Serverkonfiguration: %1 bei %2.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="889"/>
@@ -559,7 +559,7 @@ Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bric
<message>
<location filename="../src/gui/accountstate.cpp" line="74"/>
<source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source>
- <translation type="unfinished"/>
+ <translation>Die URL für %1 wurde von %2 zu %3 geändert, möchten Sie die geänderte URL übernehmen?</translation>
</message>
<message>
<location filename="../src/gui/accountstate.cpp" line="77"/>
@@ -569,7 +569,7 @@ Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bric
<message>
<location filename="../src/gui/accountstate.cpp" line="78"/>
<source>Reject</source>
- <translation type="unfinished"/>
+ <translation>Ablehnen</translation>
</message>
<message>
<location filename="../src/gui/accountstate.cpp" line="216"/>
@@ -642,7 +642,7 @@ Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bric
<message>
<location filename="../src/gui/models/activitylistmodel.cpp" line="120"/>
<source>Local path</source>
- <translation type="unfinished"/>
+ <translation>Lokaler Pfad</translation>
</message>
</context>
<context>
@@ -746,7 +746,7 @@ Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bric
<message>
<location filename="../src/gui/application.cpp" line="182"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
- <translation>Einige Einstellungen wurden in neueren Versionen dieses Programms eingestellt und nutzen Funktionen, die in dieser Version nicht verfügbar sind. &lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt; Die aktuelle Konfigurations-Datei wurde bereits an folgenden Ort gesichert: &lt;i&gt;%2&lt;/i&gt;.</translation>
+ <translation>Einige Einstellungen wurden in neueren Versionen dieses Programms erstellt und nutzen Funktionen, die in dieser Version nicht verfügbar sind. &lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt; Die aktuelle Konfigurations-Datei wurde bereits an folgenden Ort gesichert: &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="189"/>
@@ -777,89 +777,90 @@ Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bric
<location filename="../src/gui/application.cpp" line="580"/>
<source>%1 version %2<byte value="xd"/>
File synchronization desktop utility.</source>
- <translation type="unfinished"/>
+ <translation>%1 version %2&lt;byte value=&quot;xd&quot;/&gt;
+Datei Synchronisations-Applikation.</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="585"/>
<source>For more information, see %1</source>
<comment>link to homepage</comment>
- <translation type="unfinished"/>
+ <translation>Siehe %1 für mehr Informationen</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="599"/>
<source>Show the settings dialog while starting.</source>
- <translation type="unfinished"/>
+ <translation>Den Einstellungs-Dialog beim Start anzeigen.</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="600"/>
<source>Quit the running instance.</source>
- <translation type="unfinished"/>
+ <translation>Die laufende Instanz beenden.</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="601"/>
<source>Write log to file (use - to write to stdout).</source>
- <translation type="unfinished"/>
+ <translation>Logdatei schreiben (Ausgabe nach stdout).</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="602"/>
<source>Write each sync log output in a new file in folder.</source>
- <translation type="unfinished"/>
+ <translation>Schreibe die Log-Ausgaben pro Sync-Lauf in eine neue Datei im Verzeichnis.</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="603"/>
<source>Remove logs older than &lt;hours&gt; hours (to be used with --logdir).</source>
- <translation type="unfinished"/>
+ <translation>Entferne Log-Dateien, die älter als &lt;hours&gt; Stunden sind (verwendet mit --logdir).</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="604"/>
<source>Flush the log file after every write.</source>
- <translation type="unfinished"/>
+ <translation>Log-Datei nach jedem Schreibvorgang in Datei sichern. </translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="605"/>
<source>Output debug-level messages in the log.</source>
- <translation type="unfinished"/>
+ <translation>Schreibe Debug Meldungen in das Log.</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="606"/>
<location filename="../src/gui/application.cpp" line="607"/>
<source>Override UI language.</source>
- <translation type="unfinished"/>
+ <translation>Sprache der Benutzeroberfläche nicht berücksichtigen.</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="608"/>
<source>Use the given configuration folder.</source>
- <translation type="unfinished"/>
+ <translation>Verwende den angegebenen Konfigurationsordner</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="609"/>
<source>Enable debug mode.</source>
- <translation type="unfinished"/>
+ <translation>Aktivieren des Debug-Modus </translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="612"/>
<source>Virtual file system file to be opened (optional).</source>
- <translation type="unfinished"/>
+ <translation>Virtuelle Filesystemdatei die geöffnet werden soll (optional). </translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="612"/>
<source>[&lt;vfs file&gt;]</source>
- <translation type="unfinished"/>
+ <translation>[&lt;vfs file&gt;]</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="641"/>
<source>Invalid path passed to --confdir</source>
- <translation type="unfinished"/>
+ <translation>Ungültiger Pfad wurde an Parameter --confdir übergeben</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="654"/>
<source>Error: unknown language &quot;%1&quot; (use --list-languages to get a complete list of supported translations)</source>
- <translation type="unfinished"/>
+ <translation>Fehler: unbekannte Sprache &quot;%1“ (verwenden Sie --list-languages, um eine vollständige Liste der unterstützten Übersetzungen zu erhalten)</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="663"/>
<source>Available translations: %1</source>
- <translation type="unfinished"/>
+ <translation>Verfügbare Übersetzungen: %1</translation>
</message>
</context>
<context>
@@ -923,7 +924,7 @@ File synchronization desktop utility.</source>
<message>
<location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/>
<source>Failed to parse credentials %1</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Verarbeiten der Zugangsdaten %1</translation>
</message>
</context>
<context>
@@ -968,7 +969,7 @@ File synchronization desktop utility.</source>
<message>
<location filename="../src/gui/models/expandingheaderview.cpp" line="78"/>
<source>Reset column sizes</source>
- <translation type="unfinished"/>
+ <translation>Spaltenbreiten zurücksetzen</translation>
</message>
</context>
<context>
@@ -1019,12 +1020,12 @@ File synchronization desktop utility.</source>
<message>
<location filename="../src/gui/folder.cpp" line="195"/>
<source>%1 failed to open the database.</source>
- <translation type="unfinished"/>
+ <translation>%1 Datenbank konnte nicht geöffnet werden.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="206"/>
<source>%1 is not writable.</source>
- <translation type="unfinished"/>
+ <translation>%1 ist nicht beschreibbar.</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="476"/>
@@ -1078,41 +1079,41 @@ File synchronization desktop utility.</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<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="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Ein neues Verzeichnis, welcher grösser als %1 MB ist, wurde hinzugefügt: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<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="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Bitte wechsele zu den Einstellungen, falls du das Verzeichnis herunterladen möchtest.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Ordner %1 wurde angelegt, aber früher von der Synchronisation ausgeschlossen. Daten im Ordner werden nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Datei %1 wurde angelegt, aber früher von der Synchronisation ausgeschlossen, sie wird nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1125,37 +1126,37 @@ Dies bedeutet, dass der Synchronisationsclient lokale Änderungen möglicherweis
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation>Alle Dateien im Synchronisationsordner &apos;%1&apos; wurden auf dem Server gelöscht.
-Diese Löschung wird in dein lokales Synchronisationsverzeichnis synchronisiert. Dadurch sind die Dateien nicht mehr verfügbar, falls du keine Möglichkeit zur Wiederherstellung hast.
-Wenn du dich entscheidest, diese Dateien zu behalten, werden diese wieder zum Server synchronisiert. Dies geschieht nur, wenn du die Rechte dazu hast.
-Wenn du dich zum Löschen der Dateien entscheidest, sind diese nicht mehr verfügbar, ausser du bist der Eigentümer.</translation>
+Diese Löschung wird in Ihr lokales Synchronisationsverzeichnis synchronisiert. Dadurch sind die Dateien nicht mehr verfügbar, falls Sie keine Möglichkeit zur Wiederherstellung haben.
+Wenn Sie sich entscheiden diese Dateien zu behalten, werden diese wieder zum Server synchronisiert. Dies geschieht nur, wenn Sie die Rechte dazu haben.
+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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
- <translation>Alle Dateien im Synchronisationsordner &apos;%1&apos; werden auf dem Server gelöscht. Diese Löschung wird mit deinem Server synchronisiert, wodurch die Dateien nicht mehr verfügbar sind, ausser diese werden wiederhergestellt.
-Bist du dir sicher, dass du diese Aktion mit Ihrem Server synchronisieren möchtest?
-Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, werden diese wieder vom Server synchronisiert.</translation>
+ <translation>Alle Dateien im Synchronisationsordner &apos;%1&apos; werden auf dem Server gelöscht. Diese Löschung wird mit dem Server synchronisiert, wodurch die Dateien nicht mehr verfügbar sind, außer diese werden wiederhergestellt.
+Sind Sie sicher, dass Sie diese Aktion mit dem Server synchronisieren möchten?
+Falls dies ein Missgeschick war und Sie sich zum Behalten der Datei entscheiden, werden diese wieder vom Server synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Alle Dateien löschen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -1170,7 +1171,7 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest,
<message>
<location filename="../src/gui/folderman.cpp" line="457"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Ein altes Synchronisations-Journal &apos;%1&apos; wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stelle sicher, dass keine Anwendung es verwendet.</translation>
+ <translation>Ein altes Synchronisations-Journal &apos;%1&apos; wurde gefunden, konnte jedoch nicht entfernt werden. Bitte sicherstellen, dass es derzeit von keiner Anwendung verwendet wird.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1241"/>
@@ -1240,7 +1241,7 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest,
<message>
<location filename="../src/gui/folderman.cpp" line="1398"/>
<source>The folder %1 is used in a folder sync connection!</source>
- <translation type="unfinished"/>
+ <translation>Der Ordner %1 wird bereits als Synchronisationsordner benutzt.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1405"/>
@@ -1270,19 +1271,21 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest,
<message>
<location filename="../src/gui/folderman.cpp" line="1460"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
- <translation>Das lokale Verzeichnis %1 liegt innerhalb eines Verzeichnisses, das schon synchronisiert wird. Bitte wähle ein anderes Verzeichnis! </translation>
+ <translation>Das lokale Verzeichnis %1 liegt innerhalb eines Verzeichnisses, das schon synchronisiert wird. Bitte wählen Sie ein anderes Verzeichnis! </translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1467"/>
<source>%1 Please pick another one!</source>
- <translation type="unfinished"/>
+ <translation>%1 Bitte wählen Sie einen anderen!</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1546"/>
<source>Multiple accounts are sharing the folder %1.
This configuration is know to lead to dataloss and is no longer supported.
Please consider removing this folder from the account and adding it again.</source>
- <translation type="unfinished"/>
+ <translation>Mehrere Konten teilen sich den Ordner %1.
+Diese Konfiguration führt bekanntermaßen zu Datenverlust und wird nicht mehr unterstützt.
+Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hinzuzufügen.</translation>
</message>
</context>
<context>
@@ -1320,7 +1323,7 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="185"/>
<source>Error while loading the list of folders from the server.</source>
- <translation>Fehler beim Herunterladen der Verzeichnisliste vom Server.</translation>
+ <translation>Fehler beim Empfang der Ordnerliste vom Server.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="227"/>
@@ -1330,7 +1333,7 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="247"/>
<source>Signed out</source>
- <translation>austreten</translation>
+ <translation>Abgemeldet</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
@@ -1343,62 +1346,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Prüfe Änderungen der entfernten &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Prüfe Änderungen der lokalen &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Änderungen zusammenführen</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>,&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Synchronisiere %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Download %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Upload %1/s</translation>
@@ -1406,49 +1409,49 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="272"/>
<source>Local folder: %1</source>
- <translation type="unfinished"/>
+ <translation>Lokaler Ordner: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 von %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 übrig, %1 von %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 von %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>Datei %1 von %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>warten...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Warte auf ein Verzeichnis...</numerusform><numerusform>Warte auf %n andere Verzeichnisse...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Synchronisation vorbereiten...</translation>
</message>
@@ -1466,7 +1469,7 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderwatcher_linux.cpp" line="90"/>
<source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source>
- <translation>Dieses Problem tritt normalerweise auf, wenn die Inotify-watcher erschöpft sind. Überprüfe die FAQ für Details.</translation>
+ <translation>Dieses Problem tritt normalerweise auf, wenn die Inotify-watcher erschöpft sind. Überprüfen Sie die FAQ für Details.</translation>
</message>
</context>
<context>
@@ -1535,7 +1538,7 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderwizard.cpp" line="321"/>
<source>Choose this to sync the entire account</source>
- <translation>Wähle dies, um das gesamte Konto zu synchronisieren</translation>
+ <translation>Wähle dies, um das gesamte Benutzerkonto zu synchronisieren</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="435"/>
@@ -1545,12 +1548,12 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderwizard.cpp" line="438"/>
<source>This folder can&apos;t be synced. Please choose another one.</source>
- <translation type="unfinished"/>
+ <translation>Dieser Ordner kann nicht synchronisiert werden. Bitte verwenden Sie einen anderen.</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="441"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
- <translation>Du synchronisierst bereits &lt;i&gt;%1&lt;/i&gt;, das ein übergeordneten Ordner von &lt;i&gt;%2&lt;/i&gt; ist.</translation>
+ <translation>Sie synchronisieren bereits &lt;i&gt;%1&lt;/i&gt;, das ein übergeordneter Ordner von &lt;i&gt;%2&lt;/i&gt; ist.</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="443"/>
@@ -1573,7 +1576,7 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderwizard.cpp" line="517"/>
<source>Virtual files are not available for the selected folder</source>
- <translation type="unfinished"/>
+ <translation>Virtuelle Dateien sind für den gewählten Ordner nicht verügbar</translation>
</message>
</context>
<context>
@@ -1586,17 +1589,17 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderwizard.cpp" line="50"/>
<source>&lt;b&gt;Error:&lt;/b&gt; %1</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;Fehler:&lt;/b&gt; %1</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="56"/>
<source>&lt;b&gt;Error:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;Fehler:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="56"/>
<source>&lt;b&gt;Warning:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;Warnung:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</translation>
</message>
</context>
<context>
@@ -1655,12 +1658,12 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/generalsettings.ui" line="142"/>
<source>Log Settings</source>
- <translation type="unfinished"/>
+ <translation>Log-Einstellungen</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="169"/>
<source>Advanced - Approval of folder sync (Non virtual file mode only)</source>
- <translation type="unfinished"/>
+ <translation>Erweitert - Synchronisierung von Ordnern genehmigen (Ausschliesslich im nicht-virtuellen Dateien Modus)</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="229"/>
@@ -1766,7 +1769,7 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/generalsettings.cpp" line="74"/>
<source>Language changes require a restart of this application to take effect.</source>
- <translation type="unfinished"/>
+ <translation>Sprachänderungen werden erst nach Neustart wirksam.</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="210"/>
@@ -1789,12 +1792,12 @@ Beachten Sie, das dies nur bestimmt von welchem Bereich Sie Upgrades erhalten un
<message>
<location filename="../src/gui/generalsettings.cpp" line="336"/>
<source>unknown (%1)</source>
- <translation type="unfinished"/>
+ <translation>Unbekannt (%1)</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="320"/>
<source>(use default)</source>
- <translation type="unfinished"/>
+ <translation>(benutze den Standard)</translation>
</message>
</context>
<context>
@@ -1872,12 +1875,12 @@ Elemente, für die Löschen erlaubt ist, werden gelöscht, wenn sie andernfalls
<translation>Konnte Änderungen nicht in &apos;%1&apos; schreiben.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Ignoriermuster hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Neues Ignoriermuster hinzufügen:</translation>
</message>
@@ -1917,12 +1920,12 @@ Elemente, für die Löschen erlaubt ist, werden gelöscht, wenn sie andernfalls
<message>
<location filename="../src/gui/issueswidget.cpp" line="174"/>
<source>The file %1 was ignored as its name is reserved by %2</source>
- <translation type="unfinished"/>
+ <translation>Die Datei %1 wurde ignoriert, da ihr Name von %2 reserviert ist</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.cpp" line="204"/>
<source>Reset column sizes</source>
- <translation type="unfinished"/>
+ <translation>Spaltenbreiten zurücksetzen</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.cpp" line="223"/>
@@ -1932,7 +1935,7 @@ Elemente, für die Löschen erlaubt ist, werden gelöscht, wenn sie andernfalls
<message>
<location filename="../src/gui/issueswidget.cpp" line="243"/>
<source>Account</source>
- <translation>Nutzerkonto</translation>
+ <translation>Benutzerkonto</translation>
</message>
</context>
<context>
@@ -1963,28 +1966,29 @@ Elemente, für die Löschen erlaubt ist, werden gelöscht, wenn sie andernfalls
<message>
<location filename="../src/gui/logbrowser.ui" line="53"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;The logs contain sensitive information which you should not make publicly available&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;Die Logs enthalten sensible Informationen und sollten nicht veröffentlicht werden&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.ui" line="71"/>
<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.</source>
- <translation type="unfinished"/>
+ <translation>Der Client kann Debug-Logs in einen temporären Ordner schreiben. Die darin enthaltenen Informationen sind hilfreich zur Diagnose von Störungen.
+Da diese Logs sehr gross werden können, erstellt der Client für jede Synchronisierung ein neues Log und komprimiert Ältere. Es empfiehlt sich, die automatische Löschung von Log-Dateien nach ein paar Stunden einzuschalten. Damit wird verhindert, dass zu viel Speicherplatz belegt wird. </translation>
</message>
<message>
<location filename="../src/gui/logbrowser.ui" line="84"/>
<source>If enabled, logs will be written to:</source>
- <translation type="unfinished"/>
+ <translation>Wenn eingeschaltet, werden Logs hier erstellt:</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.ui" line="91"/>
<source>C:/log</source>
- <translation type="unfinished"/>
+ <translation>C:/log</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.ui" line="123"/>
<source>Log Http traffic </source>
- <translation type="unfinished"/>
+ <translation>HTTP-Kommunikation aufzeichnen</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.ui" line="143"/>
@@ -2004,7 +2008,7 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers
<message>
<location filename="../src/gui/models/models.cpp" line="93"/>
<source>%1 Filter:</source>
- <translation type="unfinished"/>
+ <translation>%1 Filter:</translation>
</message>
<message>
<location filename="../src/gui/models/models.cpp" line="114"/>
@@ -2014,12 +2018,12 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers
<message>
<location filename="../src/gui/issueswidget.cpp" line="258"/>
<source>Reset Filters</source>
- <translation type="unfinished"/>
+ <translation>Filter zurücksetzen</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.cpp" line="349"/>
<source>Status Filter:</source>
- <translation type="unfinished"/>
+ <translation>Status Filter:</translation>
</message>
</context>
<context>
@@ -2229,7 +2233,7 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="270"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
- <translation>Die JSON Antwort des Servers konnte nicht reparst werden: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
+ <translation>Die JSON Antwort des Servers konnte nicht geparst werden: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="273"/>
@@ -2250,17 +2254,17 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="301"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;h1&gt;Login Fehler&lt;/h1&gt;&lt;p&gt;Nutzerinformation konnte nicht abgerufen werden&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="553"/>
<source>Oauth2 Error</source>
- <translation type="unfinished"/>
+ <translation>OAuth2 Fehler</translation>
</message>
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="554"/>
<source>Oauth2 authentication requires a secured connection.</source>
- <translation type="unfinished"/>
+ <translation>Die OAuth2 Anmeldung benötigt eine gesicherte Verbindung.</translation>
</message>
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="281"/>
@@ -2270,7 +2274,7 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="387"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
- <translation>&lt;h1&gt;Falscher Benutzer&lt;/h1&gt;&lt;p&gt;Du hast dich mit dem Benutzer &lt;em&gt;%1&lt;/em&gt; angemeldet, solltest dich jedoch mit dem Benutzer &lt;em&gt;%2&lt;/em&gt; anmelden. Bitte melde dich in einem anderen Tab von %3 ab und &lt;a href=&apos;%4&apos;&gt;klicke hier&lt;/a&gt; um dich als %2 anzumelden&lt;/p&gt;</translation>
+ <translation>&lt;h1&gt;Falscher Benutzer&lt;/h1&gt;&lt;p&gt;Sie haben sich mit dem Benutzer &lt;em&gt;%1&lt;/em&gt; angemeldet, sollten sich jedoch mit dem Benutzer &lt;em&gt;%2&lt;/em&gt; anmelden. &lt;br&gt;Bitte melden Sie sich in einem anderen Tab von %3 ab und &lt;a href=&apos;%4&apos;&gt;klicken Sie hier&lt;/a&gt; um sich als %2&lt;/p&gt; anzumelden</translation>
</message>
</context>
<context>
@@ -2309,7 +2313,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="166"/>
<source>New %1 available. Please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt; to download the new AppImage manually.</source>
- <translation type="unfinished"/>
+ <translation>Neue %1 verfügbar. Bitte clicken Sie &lt;a href=&apos;%2&apos;&gt;hier&lt;/a&gt; um das neue AppImage manuell downzuloaden.</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="169"/>
@@ -2362,12 +2366,12 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/>
<source>Use &amp;virtual files instead of downloading content immediately%1</source>
- <translation type="unfinished"/>
+ <translation>&amp;Virtuelle Dateien verwenden, anstatt die Dateien gleich herunter zu laden%1</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source>&lt;p&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/p&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;p&gt;&lt;strong&gt;Achtung:&lt;/strong&gt; Der lokale Ordner ist nicht leer. Wähle eine entsprechende Lösung!&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="163"/>
@@ -2377,7 +2381,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="208"/>
<source>Virtual files are not available for the selected folder</source>
- <translation type="unfinished"/>
+ <translation>Virtuelle Dateien sind für den gewählten Ordner nicht verügbar</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="242"/>
@@ -2437,7 +2441,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Datei %1 wird gerade benutzt</translation>
</message>
</context>
<context>
@@ -2456,8 +2460,8 @@ for additional privileges during the process.</source>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="112"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
- <translation>Diese URL ist NICHT sicher, das sie nicht verschlüsselt ist.
-Es ist nicht ratsam, diese zu benutzen.</translation>
+ <translation>Diese URL ist NICHT sicher, da sie nicht verschlüsselt ist.
+Es ist nicht ratsam, sie zu benutzen.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="116"/>
@@ -2510,7 +2514,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="333"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
- <translation>Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehe zurück und überprüfe die Zugangsdaten.</translation>
+ <translation>Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehen Sie zurück und überprüfen Sie die Zugangsdaten.</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
@@ -2704,12 +2708,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Aktualisieren von Metadaten: %1</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Ordner %1 wird gerade benutzt</translation>
</message>
</context>
<context>
@@ -2717,13 +2721,13 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="369"/>
<source>Failed to free up space, the file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Speicherplatz konnte nicht freigegeben werden, die Datei %1 wird derzeit verwendet</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<location filename="../src/libsync/propagatedownload.cpp" line="462"/>
<source>File %1 can not be downloaded because of a local file name clash with %2!</source>
- <translation type="unfinished"/>
+ <translation>Datei %1 kann nicht heruntergeladen werden, da der lokale Dateiname mit %2 kollidiert!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="520"/>
@@ -2743,7 +2747,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="707"/>
<source>Broken webserver returned empty content length for non-empty file on resume</source>
- <translation type="unfinished"/>
+ <translation>Der Webserver hat eine leere Länge bezüglich des Inhalts für eine nicht leere Datei in der Wiederaufnahme zurückgegeben (Defekt)</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="714"/>
@@ -2758,12 +2762,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="901"/>
<source>File %1 cannot be saved because of a local file name clash with %2!</source>
- <translation type="unfinished"/>
+ <translation>Datei %1 kann nicht gespeichert werden, da der lokale Dateiname mit %2 kollidiert!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1023"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Aktualisieren von Metadaten: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="470"/>
@@ -2771,13 +2775,13 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<location filename="../src/libsync/propagatedownload.cpp" line="961"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1026"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Die Datei %1 wird gerade benutzt</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="364"/>
<location filename="../src/libsync/propagatedownload.cpp" line="953"/>
<source>File has changed since discovery</source>
- <translation>Datei ist seit der Entdeckung geändert worden</translation>
+ <translation>Die Datei hat sich seit der Erkennung geändert</translation>
</message>
</context>
<context>
@@ -2798,17 +2802,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="176"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
- <translation type="unfinished"/>
+ <translation>Der lokale Ordner %1 konnte aufgrund eines Namenkonfliktes mit %2 nicht erstellt werden</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="195"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Aktualisieren von Metadaten: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Die Datei %1 wird gerade benutzt</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="182"/>
@@ -2821,18 +2825,18 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="79"/>
<source>%1 failed with: %2</source>
- <translation type="unfinished"/>
+ <translation>%1 fehlgeschlagen mit: %2</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="109"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
- <translation type="unfinished"/>
+ <translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen von %2 nicht gelöscht werden!</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="89"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>%1 the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Datei %1 wird gerade benutzt</translation>
</message>
</context>
<context>
@@ -2845,22 +2849,22 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Konnte %1 nicht in %2 umbenennen, die Datei wird gerade benutzt</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Aktualisieren von Metadaten: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="275"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Die Datei %1 wird gerade benutzt</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="281"/>
<source>Failed to rename file</source>
- <translation type="unfinished"/>
+ <translation>Umbenennen der Datei fehlgeschlagen</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="287"/>
@@ -2886,12 +2890,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="143"/>
<source>Error writing metadata to the database: %1</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Schreiben der Metadaten in die Datenbank: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="187"/>
<source>Setting file status failed due to file lock</source>
- <translation type="unfinished"/>
+ <translation>Das Festlegen des Dateistatus ist aufgrund einer Dateisperre fehlgeschlagen</translation>
</message>
</context>
<context>
@@ -2909,12 +2913,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="220"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Aktualisieren von Metadaten: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="223"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Die Datei %1 wird gerade benutzt</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="235"/>
@@ -2932,12 +2936,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
- <translation type="unfinished"/>
+ <translation>Die Datei konnte nicht aktualisiert werden: %1</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Die Datei %1 wird gerade benutzt</translation>
</message>
</context>
<context>
@@ -2955,17 +2959,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagateupload.cpp" line="255"/>
<source>Local file changed during sync. It will be resumed.</source>
- <translation type="unfinished"/>
+ <translation>Lokale Datei während der Synchronisierung geändert. Der Synchronisationsvorgang wird wiederholt.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Aktualisieren von Metadaten: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="583"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Die Datei %1 wird gerade benutzt</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="144"/>
@@ -2980,7 +2984,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<location filename="../src/libsync/propagateuploadng.cpp" line="93"/>
<location filename="../src/libsync/propagateuploadng.cpp" line="369"/>
<source>%1 the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Datei %1 wird gerade benutzt</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="493"/>
@@ -2995,7 +2999,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="541"/>
<source>The server did ask for a removed legacy feature(polling)</source>
- <translation type="unfinished"/>
+ <translation>Der Server hat nach einer nicht mehr benutzen Funktion angefragt (Polling)</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="546"/>
@@ -3018,7 +3022,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagateuploadtus.cpp" line="67"/>
<source>%1 the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Datei %1 wird gerade benutzt</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadtus.cpp" line="212"/>
@@ -3036,12 +3040,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="47"/>
<source>%1 the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Datei %1 wird gerade benutzt</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="223"/>
<source>The server did ask for a removed legacy feature(polling)</source>
- <translation type="unfinished"/>
+ <translation>Der Server hat nach einer nicht mehr benutzen Funktion angefragt (Polling)</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="243"/>
@@ -3056,7 +3060,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="268"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>Der Server konnte das letzte Stück nicht bestätigen. (Keine Entitätmarke war vorhanden)</translation>
+ <translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
</message>
</context>
<context>
@@ -3079,7 +3083,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/models/protocolitemmodel.cpp" line="134"/>
<source>Issues</source>
- <translation type="unfinished"/>
+ <translation>Probleme</translation>
</message>
<message>
<location filename="../src/gui/models/protocolitemmodel.cpp" line="134"/>
@@ -3094,7 +3098,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/models/protocolitemmodel.cpp" line="138"/>
<source>Account</source>
- <translation>Nutzerkonto</translation>
+ <translation>Benutzerkonto</translation>
</message>
<message>
<location filename="../src/gui/models/protocolitemmodel.cpp" line="140"/>
@@ -3112,7 +3116,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/protocolwidget.ui" line="22"/>
<source>Local sync protocol</source>
- <translation>Lokales synchronisations Protokoll</translation>
+ <translation>Lokales Sychronisationsprotokoll</translation>
</message>
<message>
<location filename="../src/gui/protocolwidget.ui" line="45"/>
@@ -3123,12 +3127,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<location filename="../src/gui/protocolwidget.cpp" line="68"/>
<location filename="../src/gui/protocolwidget.cpp" line="74"/>
<source>Account</source>
- <translation>Nutzerkonto</translation>
+ <translation>Benutzerkonto</translation>
</message>
<message>
<location filename="../src/gui/protocolwidget.cpp" line="149"/>
<source>Retry sync</source>
- <translation type="unfinished"/>
+ <translation>Synchronisation wiederholen</translation>
</message>
</context>
<context>
@@ -3229,7 +3233,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
- <translation>Konto hinzufügen</translation>
+ <translation>Benutzerkonto hinzufügen</translation>
</message>
<message>
<location filename="../src/gui/settingsdialog.cpp" line="233"/>
@@ -3245,12 +3249,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
- <translation>Konto</translation>
+ <translation>Benutzerkonto</translation>
</message>
<message>
<location filename="../src/gui/settingsdialog.ui" line="14"/>
<source>MainWindow</source>
- <translation type="unfinished"/>
+ <translation>Hauptfenster</translation>
</message>
<message>
<location filename="../src/gui/settingsdialog.ui" line="39"/>
@@ -3313,7 +3317,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/sharedialog.cpp" line="196"/>
<source>Users and Groups</source>
- <translation>Nutzer und Gruppen</translation>
+ <translation>Benutzer und Gruppen</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="203"/>
@@ -3356,7 +3360,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="283"/>
<source>&amp;Create</source>
- <translation>Erstellen</translation>
+ <translation>&amp;Erstellen</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="336"/>
@@ -3402,7 +3406,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<location filename="../src/gui/sharelinkwidget.cpp" line="118"/>
<location filename="../src/gui/sharelinkwidget.cpp" line="353"/>
<source>P&amp;assword protect</source>
- <translation>passwortgeschützt</translation>
+ <translation>p&amp;asswortgeschützt</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
@@ -3458,7 +3462,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="578"/>
<source>I shared %1 with you</source>
- <translation>Ich habe %1 mit dir geteilt</translation>
+ <translation>Ich habe %1 mit Ihnen geteilt</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="592"/>
@@ -3468,7 +3472,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="593"/>
<source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
- <translation>&lt;p&gt;Möchtest du wirklich den öffentlichen Link &lt;i&gt;%1&lt;/i&gt; löschen?&lt;/p&gt;&lt;p&gt;Hinweis: Dies kann nicht rückgängig gemacht werden.&lt;/p&gt;</translation>
+ <translation>&lt;p&gt;Möchte Sie wirklich den öffentlichen Link &lt;i&gt;%1 &lt;/i&gt;löschen?&lt;p&gt;Hinweis: Dies kann nicht rückgängig gemacht werden.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="600"/>
@@ -3508,7 +3512,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/shareusergroupwidget.ui" line="108"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You can direct people to this shared file or folder &lt;a href=&quot;private link menu&quot;&gt;&lt;span style=&quot; text-decoration: underline&quot;&gt;by giving them a private link&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Du kannst Leute direkt zu dieser Freigabe leiten, wenn du ihnen einen &lt;a href=&quot;private link menu&quot;&gt;&lt;span style=&quot; text-decoration: underline&quot;&gt;privaten Link&lt;/span&gt;&lt;/a&gt; gibst.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sie können Personen direkt zu dieser Freigabe leiten, wenn Sie Ihnen diesen &lt;a href=&quot;private link menu&quot;&gt;&lt;span style=&quot; text-decoration: underline&quot;&gt;privaten Link&lt;/span&gt;&lt;/a&gt; geben.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="212"/>
@@ -3538,7 +3542,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="345"/>
<source>I shared something with you</source>
- <translation>Ich habe etwas mit dir geteilt</translation>
+ <translation>Ich habe etwas mit Ihnen geteilt</translation>
</message>
</context>
<context>
@@ -3615,7 +3619,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="793"/>
<source>Confirm deletion</source>
- <translation>Löschung bestätigen</translation>
+ <translation>Löschen bestätigen</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="795"/>
@@ -3681,7 +3685,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="970"/>
<source>Create and copy public link to clipboard</source>
- <translation type="unfinished"/>
+ <translation>Neuen öffentlichen Link erstellen und in die Zwischenablage kopieren</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="972"/>
@@ -3739,57 +3743,57 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/>
<source>Failed to rerieve tags</source>
- <translation type="unfinished"/>
+ <translation>Fehler bim auslesen von Tags</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/>
<source>Backup of %1 started</source>
- <translation type="unfinished"/>
+ <translation>Backup von %1 gestartet</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/>
<source>Failed to find %1</source>
- <translation type="unfinished"/>
+ <translation>Konnte %1 nicht finden</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/>
<source>Local path must be a an absolute path</source>
- <translation type="unfinished"/>
+ <translation>Der lokale Pfad muss ein absoluter Pfad sein</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/>
<source>Failed to create temporary database</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Erstellen der temporären Datenbank</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/>
<source>Backup of %1 succeeded</source>
- <translation type="unfinished"/>
+ <translation>Backup von %1 war erfolgreich</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/>
<source>Failed to set success tag</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Setzen des Success-Tags</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="147"/>
<source>Failed to create backup: %1</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Erstellen des Backups: %1</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/>
<source>Failed to file id tags</source>
- <translation type="unfinished"/>
+ <translation>Fehler beim Setzen des ID-Tags</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="193"/>
<source>Backup of %1 failed with: %2</source>
- <translation type="unfinished"/>
+ <translation>Backup von %1 fehlgeschlagen mit: %2</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="209"/>
<source>%1 backup</source>
- <translation type="unfinished"/>
+ <translation>%1 Backup</translation>
</message>
</context>
<context>
@@ -3934,12 +3938,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="69"/>
<source>Untrusted Certificate</source>
- <translation>Unvertrautes Zertifikat</translation>
+ <translation>Nicht vertrauenswürdiges Zertifikat</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="136"/>
<source>Cannot connect securely to &lt;i&gt;%1&lt;/i&gt;:</source>
- <translation>Kann nicht verschlüsselt mit &lt;i&gt;%1&lt;/i&gt;: verbinden:</translation>
+ <translation>Kann keine sichere Verbindung zu &lt;i&gt;%1&lt;/i&gt; herstellen:</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="170"/>
@@ -4002,13 +4006,13 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/syncengine.cpp" line="188"/>
<source>%1 (skipped due to earlier error, trying again in %2)</source>
- <translation>%1(Übersprungen aufgrund des früheren Fehler,s erneuter Versuch in %2)</translation>
+ <translation>%1 (Übersprungen aufgrund des früheren Fehlers, erneuter Versuch in %2)</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Nur %1 zur Verfügung stehen, müssen mindestens %2 zu starten</translation>
+ <translation>Nur %1 sind verfügbar. Zum Beginnen werden mindestens %2 benötigt.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="420"/>
@@ -4061,7 +4065,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/common/syncjournaldb.cpp" line="931"/>
<source>Failed to connect database.</source>
- <translation type="unfinished"/>
+ <translation>Die Verbindung zur Datenbank konnte nicht hergestellt werden.</translation>
</message>
</context>
<context>
@@ -4077,7 +4081,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/theme.cpp" line="460"/>
<source>&lt;p&gt;Version %1. For more information visit &lt;a href=&quot;%2&quot;&gt;https://%3&lt;/a&gt;&lt;/p&gt;&lt;p&gt;For known issues and help, please visit: &lt;a href=&quot;https://central.owncloud.org/c/desktop-client&quot;&gt;https://central.owncloud.org&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.&lt;/p&gt;&lt;p&gt;&lt;small&gt;%6&lt;/small&gt;&lt;/p&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;p&gt;Version %1. Weitere Informationen unter &lt;a href=&quot;%2&quot;&gt;https://%3&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Für bekannte Fehler und die Hilfe, besuchen Sie bitte: &lt;a href=&quot;https://central.owncloud.org/c/desktop-client&quot;&gt;https://central.owncloud.org&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Von Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth und anderen.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Lizenziert unter den Bedingungen der GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%5 und das %5 Logo sind eingetragene Warenzeichen von %4 in den USA, anderen Ländern, oder beidem.&lt;/p&gt;&lt;p&gt;&lt;small&gt;%6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
</context>
<context>
@@ -4103,17 +4107,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/common/vfs.cpp" line="77"/>
<source>The Virtual filesystem feature does not support a drive as sync root</source>
- <translation type="unfinished"/>
+ <translation>Das virtuelle Dateisystem Feature unterstützt kein Laufwerk als Synchronisationsordner</translation>
</message>
<message>
<location filename="../src/common/vfs.cpp" line="81"/>
<source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source>
- <translation type="unfinished"/>
+ <translation>Das Feature Virtuelle Dateien benötigt ein NTFS Dateisystem, %1 benutzt %2</translation>
</message>
<message>
<location filename="../src/common/vfs.cpp" line="85"/>
<source>The Virtual filesystem feature is not supported on network drives</source>
- <translation type="unfinished"/>
+ <translation>Das Feature Virtuelle Dateien unterstützt keine Netzwerk-Laufwerke</translation>
</message>
</context>
<context>
@@ -4121,7 +4125,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="109"/>
<source>Cannot create a placeholder because a file with the placeholder name already exist</source>
- <translation type="unfinished"/>
+ <translation>Ein Platzhalter kann nicht erstellt werden, da bereits eine Datei mit dem gleichen Platzhalternamen vorhanden ist</translation>
</message>
</context>
<context>
@@ -4129,7 +4133,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/owncloudgui.cpp" line="253"/>
<source>Please sign in</source>
- <translation>Bitte melde Dich an</translation>
+ <translation>Bitte melden Sie sich an</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="281"/>
@@ -4139,12 +4143,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/owncloudgui.cpp" line="290"/>
<source>Unresolved %1 conflicts</source>
- <translation type="unfinished"/>
+ <translation>Ungelöste %1 Konflikte</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="292"/>
<source>Ignored errors %1</source>
- <translation type="unfinished"/>
+ <translation>Ignorierte Fehler %1 </translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="306"/>
@@ -4183,7 +4187,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>Open folder &apos;%1&apos;</source>
- <translation>Ordner »%1« öffnen</translation>
+ <translation>Ordner &apos;%1&apos; öffnen</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="319"/>
@@ -4268,7 +4272,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/owncloudgui.cpp" line="303"/>
<source>Up to date (%1)</source>
- <translation type="unfinished"/>
+ <translation>Aktuell (%1) </translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="307"/>
@@ -4392,12 +4396,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="165"/>
<source>Ask for confirmation before synchroni&amp;zing folders larger than</source>
- <translation>Nachfragen, bei Synchronisation von Ordnern grösser als</translation>
+ <translation>Bestätigung einholen bei Synchronisation von Ordnern grösser als</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>S&amp;ynchronize everything from server</source>
- <translation type="unfinished"/>
+ <translation>Alle Daten vom Server s&amp;ynchronisieren</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="182"/>
@@ -4408,7 +4412,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="191"/>
<source>Ask for confirmation before synchronizing e&amp;xternal storages</source>
- <translation>Nachfragen, bei Synchronisation von externen Speichern</translation>
+ <translation>Bestätigung erfragen, bevor e&amp;xterne Speicher synchronisiert werden</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
@@ -4444,7 +4448,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="472"/>
<source>Start a &amp;clean sync (Create a backup and erases the local folder!)</source>
- <translation type="unfinished"/>
+ <translation>Starten Sie eine &amp;saubere Synchronisierung (Erstelle ein Backup und lösche den lokalen Ordner!)</translation>
</message>
</context>
<context>
@@ -4560,12 +4564,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
- <translation type="unfinished"/>
+ <translation>Nicht definiert</translation>
</message>
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
- <translation type="unfinished"/>
+ <translation>Schwerer Fehler</translation>
</message>
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="87"/>
@@ -4591,22 +4595,22 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
- <translation type="unfinished"/>
+ <translation>Datei ignoriert</translation>
</message>
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
- <translation type="unfinished"/>
+ <translation>Wiederhergestellt</translation>
</message>
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
- <translation type="unfinished"/>
+ <translation>Zur Blacklist hinzugefügt</translation>
</message>
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
- <translation type="unfinished"/>
+ <translation>Ausgeschlossen</translation>
</message>
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="105"/>
@@ -4674,7 +4678,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/guiutility.cpp" line="92"/>
<source>Shutting down %1</source>
- <translation type="unfinished"/>
+ <translation>Herunterfahren von %1 </translation>
</message>
</context>
<context>
@@ -4682,7 +4686,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/main.cpp" line="39"/>
<source>System Tray not available</source>
- <translation>Benachrichtigungsfeld nicht verfügbar</translation>
+ <translation>Die Taskleiste ist nicht verfügbar.</translation>
</message>
<message>
<location filename="../src/gui/main.cpp" line="40"/>
@@ -4695,7 +4699,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/theme.cpp" line="437"/>
<source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source>
- <translation type="unfinished"/>
+ <translation>%1 %2 %3%8%9Libraries Qt %4, %5%8verwenden das Virtual Files plugin: %6%8%7</translation>
</message>
</context>
<context>
@@ -4703,7 +4707,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/theme.cpp" line="427"/>
<source>%1 (Built against Qt %1)</source>
- <translation type="unfinished"/>
+ <translation>%1 (Mit Qt %1 gebaut)</translation>
</message>
</context>
<context>
@@ -4749,7 +4753,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="48"/>
<source>%1 moved to %2</source>
- <translation type="unfinished"/>
+ <translation>%1 verschoben nach %2</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
@@ -4824,7 +4828,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/theme.cpp" line="104"/>
<source>Waiting to start sync</source>
- <translation>Warte, um mit der Synchronistation zu beginnen</translation>
+ <translation>Warten auf Beginn der Synchronisation</translation>
</message>
<message>
<location filename="../src/libsync/theme.cpp" line="107"/>
@@ -4859,7 +4863,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/libsync/theme.cpp" line="125"/>
<source>Aborting...</source>
- <translation>Es wird abgebrochen …</translation>
+ <translation>Abbruch …</translation>
</message>
<message>
<location filename="../src/libsync/theme.cpp" line="128"/>
@@ -4877,7 +4881,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/guiutility.cpp" line="138"/>
<source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source>
- <translation>Die URL %1 konnte aufgrund eines Fehlers beim Start des Browsers nicht aufgerufen werden. Ist vielleicht kein Standardbrowser konfiguriert?</translation>
+ <translation>Die URL %1 konnte aufgrund eines Fehlers nicht aufgerufen werden. Ist vielleicht kein Standard-Browser konfiguriert?</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="161"/>
@@ -4887,7 +4891,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<message>
<location filename="../src/gui/guiutility.cpp" line="162"/>
<source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
- <translation>Es ist ein Fehler beim Öffnen der E-Mail Anwendung, zum Erstellen einer neuen Nachricht, aufgetreten. Vielleicht ist keine standardmässige E-Mail Anwendung konfiguriert?</translation>
+ <translation>Es ist ein Fehler beim Öffnen einer E-Mail Anwendung zum Erstellen einer neuen Nachricht aufgetreten. Vielleicht ist keine E-Mail Anwendung konfiguriert?</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="177"/>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index eece47e1a..55a4cdf12 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -1080,41 +1080,41 @@ File synchronization desktop utility.</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>Προστέθηκε ένας φάκελος από εξωτερικό αποθηκευτικό χώρο.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1127,7 +1127,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1138,7 +1138,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1147,17 +1147,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -1345,62 +1345,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Αυτές είναι οι ανεπίλυτες διενέξεις. Κάντε κλικ για λεπτομέρειες.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Έλεγχος για αλλαγές στο απομακρυσμένο &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Έλεγχος για αλλαγές στο τοπικό &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Συνδυασμός αλλαγών</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Συγχρονισμός %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>λήψη %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>μεταφόρτωση %1/s</translation>
@@ -1411,46 +1411,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Τοπικός φάκελος: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 από %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>Απομένει %5, %1 από %2, αρχείο %3 από %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 από %2, αρχείο %3 από %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>αρχείο %1 από %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Αναμονή...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Προετοιμασία για συγχρονισμό...</translation>
</message>
@@ -1875,12 +1875,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>Αδυναμία εγγραφής αλλαγών στο &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Προσθήκη Προτύπου Αγνόησης</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Προσθήκη νέου προτύπου αγνόησης:</translation>
</message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 4a54a9d6d..6620473b3 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -1108,39 +1108,39 @@ File synchronization desktop utility.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1149,7 +1149,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<source>All files in the sync folder &apos;%1&apos; 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.
@@ -1157,24 +1157,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<source>All the files in your local sync folder &apos;%1&apos; were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -1362,62 +1362,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing &apos;foo.txt&apos;, &apos;bar.txt&apos;&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation type="unfinished"></translation>
@@ -1428,41 +1428,41 @@ Please consider removing this folder from the account and adding it again.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -1470,7 +1470,7 @@ Please consider removing this folder from the account and adding it again.</sour
</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation type="unfinished"></translation>
</message>
@@ -1891,12 +1891,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts
index cd1c2856b..30a55a2ff 100644
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@@ -1080,41 +1080,41 @@ File synchronization desktop utility.</source>
<translation>Sync Activity</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>Could not read system exclude file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>A new folder larger than %1 MB has been added: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>A folder from an external storage has been added.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Please go in the settings to select it if you wish to download it.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>The folder %1 was created but was excluded from synchronisation previously. Data inside it will not be synchronised.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>The file %1 was created but was excluded from synchronisation previously. It will not be synchronised.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1127,7 +1127,7 @@ This means that the synchronisation client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1138,7 +1138,7 @@ If you decide to keep the files, they will be re-synced with the server if you h
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1147,17 +1147,17 @@ Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Remove All Files?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Remove all files</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Keep files</translation>
</message>
@@ -1345,62 +1345,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>There are unresolved conflicts. Click for details.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Checking for changes in remote &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Checking for changes in local &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Reconciling changes</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Syncing %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>download %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>upload %1/s</translation>
@@ -1411,46 +1411,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 of %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 left, %1 of %2, file %3 of %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 of %2, file %3 of %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>file %1 of %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Waiting...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Waiting for %n other folder(s)...</numerusform><numerusform>Waiting for %n other folder(s)...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Preparing to sync...</translation>
</message>
@@ -1873,12 +1873,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>Cannot write changes to &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Add Ignore Pattern</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Add a new ignore pattern:</translation>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index a99973a0f..5f480ac07 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -1081,41 +1081,41 @@ Cliente de escritorio para la sincronización de archivos.</translation>
<translation>Actividad de la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<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="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<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="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1128,7 +1128,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="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1139,7 +1139,7 @@ Si decide mantener estos archivos, serán re-sincronizados con el servidor si di
Si decide borrarlos, no estarán disponibles para usted a menos que sea el propietario.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1148,17 +1148,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>¿Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -1348,62 +1348,62 @@ Por favor, considere eliminar esta carpeta desde la cuenta y añadirla de nuevo.
<translation>Hay conflictos sin resolver. Haga clic para más detalles.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Buscando cambios en &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Buscando cambios en local &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Reconciliando cambios</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>descargando: %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>cargar %1/s</translation>
@@ -1414,46 +1414,46 @@ Por favor, considere eliminar esta carpeta desde la cuenta y añadirla de nuevo.
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 restantes, %1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>archivo %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Esperando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
@@ -1878,12 +1878,12 @@ Los objetos donde se permite el borrado serán borrados si impiden que un direct
<translation>No se pueden guardar cambios en &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Añadir patrón para ignorar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Añadir nuevo patrón para ignorar:</translation>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index eefa203aa..05a4b9899 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -24,7 +24,7 @@
<message numerus="yes">
<location filename="../src/gui/commonstrings.cpp" line="48"/>
<source>%n Filter(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
</context>
<context>
@@ -710,12 +710,12 @@ Cette action stoppera toute synchronisation en cours.</translation>
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="300"/>
<source>%n notifications(s) for %1.</source>
- <translation type="unfinished"><numerusform>%n notification(s) pour %1.</numerusform><numerusform></numerusform><numerusform>%n notification(s) pour %1.</numerusform></translation>
+ <translation><numerusform>%n notification(s) pour %1.</numerusform><numerusform>%n notification(s) pour %1.</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="306"/>
<source>%n notifications(s) for %1 and %2.</source>
- <translation type="unfinished"><numerusform>%n notification(s) pour %1 and %2.</numerusform><numerusform></numerusform><numerusform>%n notification(s) pour %1 and %2.</numerusform></translation>
+ <translation><numerusform>%n notification(s) pour %1 and %2.</numerusform><numerusform>%n notification(s) pour %1 and %2.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="308"/>
@@ -1016,7 +1016,7 @@ File synchronization desktop utility.</source>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="469"/>
<source>%1 and %n other file(s) have been removed.</source>
- <translation type="unfinished"><numerusform>%1 a été supprimé.</numerusform><numerusform></numerusform><numerusform>%1 et %n autres fichiers ont été supprimés.</numerusform></translation>
+ <translation><numerusform>%1 a été supprimé.</numerusform><numerusform>%1 et %n autres fichiers ont été supprimés.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="195"/>
@@ -1031,7 +1031,7 @@ File synchronization desktop utility.</source>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="476"/>
<source>%1 and %n other file(s) have been added.</source>
- <translation type="unfinished"><numerusform>%1 et %n autre(s) fichier(s) ont été ajouté(s).</numerusform><numerusform></numerusform><numerusform>%1 et %n autre(s) fichier(s) ont été ajouté(s).</numerusform></translation>
+ <translation><numerusform>%1 et %n autre(s) fichier(s) ont été ajouté(s).</numerusform><numerusform>%1 et %n autre(s) fichier(s) ont été ajouté(s).</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="478"/>
@@ -1042,22 +1042,22 @@ File synchronization desktop utility.</source>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="483"/>
<source>%1 and %n other file(s) have been updated.</source>
- <translation type="unfinished"><numerusform>%1 a été mis à jour.</numerusform><numerusform></numerusform><numerusform>%1 et %n autres fichiers ont été mis à jour.</numerusform></translation>
+ <translation><numerusform>%1 a été mis à jour.</numerusform><numerusform>%1 et %n autres fichiers ont été mis à jour.</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="490"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
- <translation type="unfinished"><numerusform>%1 a été renommé en %2.</numerusform><numerusform></numerusform><numerusform>%1 a été renommé en %2 et %n autres fichiers ont été renommés.</numerusform></translation>
+ <translation><numerusform>%1 a été renommé en %2.</numerusform><numerusform>%1 a été renommé en %2 et %n autres fichiers ont été renommés.</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="497"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
- <translation type="unfinished"><numerusform>%1 a été déplacé vers %2.</numerusform><numerusform></numerusform><numerusform>%1 a été déplacé vers %2 et %n autres fichiers ont été déplacés.</numerusform></translation>
+ <translation><numerusform>%1 a été déplacé vers %2.</numerusform><numerusform>%1 a été déplacé vers %2 et %n autres fichiers ont été déplacés.</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="504"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
- <translation type="unfinished"><numerusform>%1 a un conflit de synchronisation.</numerusform><numerusform></numerusform><numerusform>%1 et %n autres fichiers ont des problèmes de synchronisation.</numerusform></translation>
+ <translation><numerusform>%1 a un conflit de synchronisation.</numerusform><numerusform>%1 et %n autres fichiers ont des problèmes de synchronisation.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="506"/>
@@ -1067,7 +1067,7 @@ File synchronization desktop utility.</source>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="511"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
- <translation type="unfinished"><numerusform>%1 ne peut pas être synchronisé en raison d&apos;erreurs. Consultez les logs pour les détails.</numerusform><numerusform></numerusform><numerusform>%1 et %n autres fichiers n&apos;ont pas pu être synchronisés en raison d&apos;erreurs. Consultez les logs pour les détails.</numerusform></translation>
+ <translation><numerusform>%1 ne peut pas être synchronisé en raison d&apos;erreurs. Consultez les logs pour les détails.</numerusform><numerusform>%1 et %n autres fichiers n&apos;ont pas pu être synchronisés en raison d&apos;erreurs. Consultez les logs pour les détails.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="513"/>
@@ -1080,19 +1080,19 @@ File synchronization desktop utility.</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>Impossible de lire le fichier d&apos;exclusion du système</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>Un nouveau dossier localisé sur un stockage externe a été ajouté.
@@ -1100,22 +1100,22 @@ File synchronization desktop utility.</source>
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Merci d&apos;aller dans les Paramètres pour indiquer si vous souhaitez le télécharger.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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&apos;intérieur ne seront pas synchronisées.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1128,7 +1128,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="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1139,7 +1139,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1148,17 +1148,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
S&apos;il s&apos;agissait d&apos;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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Conserver les fichiers</translation>
</message>
@@ -1346,62 +1346,62 @@ Please consider removing this folder from the account and adding it again.</sour
<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="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Vérification des changements distants &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Vérification des changements locaux &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Rapprochement des modifications</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Synchronisation de %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>réception %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>envoi %1/s</translation>
@@ -1412,46 +1412,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 sur %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 restantes, %1 sur %2, fichier %3 sur %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 sur %2, fichier %3 sur %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>fichier %1 sur %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>En attente ...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
- <translation type="unfinished"><numerusform>En attente de %n autre(s) dossier(s)</numerusform><numerusform></numerusform><numerusform>En attente de %n autre(s) dossier(s)</numerusform></translation>
+ <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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Préparation à la synchronisation</translation>
</message>
@@ -1876,12 +1876,12 @@ Les éléments dont la suppression est autorisée seront supprimés s&apos;ils e
<translation>Impossible d&apos;écrire les modifications sur &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Ajouter un motif d&apos;exclusion</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Ajoutez un nouveau motif d&apos;exclusion :</translation>
</message>
@@ -4531,12 +4531,12 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="454"/>
<source>%n day(s) ago</source>
- <translation type="unfinished"><numerusform>Hier</numerusform><numerusform></numerusform><numerusform>Il y a %n jours</numerusform></translation>
+ <translation><numerusform>Hier</numerusform><numerusform>Il y a %n jours</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="462"/>
<source>%n hour(s) ago</source>
- <translation type="unfinished"><numerusform>Il y a %n heure</numerusform><numerusform></numerusform><numerusform>Il y a %n heures</numerusform></translation>
+ <translation><numerusform>Il y a %n heure</numerusform><numerusform>Il y a %n heures</numerusform></translation>
</message>
<message>
<location filename="../src/common/utility.cpp" line="467"/>
@@ -4551,7 +4551,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="472"/>
<source>%n minute(s) ago</source>
- <translation type="unfinished"><numerusform>Il y a %n minute</numerusform><numerusform></numerusform><numerusform>Il y a %n minutes</numerusform></translation>
+ <translation><numerusform>Il y a %n minute</numerusform><numerusform>Il y a %n minutes</numerusform></translation>
</message>
<message>
<location filename="../src/common/utility.cpp" line="475"/>
@@ -4649,32 +4649,32 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="324"/>
<source>%n year(s)</source>
- <translation type="unfinished"><numerusform>%n an</numerusform><numerusform></numerusform><numerusform>%n ans</numerusform></translation>
+ <translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="325"/>
<source>%n month(s)</source>
- <translation type="unfinished"><numerusform>%n mois</numerusform><numerusform></numerusform><numerusform>%n mois</numerusform></translation>
+ <translation><numerusform>%n mois</numerusform><numerusform>%n mois</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="326"/>
<source>%n day(s)</source>
- <translation type="unfinished"><numerusform>%n jour</numerusform><numerusform></numerusform><numerusform>%n jours</numerusform></translation>
+ <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="327"/>
<source>%n hour(s)</source>
- <translation type="unfinished"><numerusform>%n heure</numerusform><numerusform></numerusform><numerusform>%n heures</numerusform></translation>
+ <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="328"/>
<source>%n minute(s)</source>
- <translation type="unfinished"><numerusform>%n minute</numerusform><numerusform></numerusform><numerusform>%n minutes</numerusform></translation>
+ <translation><numerusform>%n minute</numerusform><numerusform>%n minutes</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="329"/>
<source>%n second(s)</source>
- <translation type="unfinished"><numerusform>%n seconde</numerusform><numerusform></numerusform><numerusform>%n secondes</numerusform></translation>
+ <translation><numerusform>%n seconde</numerusform><numerusform>%n secondes</numerusform></translation>
</message>
<message>
<location filename="../src/common/utility.cpp" line="353"/>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 8b70611cb..2b617eea4 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -1080,41 +1080,41 @@ File synchronization desktop utility.</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<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="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<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="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1127,7 +1127,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="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1138,7 +1138,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1148,17 +1148,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -1346,62 +1346,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Hai conflitos sen resolver. Prema para obter máis detalles.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Comprobando os cambios no cartafol remoto «%1»</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Comprobando os cambios no cartafol local «%1»</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Reconciliando os cambios</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, «%1»</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>«%1»</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>descargar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>enviar %1/s</translation>
@@ -1412,46 +1412,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>Restan %5, %1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>ficheiro %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Agardando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
@@ -1876,12 +1876,12 @@ Os elementos onde se permite a eliminación eliminaranse se impiden que se elimi
<translation>Non é posíbel escribir os cambios en «%1».</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Engadir o patrón a ignorar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Engadir un novo patrón a ignorar:</translation>
</message>
diff --git a/translations/client_he.ts b/translations/client_he.ts
index 224aca3bc..623eede35 100644
--- a/translations/client_he.ts
+++ b/translations/client_he.ts
@@ -4,17 +4,17 @@
<message>
<location filename="../src/gui/commonstrings.cpp" line="27"/>
<source>file manager</source>
- <translation type="unfinished"/>
+ <translation>מנהל הקבצים</translation>
</message>
<message>
<location filename="../src/gui/commonstrings.cpp" line="33"/>
<source>Show in %1</source>
- <translation type="unfinished"/>
+ <translation>הצגה עם %1</translation>
</message>
<message>
<location filename="../src/gui/commonstrings.cpp" line="38"/>
<source>Show in web browser</source>
- <translation type="unfinished"/>
+ <translation>הצגה בדפדפן</translation>
</message>
<message>
<location filename="../src/gui/commonstrings.cpp" line="43"/>
@@ -98,7 +98,7 @@
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="309"/>
<source>Failed to send crash info.</source>
- <translation type="unfinished"/>
+ <translation>שליחת פרטי הקריסה נכשלה.</translation>
</message>
</context>
<context>
@@ -130,7 +130,7 @@
<message>
<location filename="../src/libsync/filesystem.cpp" line="175"/>
<source>Could not remove folder</source>
- <translation type="unfinished"/>
+ <translation>לא ניתן להסיר את התיקייה</translation>
</message>
</context>
<context>
@@ -314,7 +314,7 @@
<message>
<location filename="../src/gui/accountsettings.ui" line="42"/>
<source>Connected with &lt;server&gt; as &lt;user&gt;</source>
- <translation>חיבור של ה- &lt;server&gt; כ- &lt;user&gt;</translation>
+ <translation>נכנסת עם &lt;server&gt; בתור &lt;user&gt;</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="182"/>
@@ -447,7 +447,7 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/accountsettings.cpp" line="873"/>
<source>No connection to %1 at %2.</source>
- <translation>אין חיבור ל- %1 ב- %2.</translation>
+ <translation>אין חיבור אל %1 ב־%2.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="912"/>
@@ -488,7 +488,7 @@ This action will abort any currently running synchronization.</source>
<location filename="../src/gui/accountsettings.cpp" line="201"/>
<location filename="../src/gui/accountsettings.cpp" line="914"/>
<source>Log out</source>
- <translation>התנתקות</translation>
+ <translation>יציאה</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="348"/>
@@ -503,7 +503,7 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/accountsettings.cpp" line="361"/>
<source>Enable virtual file support%1...</source>
- <translation>הפעלת תמיכה בקובץ וירטואלי %1...</translation>
+ <translation>הפעלת תמיכה בקובץ וירטואלי %1…</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="361"/>
@@ -513,7 +513,7 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/accountsettings.cpp" line="510"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
- <translation>&lt;p&gt;האם באמת להפסיק את סנכרון התיקייה &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;הערה:&lt;/b&gt; פעולה זו &lt;b&gt;לא&lt;/b&gt; תמחק אף קובץ.&lt;/p&gt;</translation>
+ <translation>&lt;p&gt;להפסיק את סנכרון התיקייה &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;הערה:&lt;/b&gt; פעולה זו &lt;b&gt;לא&lt;/b&gt; תמחק אף קובץ.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="798"/>
@@ -543,7 +543,7 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/accountsettings.cpp" line="878"/>
<source>Server configuration error: %1 at %2.</source>
- <translation>שגיאת תצורת שרת: %1 ב- %2.</translation>
+ <translation>שגיאת תצורת שרת: %1 ב־%2.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="889"/>
@@ -1080,41 +1080,41 @@ File synchronization desktop utility.</source>
<translation>פעילות סנכרון</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>לא ניתן היה לקרוא את קובץ הלא כלולים במערכת</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>נוספה תיקייה של אחסון חיצוני.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1127,7 +1127,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1138,7 +1138,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1147,17 +1147,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>הסרת כל הקבצים?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>הסרת כל הקבצים</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>השארת הקבצים</translation>
</message>
@@ -1345,62 +1345,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>קיימות סתירות לא פתורות. ניתן ללחוץ לפרטים.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>בודק לשינויים ב- &apos;%1&apos; מרוחק</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>בודק לשינויים ב- &apos;%1&apos; מקומי</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>מסדיר שינויים</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>מסנכרן %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>בהורדה %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>בהעלאה %1/s</translation>
@@ -1411,46 +1411,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 מתוך %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 נשארו, %1 מתוך %2, קובץ %3 מתוך %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 מתוך %2, קובץ %3 מתוך %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>קובץ %1 מתוך %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>המתנה...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>מכין סנכרון...</translation>
</message>
@@ -1875,12 +1875,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>לא ניתן לכתוב שינויים אל &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>הוספת תבנית התעלמות</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>הוספת תבנית התעלמות חדשה:</translation>
</message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 2ad260f04..51e56d1cd 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -1080,19 +1080,19 @@ File synchronization desktop utility.</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<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="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una nuova cartella da un&apos;archiviazione esterna è stata aggiunta.
@@ -1100,22 +1100,22 @@ File synchronization desktop utility.</source>
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1128,7 +1128,7 @@ Ciò significa che il client di sincronizzazione potrebbe non inviare le modific
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1139,7 +1139,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1148,17 +1148,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -1346,62 +1346,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Ci sono conflitti irrisolti. Clicca per ulteriori dettagli. </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Controllo per cambiamenti in &apos;%1&apos; remoto</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Controllo cambiamenti in &apos;%1 &apos; locale</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Riconciliazione dei cambiamenti</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Sincronizzazione di %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>ricezione %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>invio %1/s</translation>
@@ -1412,46 +1412,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 di %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 rimanenti, %1 di %2, file %3 di %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 di %2, file %3 di %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>file %1 di %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Attendere...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Preparazione della sincronizzazione...</translation>
</message>
@@ -1876,12 +1876,12 @@ Gli elementi per i quali è consentita l&apos;eliminazione, saranno eliminati se
<translation>Impossibile scrivere le modifiche in &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Aggiungi modello Ignora</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Aggiungi un nuovo modello di esclusione:</translation>
</message>
diff --git a/translations/client_ko.ts b/translations/client_ko.ts
index 9f8b6653f..460e29014 100644
--- a/translations/client_ko.ts
+++ b/translations/client_ko.ts
@@ -1077,41 +1077,41 @@ File synchronization desktop utility.</source>
<translation>동기화 활동</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>시스템 제외 파일을 읽을 수 없음</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>%1MB 보다 큰 새 폴더 추가됨: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>외부 저장소에 있는 폴더가 추가되었습니다.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1120,7 +1120,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="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1131,7 +1131,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1140,17 +1140,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>모든 파일을 삭제하시겠습니까?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>모든 파일 삭제</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>파일 유지</translation>
</message>
@@ -1338,62 +1338,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>해결하지 못한 충돌 사항이 있습니다. 자세한 정보를 보려면 누르십시오.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>원격 &apos;%1&apos; 에서의 변경 내용 점검 중</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>로컬 &apos;%1&apos; 에서의 변경 내용 점검 중</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>변경 사항 조정 중</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>%1 동기화 중</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>다운로드 %1/초</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>업로드 %1/초</translation>
@@ -1404,46 +1404,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>로컬 폴더: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%2 %1 중(%4 중 %3)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%2 %1 중</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 남음, %2 중 %1, %4 중 %3 파일</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%2 중 %1, 파일 %4 중 %3</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>파일 %2 중 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>대기 중...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>다른 폴더 %n개 대기 중...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>동기화 준비 중...</translation>
</message>
@@ -1864,12 +1864,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>&apos;%1&apos;에 변경 사항을 저장할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>무시 패턴 추가</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>새 무시 패턴 추가:</translation>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index 3655795aa..91ad00706 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -1080,41 +1080,41 @@ File synchronization desktop utility.</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<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="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<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="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>De map %1 werd aangemaakt maar eerder ook uitgesloten van synchronisatie. Data erin zullen niet worden gesynchroniseerd.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Het bestand %1 is aangemaakt maar was eerder uitgesloten van synchronisatie. Dit bestand zal niet gesynchroniseerd worden.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1127,7 +1127,7 @@ Dit betekent dat de synchronisatie-applicatie lokale wijzigingen mogelijk niet d
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1138,7 +1138,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1146,17 +1146,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -1345,62 +1345,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Er zijn onopgeloste conflicten. Klik voor details.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Aan het controleren op wijzigingen in afstandelijke locatie &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Aan het controleren op veranderingen in lokale &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Wijzigingen doorvoeren</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Synchroniseren %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>download %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>upload %1/s</translation>
@@ -1411,46 +1411,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Lokale map: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 van %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 over, %1 van %2, bestand %3 van %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 van %2, bestand %3 van %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>bestand %1 van %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Aan het wachten...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Voorbereiden op sync...</translation>
</message>
@@ -1879,12 +1879,12 @@ Items waar verwijderen is toegestaan zullen gewist worden als ze voorkomen dat e
<translation>Er kunnen geen wijzigingen worden geschreven naar %1</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Negeerpatroon toevoegen</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Voeg nieuw negeerpatroon toe:</translation>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index aa25f8bb9..a51f04cf3 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -24,7 +24,7 @@
<message numerus="yes">
<location filename="../src/gui/commonstrings.cpp" line="48"/>
<source>%n Filter(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n Filtro(s):</numerusform><numerusform>%n Filtro(s)</numerusform></translation>
</message>
</context>
<context>
@@ -786,7 +786,7 @@ Utilitário de sincronização de arquivos na área de trabalho. </translation>
<location filename="../src/gui/application.cpp" line="585"/>
<source>For more information, see %1</source>
<comment>link to homepage</comment>
- <translation type="unfinished"/>
+ <translation>Para mais informações, veja %1</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="599"/>
@@ -1081,41 +1081,41 @@ Utilitário de sincronização de arquivos na área de trabalho. </translation>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<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="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<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="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1128,7 +1128,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="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1139,24 +1139,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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 &apos;%1&apos; 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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -1346,62 +1346,62 @@ Considere remover esta pasta da conta e adicioná-la novamente.</translation>
<translation>Existem conflitos não resolvidos. Clique para detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Verificando alterações remotamente &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Verificação de alterações no local &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Reconciliando mudanças</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>baixar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>enviar %1/s</translation>
@@ -1412,46 +1412,46 @@ Considere remover esta pasta da conta e adicioná-la novamente.</translation>
<translation>Pasta local: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%5 restando, %1 de %2, arquivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 de%2, arquivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>arquivo %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Esperando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
@@ -1548,7 +1548,7 @@ Considere remover esta pasta da conta e adicioná-la novamente.</translation>
<message>
<location filename="../src/gui/folderwizard.cpp" line="438"/>
<source>This folder can&apos;t be synced. Please choose another one.</source>
- <translation type="unfinished"/>
+ <translation>Esta pasta não pode ser sincronizada. Por favor escolha outra.</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="441"/>
@@ -1589,17 +1589,17 @@ Considere remover esta pasta da conta e adicioná-la novamente.</translation>
<message>
<location filename="../src/gui/folderwizard.cpp" line="50"/>
<source>&lt;b&gt;Error:&lt;/b&gt; %1</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;Erro:&lt;/b&gt; %1</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="56"/>
<source>&lt;b&gt;Error:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;Erro:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="56"/>
<source>&lt;b&gt;Warning:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;Alerta:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</translation>
</message>
</context>
<context>
@@ -1876,12 +1876,12 @@ Os itens em que a exclusão é permitida serão excluídos se impedirem que um d
<translation>Não é possível gravar as alterações em &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Adicionar Ignorar Padrão</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Adicionar um novo padrão ignorar:</translation>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 1d8d015a4..df9f612b0 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -1081,41 +1081,41 @@ File synchronization desktop utility.</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>Невозможно прочесть системный файл исключений</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>Добавлен каталог из внешнего хранилища.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1128,7 +1128,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1139,7 +1139,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1148,17 +1148,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -1348,62 +1348,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Есть неразрешенные конфликты. Нажми для просмотра подробностей.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Проверяю измененеия в удалённом &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Проверяю изменения в локальном &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Согласование изменений</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Синхронизация %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>скачивание %1/с</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/с</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/с</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>загрузка %1/с</translation>
@@ -1414,46 +1414,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Локальный каталог: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 из %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>Осталось %5, %1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>файл %1 из %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Ожидание...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Подготовка к синхронизации...</translation>
</message>
@@ -1878,12 +1878,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>Невозможно записать изменения в &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Добавить шаблон игнорирования</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Добавить новый шаблон игнорирования:</translation>
</message>
diff --git a/translations/client_sq.ts b/translations/client_sq.ts
index 2039fb7bd..40a5aad99 100644
--- a/translations/client_sq.ts
+++ b/translations/client_sq.ts
@@ -1081,41 +1081,41 @@ Mjet njëkohësimi kartelash për desktop.</translation>
<translation>Veprimtari Njëkohësimesh</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>S’u lexua dot kartelë përjashtimi sistemi</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>U shtua një dosje më e madhe se %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>U shtua një dosje nga një depozitë e jashtme.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Ju lutemi, shkoni te rregullimet që ta përzgjidhni, nëse doni ta shkarkoni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Dosja %1 qe krijuar, por qe përjashtuar më herët nga njëkohësimi. Të dhënat brenda saj nuk do të njëkohësohen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Dosja %1 qe krijuar, por qe përjashtuar më herët nga njëkohësimi. S’do të njëkohësohet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1128,7 +1128,7 @@ Kjo do të thotë që klienti i njëkohësimeve mund të mos ngarkojë menjëher
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1139,7 +1139,7 @@ Nëse vendosni t’i mbani këto kartela, ato do të rinjëkohësohen me shërby
Nëse vendosni t’i fshini këto kartela, s’do të mund t’i keni, veç në mos qofshi i zoti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1148,17 +1148,17 @@ Jeni i sigurt se doni të njëkohësohen këto veprime me shërbyesin?
Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëkohësohen me shërbyesin.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Të hiqen Krejt Kartelat?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Hiqi krejt kartelat</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Mbaji kartelat</translation>
</message>
@@ -1348,62 +1348,62 @@ Ju lutemi, shihni mundësinë e heqjes së kësaj dosjeje nga llogaria dhe të s
<translation>Ka përplasje të pazgjidhura. Klikoni për hollës.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Po kërkohet për ndryshime te shërbyesi i largët &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Po kërkohet për ndryshime te shërbyesi vendor &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Po pajtohen ndryshimet mes tyre</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>Po njëkohësohet %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>shkarko %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>ngarko %1/s</translation>
@@ -1414,46 +1414,46 @@ Ju lutemi, shihni mundësinë e heqjes së kësaj dosjeje nga llogaria dhe të s
<translation>Dosje vendore: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 nga %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>edhe %5, %1 nga %2, kartela %3 nga %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 nga %2, kartela %3 nga %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>kartela %1 nga %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Po pritet…</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Po pritet për %n dosje tjetër…</numerusform><numerusform>Po pritet për %n dosje të tjera…</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Po përgatitet për njëkohësim…</translation>
</message>
@@ -1878,12 +1878,12 @@ Objektet mbi të cilët lejohet fshirja do të fshihen, nëse pengojnë heqjen e
<translation>S’shkruhen dot ndryshimet te &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Shtoni Mostër Shpërfilljeje</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Shtoni një mostër të re shpërfilljeje:</translation>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index e7ff853e2..62273997a 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -1081,41 +1081,41 @@ File synchronization desktop utility.</source>
<translation>ความเคลื่อนไหวของการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>โฟลเดอร์ที่มีพื้นที่จัดเก็บข้อมูลภายนอกได้ถูกเพิ่ม
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1126,7 +1126,7 @@ This means that the synchronization client might not upload local changes immedi
หมายความว่าการประสานข้อมูลของไคลเอ็นต์อาจยังไม่ได้อัปโหลดการเปลี่ยนแปลงในระบบทันทีและจะสแกนเฉพาะการเปลี่ยนแปลงในเครื่องและอัปโหลดไฟล์เหล่านั้นเป็นครั้งคราว (ทุกสองชั่วโมงตามค่าเริ่มต้น)</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1137,7 +1137,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1147,17 +1147,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>ลบไฟล์ทั้งหมด?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>ลบไฟล์ทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>เก็บไฟล์เอาไว้</translation>
</message>
@@ -1345,62 +1345,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>มีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข คลิกเพื่อดูรายละเอียด</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>กำลังตรวจหาการเปลี่ยนแปลงในรีโมต &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>กำลังตรวจหาการเปลี่ยนแปลงในเครื่อง &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>คืนค่าการเปลี่ยนแปลง</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>กำลังประสานข้อมูล %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>หรือ</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>ดาวน์โหลด %1/วินาที</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/วินาที</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>อัปโหลด %1/s</translation>
@@ -1411,46 +1411,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>โฟลเดอร์ในเครื่อง: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 ของ %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>เหลืออีก %5 ไฟล์, %1 ไฟล์จาก %2, %3 ไฟล์จาก %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 จาก %2, %3 จาก %4 ไฟล์</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>ไฟล์ %1 จาก %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>โปรดรอสักครู่...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>กำลังรออีก (%n) โฟลเดอร์...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>กำลังเตรียมพร้อมในการประสานข้อมูล</translation>
</message>
@@ -1875,12 +1875,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>ไม่สามารถเขียนเปลี่ยนเป็น &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>เพิ่มการละเว้นรูปแบบ</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>เพิ่มการละเว้นรูปแบบใหม่:</translation>
</message>
@@ -2864,7 +2864,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="281"/>
<source>Failed to rename file</source>
- <translation type="unfinished"/>
+ <translation>ไม่สามารถเปลี่ยนชื่อไฟล์</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="287"/>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 49c27a827..e4a196413 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -1080,41 +1080,41 @@ File synchronization desktop utility.</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>Sistem hariç tutulma dosyası okunamadı</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<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="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>İndirmek isterseniz, lütfen &quot;Ayarlar&quot; bölümünden seçin.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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 eşitlenmeyecek.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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, İçerik eşitlenmeyecek.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1127,7 +1127,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="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1138,7 +1138,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1147,17 +1147,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -1345,62 +1345,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>Çözüm gereken eşleşmeler var. Detaylar için tıklayın.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Uzaktaki &apos;%1&apos; için değişiklikler kontrol ediliyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Yereldeki &apos;%1&apos; için değişiklikler kontrol ediliyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>Değişikliklerin bağlama kavuşturulması</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>%1 eşitleniyor</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>indirme %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/sn</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/sn</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>gönderme %1/s</translation>
@@ -1411,46 +1411,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>Kalan %5, %1/%2, dosya %3/%4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1/%2, %3/%4 dosya</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>dosya %1/%2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>Bekleniyor...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<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="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>Eşitleme için hazırlanıyor...</translation>
</message>
@@ -1875,12 +1875,12 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir
<translation>Değişiklikler &apos;%1&apos; üzerine yazılamıyor.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>Yoksayma Deseni Ekle</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>Yeni bir yoksayma deseni ekle:</translation>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 503b4bb0c..aa3246afd 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -4,12 +4,12 @@
<message>
<location filename="../src/gui/commonstrings.cpp" line="27"/>
<source>file manager</source>
- <translation type="unfinished"/>
+ <translation>文件管理器</translation>
</message>
<message>
<location filename="../src/gui/commonstrings.cpp" line="33"/>
<source>Show in %1</source>
- <translation type="unfinished"/>
+ <translation>显示在 %1</translation>
</message>
<message>
<location filename="../src/gui/commonstrings.cpp" line="38"/>
@@ -24,7 +24,7 @@
<message numerus="yes">
<location filename="../src/gui/commonstrings.cpp" line="48"/>
<source>%n Filter(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>%n 筛选 (s)</numerusform></translation>
</message>
</context>
<context>
@@ -32,12 +32,12 @@
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="29"/>
<source>Tomahawk Crash Reporter</source>
- <translation type="unfinished"/>
+ <translation>Tomahawk 崩溃报告</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="104"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="213"/>
@@ -57,14 +57,14 @@
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.ui" line="284"/>
<source>You can disable sending crash reports in the configuration dialog.</source>
- <translation type="unfinished"/>
+ <translation>你可以在配置对话框中禁用发送崩溃报告。</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="112"/>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="119"/>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="155"/>
<source>We cannot gather useful debug information on your system.</source>
- <translation type="unfinished"/>
+ <translation>我们无法在你的系统上收集有用的调试信息。</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="113"/>
@@ -78,22 +78,22 @@
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="148"/>
<source>Ready to send debug information (&lt;a href=&quot;%1&quot;&gt;view backtrace&lt;/a&gt;).</source>
- <translation type="unfinished"/>
+ <translation>准备发送调试信息(&lt;a href=&quot;%1&quot;&gt;查看回溯&lt;/a&gt;)。</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="164"/>
<source>Gathering debug information...</source>
- <translation type="unfinished"/>
+ <translation>正在收集调试信息...</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="273"/>
<source>Uploaded %L1 of %L2 KB.</source>
- <translation type="unfinished"/>
+ <translation>已上传 %L1,共 %L2 KB。</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="300"/>
<source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;. Please refer to crash &lt;a href=&quot;clipboard://%1&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/a&gt; (click to copy) in bug reports.</source>
- <translation type="unfinished"/>
+ <translation>发送! &lt;b&gt;非常感谢&lt;/b&gt;。 请参阅错误报告中的崩溃 &lt;a href=&quot;clipboard://%1&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/a&gt;(单击以复制)。</translation>
</message>
<message>
<location filename="../src/3rdparty/libcrashreporter-qt/src/libcrashreporter-gui/CrashReporter.cpp" line="309"/>
@@ -109,7 +109,7 @@
<location filename="../src/common/filesystembase.cpp" line="208"/>
<location filename="../src/common/filesystembase.cpp" line="213"/>
<source>Can&apos;t rename %1, the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>无法重命名 %1,该文件当前正在使用中</translation>
</message>
<message>
<location filename="../src/common/filesystembase.cpp" line="398"/>
@@ -130,7 +130,7 @@
<message>
<location filename="../src/libsync/filesystem.cpp" line="175"/>
<source>Could not remove folder</source>
- <translation type="unfinished"/>
+ <translation>无法删除文件夹</translation>
</message>
</context>
<context>
@@ -388,7 +388,11 @@
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>此操作将禁用虚拟文件支持。 因此,当前标记为“仅在线可用”的文件夹的内容将被下载。
+
+禁用虚拟文件支持的唯一优点是选择性同步功能将再次可用。
+
+此操作将中止任何当前正在运行的同步。</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="611"/>
@@ -499,7 +503,7 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/accountsettings.cpp" line="361"/>
<source>Enable virtual file support%1...</source>
- <translation type="unfinished"/>
+ <translation>启用虚拟文件支持%1...</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="361"/>
@@ -552,17 +556,17 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/accountstate.cpp" line="73"/>
<source>Url update requested for %1</source>
- <translation type="unfinished"/>
+ <translation>为 %1 请求了 URL 更新</translation>
</message>
<message>
<location filename="../src/gui/accountstate.cpp" line="74"/>
<source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source>
- <translation type="unfinished"/>
+ <translation>%1 的 url 从 %2 更改为 %3,您要接受更改后的 url 吗?</translation>
</message>
<message>
<location filename="../src/gui/accountstate.cpp" line="77"/>
<source>Change url permanently to %1</source>
- <translation type="unfinished"/>
+ <translation>将 url 永久更改为 %1</translation>
</message>
<message>
<location filename="../src/gui/accountstate.cpp" line="78"/>
@@ -620,7 +624,7 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/models/activitylistmodel.cpp" line="88"/>
<source>%1 %2 on %3</source>
- <translation type="unfinished"/>
+ <translation>%1 %2 在 %3</translation>
</message>
<message>
<location filename="../src/gui/models/activitylistmodel.cpp" line="114"/>
@@ -706,17 +710,17 @@ This action will abort any currently running synchronization.</source>
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="300"/>
<source>%n notifications(s) for %1.</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>%1 的 %n 个通知。</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="306"/>
<source>%n notifications(s) for %1 and %2.</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>%1 和 %2 的 %n 个通知。</numerusform></translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="308"/>
<source>New notifications for %1, %2 and other accounts.</source>
- <translation type="unfinished"/>
+ <translation>%1、%2 和其他帐户的新通知。</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="311"/>
@@ -744,7 +748,7 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/application.cpp" line="182"/>
<source>Some settings were configured in newer versions of this client and use features that are not available in this version.&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;The current configuration file was already backed up to &lt;i&gt;%2&lt;/i&gt;.</source>
- <translation type="unfinished"/>
+ <translation>在此客户端的较新版本中配置了一些设置,并使用了此版本中不可用的功能。&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;当前配置文件已备份到 &lt;i&gt;%2&lt;/i&gt;。</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="189"/>
@@ -775,13 +779,14 @@ This action will abort any currently running synchronization.</source>
<location filename="../src/gui/application.cpp" line="580"/>
<source>%1 version %2<byte value="xd"/>
File synchronization desktop utility.</source>
- <translation type="unfinished"/>
+ <translation>%1 版本 %2&lt;byte value=&quot;xd&quot;/&gt;
+文件同步桌面实用程序。</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="585"/>
<source>For more information, see %1</source>
<comment>link to homepage</comment>
- <translation type="unfinished"/>
+ <translation>有关详细信息,请参阅 %1</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="599"/>
@@ -806,7 +811,7 @@ File synchronization desktop utility.</source>
<message>
<location filename="../src/gui/application.cpp" line="603"/>
<source>Remove logs older than &lt;hours&gt; hours (to be used with --logdir).</source>
- <translation type="unfinished"/>
+ <translation>删除超过&lt;hours&gt;小时的日志(与 --logdir 一起使用)。</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="604"/>
@@ -842,7 +847,7 @@ File synchronization desktop utility.</source>
<message>
<location filename="../src/gui/application.cpp" line="612"/>
<source>[&lt;vfs file&gt;]</source>
- <translation type="unfinished"/>
+ <translation>[&lt;vfs file&gt;]</translation>
</message>
<message>
<location filename="../src/gui/application.cpp" line="641"/>
@@ -1017,12 +1022,12 @@ File synchronization desktop utility.</source>
<message>
<location filename="../src/gui/folder.cpp" line="195"/>
<source>%1 failed to open the database.</source>
- <translation type="unfinished"/>
+ <translation>%1 未能打开数据库。</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="206"/>
<source>%1 is not writable.</source>
- <translation type="unfinished"/>
+ <translation>%1 不可写。</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="476"/>
@@ -1076,50 +1081,54 @@ File synchronization desktop utility.</source>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>无法读取系统排除的文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>一个来自外部存储的文件夹已被添加。
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
- <translation type="unfinished"/>
+ <translation>文件夹 %1 已创建,但之前已从同步中排除。 里面的数据不会同步。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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>无法可靠地跟踪同步文件夹中的更改。
+
+这意味着同步客户端可能不会立即上传本地更改,而只会扫描本地更改并偶尔上传(默认每两小时一次)。
+
+%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1130,7 +1139,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1139,17 +1148,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>删除所有文件?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -1234,7 +1243,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="1398"/>
<source>The folder %1 is used in a folder sync connection!</source>
- <translation type="unfinished"/>
+ <translation>文件夹 %1 用于文件夹同步连接!</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1405"/>
@@ -1269,14 +1278,16 @@ 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="1467"/>
<source>%1 Please pick another one!</source>
- <translation type="unfinished"/>
+ <translation>%1 请再选一个!</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1546"/>
<source>Multiple accounts are sharing the folder %1.
This configuration is know to lead to dataloss and is no longer supported.
Please consider removing this folder from the account and adding it again.</source>
- <translation type="unfinished"/>
+ <translation>多个帐户正在共享文件夹 %1。
+已知此配置会导致数据丢失,因此不再受支持。
+请考虑从帐户中删除此文件夹并重新添加。</translation>
</message>
</context>
<context>
@@ -1337,62 +1348,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>有未解决的冲突。点击显示详细信息。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>检查远端文件 &apos;%1&apos; 的变动</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>检查本地文件 &apos;%1&apos; 的变动</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>调整变更</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>正在同步 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>下载 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/秒</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/秒</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>上传 %1/s</translation>
@@ -1400,49 +1411,49 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="272"/>
<source>Local folder: %1</source>
- <translation type="unfinished"/>
+ <translation>本地文件夹: %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 / %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>剩余: %5,%1 / %2, 文件数量 %3 / %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 of %2, file %3 of %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>第 %1 个文件,共 %2 个</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>请稍等...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>等待 %n 个其他文件(文件夹)</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>准备同步...</translation>
</message>
@@ -1539,7 +1550,7 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderwizard.cpp" line="438"/>
<source>This folder can&apos;t be synced. Please choose another one.</source>
- <translation type="unfinished"/>
+ <translation>无法同步此文件夹。 请选择另一个。</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="441"/>
@@ -1549,7 +1560,7 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderwizard.cpp" line="443"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
- <translation type="unfinished"/>
+ <translation>您已经在同步 &lt;i&gt;%1&lt;/i&gt;,它是 &lt;i&gt;%2&lt;/i&gt; 的子文件夹。</translation>
</message>
</context>
<context>
@@ -1557,7 +1568,7 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderwizard.cpp" line="485"/>
<source>Use virtual files instead of downloading content immediately%1</source>
- <translation type="unfinished"/>
+ <translation>使用虚拟文件而不是立即下载内容%1</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="485"/>
@@ -1580,17 +1591,17 @@ Please consider removing this folder from the account and adding it again.</sour
<message>
<location filename="../src/gui/folderwizard.cpp" line="50"/>
<source>&lt;b&gt;Error:&lt;/b&gt; %1</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;错误:&lt;/b&gt;%1</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="56"/>
<source>&lt;b&gt;Error:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;错误:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="56"/>
<source>&lt;b&gt;Warning:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;警告:&lt;/b&gt;&lt;ul&gt;%1&lt;/ul&gt;</translation>
</message>
</context>
<context>
@@ -1784,7 +1795,7 @@ Note that this selects only what pool upgrades are taken from, and that there ar
<message>
<location filename="../src/gui/generalsettings.cpp" line="336"/>
<source>unknown (%1)</source>
- <translation type="unfinished"/>
+ <translation>未知 (%1)</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="320"/>
@@ -1852,7 +1863,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>匹配模式的文件或文件夹将不会同步。 更改将在下次同步文件夹时生效。
+
+如果允许删除的项目阻止删除目录,则将删除它们。 这对元数据很有用。</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="112"/>
@@ -1865,12 +1878,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>无法向 %1 中写入修改。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>增加忽略模式</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>增加新的忽略模式:</translation>
</message>
@@ -1910,7 +1923,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/issueswidget.cpp" line="174"/>
<source>The file %1 was ignored as its name is reserved by %2</source>
- <translation type="unfinished"/>
+ <translation>文件 %1 被忽略,因为它的名称由 %2 保留</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.cpp" line="204"/>
@@ -1956,7 +1969,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/logbrowser.ui" line="53"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;The logs contain sensitive information which you should not make publicly available&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;日志包含您不应公开的敏感信息&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.ui" line="71"/>
@@ -1998,7 +2011,7 @@ Note that using any logging command line options will override the settings.</so
<message>
<location filename="../src/gui/models/models.cpp" line="93"/>
<source>%1 Filter:</source>
- <translation type="unfinished"/>
+ <translation>%1 筛选器:</translation>
</message>
<message>
<location filename="../src/gui/models/models.cpp" line="114"/>
@@ -2008,12 +2021,12 @@ Note that using any logging command line options will override the settings.</so
<message>
<location filename="../src/gui/issueswidget.cpp" line="258"/>
<source>Reset Filters</source>
- <translation type="unfinished"/>
+ <translation>重置筛选器</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.cpp" line="349"/>
<source>Status Filter:</source>
- <translation type="unfinished"/>
+ <translation>筛选器状态:</translation>
</message>
</context>
<context>
@@ -2229,13 +2242,14 @@ Note that using any logging command line options will override the settings.</so
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="273"/>
<source>Unsupported token type: %1</source>
- <translation type="unfinished"/>
+ <translation>不支持的令牌类型:%1</translation>
</message>
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
- <translation type="unfinished"/>
+ <translation>服务器的回复未包含所有预期字段
+:%1</translation>
</message>
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="277"/>
@@ -2245,7 +2259,7 @@ Note that using any logging command line options will override the settings.</so
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="301"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;h1&gt;登录错误&lt;/h1&gt; &lt;p&gt;检索用户信息失败&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/libsync/creds/oauth.cpp" line="553"/>
@@ -2304,7 +2318,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="166"/>
<source>New %1 available. Please click &lt;a href=&apos;%2&apos;&gt;here&lt;/a&gt; to download the new AppImage manually.</source>
- <translation type="unfinished"/>
+ <translation>新的 %1 可用。 请点击&lt;a href=&apos;%2&apos;&gt;此处&lt;/a&gt;手动下载新的 AppImage。</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="169"/>
@@ -2357,12 +2371,12 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="84"/>
<source>Use &amp;virtual files instead of downloading content immediately%1</source>
- <translation type="unfinished"/>
+ <translation>使用虚拟文件而不是立即下载内容%1</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source>&lt;p&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/p&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;p&gt;&lt;strong&gt;警告:&lt;/strong&gt;本地文件夹不为空。 选择一个决议!&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="163"/>
@@ -2432,7 +2446,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>文件 %1 当前正在使用中</translation>
</message>
</context>
<context>
@@ -2548,7 +2562,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>当启用“虚拟文件”模式时,最初不会下载任何文件。 相反,将为服务器上存在的每个文件创建一个微小的“%1”文件。 可以通过运行这些文件或使用它们的上下文菜单来下载内容。
+
+虚拟文件模式与选择性同步是互斥的。 当前未选择的文件夹将被转换为仅在线文件夹,并且您的选择性同步设置将被重置。
+
+切换到此模式将中止任何当前正在运行的同步。
+
+这是一种新的实验模式。 如果您决定使用它,请报告出现的任何问题。</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="277"/>
@@ -2694,12 +2714,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>更新元数据时出错: %1</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
- <translation type="unfinished"/>
+ <translation>%1 文件夹当前正在使用中</translation>
</message>
</context>
<context>
@@ -2707,13 +2727,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="369"/>
<source>Failed to free up space, the file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>未能释放空间,文件 %1 当前正在使用中</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<location filename="../src/libsync/propagatedownload.cpp" line="462"/>
<source>File %1 can not be downloaded because of a local file name clash with %2!</source>
- <translation type="unfinished"/>
+ <translation>由于本地文件名与 %2 冲突,无法下载文件 %1!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="520"/>
@@ -2733,7 +2753,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="707"/>
<source>Broken webserver returned empty content length for non-empty file on resume</source>
- <translation type="unfinished"/>
+ <translation>损坏的网络服务器在简历上返回了非空文件的空内容长度</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="714"/>
@@ -2748,12 +2768,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="901"/>
<source>File %1 cannot be saved because of a local file name clash with %2!</source>
- <translation type="unfinished"/>
+ <translation>由于本地文件名与 %2 冲突,无法保存文件 %1!</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1023"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>更新元数据时出错: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="470"/>
@@ -2761,7 +2781,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<location filename="../src/libsync/propagatedownload.cpp" line="961"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1026"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>文件 %1 当前正在使用中</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="364"/>
@@ -2788,17 +2808,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="176"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
- <translation type="unfinished"/>
+ <translation>由于本地文件名与 %2 冲突,无法创建本地文件夹 %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="195"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>更新元数据时出错: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>文件 %1 当前正在使用中</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="182"/>
@@ -2811,18 +2831,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="79"/>
<source>%1 failed with: %2</source>
- <translation type="unfinished"/>
+ <translation>%1 失败:%2</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="109"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
- <translation type="unfinished"/>
+ <translation>由于本地文件名与 %2 冲突,无法删除 %1!</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="89"/>
<location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>%1 the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>%1 文件当前正在使用中</translation>
</message>
</context>
<context>
@@ -2835,27 +2855,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>无法将 %1 重命名为 %2,该文件当前正在使用中</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>更新元数据时出错: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="275"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>文件 %1 当前正在使用中</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="281"/>
<source>Failed to rename file</source>
- <translation type="unfinished"/>
+ <translation>重命名文件失败</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="287"/>
<source>Error setting pin state</source>
- <translation type="unfinished"/>
+ <translation>设置引脚状态错误</translation>
</message>
</context>
<context>
@@ -2876,7 +2896,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="143"/>
<source>Error writing metadata to the database: %1</source>
- <translation type="unfinished"/>
+ <translation>将元数据写入数据库时出错: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="187"/>
@@ -2899,12 +2919,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="220"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>更新元数据时出错: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="223"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>文件 %1 当前正在使用中</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="235"/>
@@ -2914,7 +2934,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="228"/>
<source>Error setting pin state</source>
- <translation type="unfinished"/>
+ <translation>设置引脚状态错误</translation>
</message>
</context>
<context>
@@ -2922,12 +2942,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
- <translation type="unfinished"/>
+ <translation>无法更新文件 : %1</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>文件 %1 当前正在使用中</translation>
</message>
</context>
<context>
@@ -2945,17 +2965,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagateupload.cpp" line="255"/>
<source>Local file changed during sync. It will be resumed.</source>
- <translation type="unfinished"/>
+ <translation>本地文件在同步时已修改,完成后会再次同步</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Error updating metadata: %1</source>
- <translation type="unfinished"/>
+ <translation>更新元数据时出错: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="583"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>文件 %1 当前正在使用中</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="144"/>
@@ -2970,7 +2990,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<location filename="../src/libsync/propagateuploadng.cpp" line="93"/>
<location filename="../src/libsync/propagateuploadng.cpp" line="369"/>
<source>%1 the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>%1 文件当前正在使用中</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="493"/>
@@ -2985,7 +3005,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="541"/>
<source>The server did ask for a removed legacy feature(polling)</source>
- <translation type="unfinished"/>
+ <translation>服务器确实要求删除旧功能(轮询)</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="546"/>
@@ -3008,7 +3028,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagateuploadtus.cpp" line="67"/>
<source>%1 the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>%1 文件当前正在使用中</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadtus.cpp" line="212"/>
@@ -3026,12 +3046,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="47"/>
<source>%1 the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>%1 文件当前正在使用中</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="223"/>
<source>The server did ask for a removed legacy feature(polling)</source>
- <translation type="unfinished"/>
+ <translation>服务器确实要求删除旧功能(轮询)</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="243"/>
@@ -3069,7 +3089,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/models/protocolitemmodel.cpp" line="134"/>
<source>Issues</source>
- <translation type="unfinished"/>
+ <translation>问题</translation>
</message>
<message>
<location filename="../src/gui/models/protocolitemmodel.cpp" line="134"/>
@@ -3240,7 +3260,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/settingsdialog.ui" line="14"/>
<source>MainWindow</source>
- <translation type="unfinished"/>
+ <translation>主窗口</translation>
</message>
<message>
<location filename="../src/gui/settingsdialog.ui" line="39"/>
@@ -3498,7 +3518,7 @@ 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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You can direct people to this shared file or folder &lt;a href=&quot;private link menu&quot;&gt;&lt;span style=&quot; text-decoration: underline&quot;&gt;by giving them a private link&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;p&gt;您可以通过给他们一个&lt;a href=&quot;private link menu&quot;&gt;&lt;span style=&quot; text-decoration: underline&quot;&gt;私人链接&lt;/span&gt;&lt;/a&gt;将他们引导到这个共享文件或文件夹。&lt;/p&gt;&lt;body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="212"/>
@@ -3600,7 +3620,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="625"/>
<source>Context menu share %1</source>
- <translation type="unfinished"/>
+ <translation>上下文菜单共享 %1</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="793"/>
@@ -3610,12 +3630,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="795"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
- <translation type="unfinished"/>
+ <translation>您想永久删除目录 &lt;i&gt;%1&lt;/i&gt; 及其所有内容吗?</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="796"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
- <translation type="unfinished"/>
+ <translation>是否要永久删除文件 &lt;i&gt;%1&lt;/i&gt;?</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="838"/>
@@ -3734,12 +3754,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/>
<source>Backup of %1 started</source>
- <translation type="unfinished"/>
+ <translation>%1 的备份已开始</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/>
<source>Failed to find %1</source>
- <translation type="unfinished"/>
+ <translation>找不到 %1</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/>
@@ -3754,7 +3774,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/>
<source>Backup of %1 succeeded</source>
- <translation type="unfinished"/>
+ <translation>%1 备份成功</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/>
@@ -3764,22 +3784,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="147"/>
<source>Failed to create backup: %1</source>
- <translation type="unfinished"/>
+ <translation>创建备份失败: %1</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/>
<source>Failed to file id tags</source>
- <translation type="unfinished"/>
+ <translation>未能归档 id 标签</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="193"/>
<source>Backup of %1 failed with: %2</source>
- <translation type="unfinished"/>
+ <translation>%1 的备份失败:%2</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketuploadjob.cpp" line="209"/>
<source>%1 backup</source>
- <translation type="unfinished"/>
+ <translation>%1 备份</translation>
</message>
</context>
<context>
@@ -4008,7 +4028,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="1014"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation type="unfinished"/>
+ <translation>磁盘空间不足:已跳过将可用空间减少到 %1 以下的下载。</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="1021"/>
@@ -4067,7 +4087,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/theme.cpp" line="460"/>
<source>&lt;p&gt;Version %1. For more information visit &lt;a href=&quot;%2&quot;&gt;https://%3&lt;/a&gt;&lt;/p&gt;&lt;p&gt;For known issues and help, please visit: &lt;a href=&quot;https://central.owncloud.org/c/desktop-client&quot;&gt;https://central.owncloud.org&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.&lt;/p&gt;&lt;p&gt;&lt;small&gt;%6&lt;/small&gt;&lt;/p&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;p&gt;版本 %1。 有关更多信息,请访问 &lt;a href=&quot;%2&quot;&gt;https://%3&lt;/a&gt;&lt;/p&gt;&lt;p&gt;有关已知问题和帮助,请访问:&lt;a href=&quot;https://central.owncloud.org/c/desktop-client&quot;&gt;https://central.owncloud.org &lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;作者:Klaas Freitag、Daniel Molkentin、Olivier Goffart、Markus Götz、Jan-Christoph Borchardt、Thomas Müller、Dominik Schmidt、 Michael Stingl、Hannah von Reth 和其他人。&lt;/small&gt;&lt;/p&gt;&lt;p&gt;版权所有 ownCloud GmbH &lt;/p&gt;&lt;p&gt;由 %4 分发并根据 GNU 通用公共许可证 (GPL) 版本 2.0。&lt;br/&gt;%5 和 %5 徽标是 %4 在美国和其他国家/地区的注册商标 ,或两者兼有。&lt;/p&gt;&lt;p&gt;&lt;small&gt;%6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
</context>
<context>
@@ -4085,7 +4105,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/common/checksums.cpp" line="370"/>
<source>The downloaded file does not match the checksum, it will be resumed. &apos;%1&apos; != &apos;%2&apos;</source>
- <translation type="unfinished"/>
+ <translation>下载的文件与校验和不匹配,它将被恢复。 “%1”!=“%2”</translation>
</message>
</context>
<context>
@@ -4098,7 +4118,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/common/vfs.cpp" line="81"/>
<source>The Virtual filesystem feature requires a NTFS file system, %1 is using %2</source>
- <translation type="unfinished"/>
+ <translation>虚拟文件系统功能需要 NTFS 文件系统,%1 正在使用 %2</translation>
</message>
<message>
<location filename="../src/common/vfs.cpp" line="85"/>
@@ -4111,7 +4131,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="109"/>
<source>Cannot create a placeholder because a file with the placeholder name already exist</source>
- <translation type="unfinished"/>
+ <translation>无法创建占位符,因为具有占位符名称的文件已存在</translation>
</message>
</context>
<context>
@@ -4129,12 +4149,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/owncloudgui.cpp" line="290"/>
<source>Unresolved %1 conflicts</source>
- <translation type="unfinished"/>
+ <translation>未解决的 %1 个冲突</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="292"/>
<source>Ignored errors %1</source>
- <translation type="unfinished"/>
+ <translation>忽略的错误 %1</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="306"/>
@@ -4258,7 +4278,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/owncloudgui.cpp" line="303"/>
<source>Up to date (%1)</source>
- <translation type="unfinished"/>
+ <translation>最新的 (%1)</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="307"/>
@@ -4409,7 +4429,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="245"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="248"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this option is selected, the wizard will close without synchronizing anything. You can use the &amp;quot;Add Folder Sync Connection&amp;quot; button from the account settings to choose which pair of local and remote folder you wish to synchronize&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;选择此选项后,向导将关闭而不同步任何内容。您可以使用“添加文件夹同步连接”按钮,选择要同步的本地文件夹和远程文件夹&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="251"/>
@@ -4434,7 +4454,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="472"/>
<source>Start a &amp;clean sync (Create a backup and erases the local folder!)</source>
- <translation type="unfinished"/>
+ <translation>开始并清理同步(创建备份并删除本地文件夹!)</translation>
</message>
</context>
<context>
@@ -4550,7 +4570,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
- <translation type="unfinished"/>
+ <translation>不明确的</translation>
</message>
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="85"/>
@@ -4581,22 +4601,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
- <translation type="unfinished"/>
+ <translation>文件被忽略</translation>
</message>
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
- <translation type="unfinished"/>
+ <translation>已恢复</translation>
</message>
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
- <translation type="unfinished"/>
+ <translation>列入黑名单</translation>
</message>
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
- <translation type="unfinished"/>
+ <translation>排除</translation>
</message>
<message>
<location filename="../src/libsync/syncfileitem.cpp" line="105"/>
@@ -4664,7 +4684,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/guiutility.cpp" line="92"/>
<source>Shutting down %1</source>
- <translation type="unfinished"/>
+ <translation>正在关闭 %1</translation>
</message>
</context>
<context>
@@ -4685,7 +4705,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/theme.cpp" line="437"/>
<source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source>
- <translation type="unfinished"/>
+ <translation>%1 %2 %3%8%9 库 Qt %4,%5%8 使用虚拟文件插件:%6%8%7</translation>
</message>
</context>
<context>
@@ -4693,7 +4713,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/theme.cpp" line="427"/>
<source>%1 (Built against Qt %1)</source>
- <translation type="unfinished"/>
+ <translation>%1(针对 Qt %1 构建)</translation>
</message>
</context>
<context>
@@ -4714,7 +4734,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="35"/>
<source>Replaced by virtual file</source>
- <translation type="unfinished"/>
+ <translation>替换为虚拟文件</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
@@ -4739,7 +4759,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="48"/>
<source>%1 moved to %2</source>
- <translation type="unfinished"/>
+ <translation>%1 移至 %2</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
@@ -4882,33 +4902,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="177"/>
<source>Always available locally</source>
- <translation type="unfinished"/>
+ <translation>始终在本地可用</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="181"/>
<source>Some available online only</source>
- <translation type="unfinished"/>
+ <translation>仅在线提供某些</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="183"/>
<location filename="../src/gui/guiutility.cpp" line="185"/>
<source>Available online only</source>
- <translation type="unfinished"/>
+ <translation>仅在线提供</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="179"/>
<source>Currently available locally</source>
- <translation type="unfinished"/>
+ <translation>目前本地可用</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="192"/>
<source>Make always available locally</source>
- <translation type="unfinished"/>
+ <translation>始终本地可用</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="197"/>
<source>Free up local space</source>
- <translation type="unfinished"/>
+ <translation>释放本地空间</translation>
</message>
</context>
</TS> \ No newline at end of file
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index b76c53085..63a5ad1f8 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -1080,41 +1080,41 @@ File synchronization desktop utility.</source>
<translation>同步活動</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="901"/>
+ <location filename="../src/gui/folder.cpp" line="908"/>
<source>Could not read system exclude file</source>
<translation>無法讀取系統的排除檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1144"/>
+ <location filename="../src/gui/folder.cpp" line="1154"/>
<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="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1157"/>
<source>A folder from an external storage has been added.
</source>
<translation>已添加來自外部儲存空間的目錄。
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1148"/>
+ <location filename="../src/gui/folder.cpp" line="1158"/>
<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="1207"/>
+ <location filename="../src/gui/folder.cpp" line="1217"/>
<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="1210"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<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="1221"/>
+ <location filename="../src/gui/folder.cpp" line="1231"/>
<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).
@@ -1127,7 +1127,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1298"/>
+ <location filename="../src/gui/folder.cpp" line="1308"/>
<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.
@@ -1138,7 +1138,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="1303"/>
+ <location filename="../src/gui/folder.cpp" line="1313"/>
<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>
@@ -1147,17 +1147,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="1307"/>
+ <location filename="../src/gui/folder.cpp" line="1317"/>
<source>Remove All Files?</source>
<translation>移除所有檔案?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1311"/>
+ <location filename="../src/gui/folder.cpp" line="1321"/>
<source>Remove all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1312"/>
+ <location filename="../src/gui/folder.cpp" line="1322"/>
<source>Keep files</source>
<translation>保留檔案</translation>
</message>
@@ -1345,62 +1345,62 @@ Please consider removing this folder from the account and adding it again.</sour
<translation>有未解決的衝突。 點擊查看更多細節。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>檢查遠端&apos;%1&apos;中的更改</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="899"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>檢查本地端&apos;%1&apos;中的更改</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="909"/>
<source>Reconciling changes</source>
<translation>協調變更</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
<source>, &apos;%1&apos;</source>
<extracomment>Build a list of file names</extracomment>
<translation>, &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>&apos;%1&apos;</source>
<extracomment>Argument is a file name</extracomment>
<translation>&apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="968"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="971"/>
<source>Syncing %1</source>
<extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
<translation>同步 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="981"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="973"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="974"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>download %1/s</source>
<extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>下載 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="976"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
<translation>↓ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
<translation>↑ %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
<source>upload %1/s</source>
<extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
<translation>上傳 %1/s</translation>
@@ -1411,46 +1411,46 @@ Please consider removing this folder from the account and adding it again.</sour
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
<translation>%1 %2 (%3 的 %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="999"/>
<source>%1 %2</source>
<extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1016"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>還剩%5,%2的%1,%4檔案%3</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1024"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation>%1 的 %2, 檔案 %3 的 %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1031"/>
<source>file %1 of %2</source>
<translation>檔案 %1 的 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>Waiting...</source>
<translation>等待中...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1076"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1079"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>正在等候 %n 的資料夾(可能不只一個)</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1085"/>
<source>Preparing to sync...</source>
<translation>正在準備同步...</translation>
</message>
@@ -1875,12 +1875,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>%1 無法寫入變更。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="133"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
<source>Add Ignore Pattern</source>
<translation>增加忽略格式</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="136"/>
<source>Add a new ignore pattern:</source>
<translation>增加一個新的忽略格式:</translation>
</message>