diff options
| author | l10n daemon script <[email protected]> | 2025-05-24 01:34:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-05-24 01:34:17 +0000 |
| commit | 281fd66f914e36d93f4e698c243c3bd73bbe48e2 (patch) | |
| tree | f7f2de3133a096833a4470fd1e5b2aaa60863840 /src | |
| parent | 5f660640c400eef8e6f0e20a0563911fc7f991b5 (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 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index de02ff90d..380c0d831 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -127,6 +127,15 @@ GenericName[x-test]=xxFile Managerxx GenericName[zh_CN]=文件管理器 GenericName[zh_TW]=檔案管理員 Comment=Manage your files +Comment[ca]=Gestioneu els fitxers +Comment[ca@valencia]=Gestioneu els fitxers +Comment[es]=Gestión de archivos +Comment[eu]=Kudeatu zure fitxategiak +Comment[ka]=მართეთ თქვენი ფაილები +Comment[nl]=Uw bestanden beheren +Comment[sl]=Upravlja vaše datoteke +Comment[uk]=Керування вашими файлами +Comment[x-test]=xxManage your filesxx MimeType=inode/directory; InitialPreference=10 Keywords=files;file management;file browsing;samba;network shares;Explorer;Finder; |