diff options
| author | l10n daemon script <[email protected]> | 2025-05-25 01:35:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-05-25 01:35:00 +0000 |
| commit | 2ad8b3a51c5035e33fcd4c997a4b4de463dfa25d (patch) | |
| tree | b56999cb454d6a431898b62a380e257e90e4e321 /src | |
| parent | b987c93d100e36f649874b7ced13840c7b06f1ed (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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 380c0d831..1f90595dc 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -131,11 +131,14 @@ Comment[ca]=Gestioneu els fitxers Comment[ca@valencia]=Gestioneu els fitxers Comment[es]=Gestión de archivos Comment[eu]=Kudeatu zure fitxategiak +Comment[it]=Gestisci i tuoi file Comment[ka]=მართეთ თქვენი ფაილები Comment[nl]=Uw bestanden beheren Comment[sl]=Upravlja vaše datoteke +Comment[tr]=Dosyalarınızı yönetin Comment[uk]=Керування вашими файлами Comment[x-test]=xxManage your filesxx +Comment[zh_TW]=管理您的檔案 MimeType=inode/directory; InitialPreference=10 Keywords=files;file management;file browsing;samba;network shares;Explorer;Finder; |