Skip to content

Commit ac12a0e

Browse files
committed
fix(i18n): provide proper translatable strings for Folder/Directory
in German this ended up as "Datei Namen"/"Ordner Namen", whereas these should be compounds instead (i.e. "Dateinamen", "Ordnernamen") Fixes #7962 Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
1 parent 6e845c6 commit ac12a0e

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

src/libsync/discovery.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,18 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, const Entries &ent
418418
break;
419419
}
420420
}
421-
const auto itemTypeName = (isDirectory ? tr("Folder", "name of folder entity to use when warning about invalid name") : tr("File", "name of folder entity to use when warning about invalid name"));
422421
if (invalid) {
423-
item->_errorString = tr("%1 name containing the character \"%2\" is not supported on this file system.", "folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character").arg(itemTypeName, QChar(invalid));
422+
item->_errorString = isDirectory
423+
? tr("Folder names containing the character \"%1\" are not supported on this file system.", "%1: the invalid character").arg(QChar(invalid))
424+
: tr("File names containing the character \"%1\" are not supported on this file system.", "%1: the invalid character").arg(QChar(invalid));
424425
} else if (isInvalidPattern) {
425-
item->_errorString = tr("%1 name contains at least one invalid character").arg(itemTypeName);
426+
item->_errorString = isDirectory
427+
? tr("Folder name contains at least one invalid character")
428+
: tr("File name contains at least one invalid character");
426429
} else {
427-
item->_errorString = tr("%1 name is a reserved name on this file system.").arg(itemTypeName);
430+
item->_errorString = isDirectory
431+
? tr("Folder name is a reserved name on this file system.")
432+
: tr("File name is a reserved name on this file system.");
428433
}
429434
}
430435
item->_status = SyncFileItem::FileNameInvalid;

0 commit comments

Comments
 (0)