diff options
| author | l10n daemon script <[email protected]> | 2022-01-24 01:45:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-01-24 01:45:03 +0000 |
| commit | f3cf4e3ae11055f297c8dfbe70ca6a3faa61dae7 (patch) | |
| tree | f6678ad99a2c32a607d3859000f010302032e123 | |
| parent | d192c8984f350ef6a897f1eac5a13708b485152d (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"
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 60d7255f9..70edf7c32 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -116,7 +116,7 @@ Terminal=false MimeType=inode/directory; InitialPreference=10 Keywords=files;file management;file browsing;samba;network shares;Explorer;Finder; -Keywords[ar]=ملف;ملفات;متصفح;سامبا;مشاركة;إدارة;إدارة ملفات;شبكة +Keywords[ar]=ملف;ملفات;متصفح;سامبا;مشاركة;إدارة;إدارة ملفات;شبكة; Keywords[az]=fayllar;fayl idarəetməsi;fayl bələdçisi;smaba:şəbəkədə paylaşımlar;Araşdırmaq;Tapmaq; Keywords[ca]=fitxers;gestió de fitxers;explorar fitxers;samba;comparticions de xarxa;explorador;cercador; Keywords[ca@valencia]=fitxers;gestió de fitxers;explorar fitxers;samba;comparticions de xarxa;explorador;cercador; |