diff options
| author | l10n daemon script <[email protected]> | 2025-05-28 01:34:23 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-05-28 01:34:23 +0000 |
| commit | 0959642be297bf0749467c204e511f5887b17ee1 (patch) | |
| tree | 8860ef148a5f911f9f9d780c6f17ac61efed45d9 /src | |
| parent | 265a1495a27e4ee4b36357a1eae7ca2b17f7976a (diff) | |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Diffstat (limited to 'src')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index de074fa4f..888440844 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -127,6 +127,7 @@ GenericName[x-test]=xxFile Managerxx GenericName[zh_CN]=文件管理器 GenericName[zh_TW]=檔案管理員 Comment=Manage your files +Comment[ar]=أدر ملفاتك Comment[ca]=Gestioneu els fitxers Comment[ca@valencia]=Gestioneu els fitxers Comment[es]=Gestión de archivos |