diff options
| author | l10n daemon script <[email protected]> | 2022-07-15 01:51:02 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-15 01:51:02 +0000 |
| commit | d4ed58f6a920cc9887208ea9264e0f0da618835e (patch) | |
| tree | ceb414fe72a77fcc53502584ee55012b99e6f669 /src/org.kde.dolphin.desktop | |
| parent | 513fe3bb428c9d10f40a93efeca60fbf95d89bec (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/org.kde.dolphin.desktop')
| -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 d022bc52c..aa580603f 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -147,6 +147,7 @@ Keywords[ru]=files;file management;file browsing;samba;network shares;Explorer;F Keywords[sk]=súbory;správa súborov;prehliadanie súborov;samba;zdieľanie v sieti;Prieskumník;Vyhľadávač; Keywords[sl]=datoteke;upravljanje z datotekami;brskanje po datotekah;samba;mrežni diski;Raziskovalec;Iskalec; Keywords[sv]=filer;filhantering;filbläddring;samba;delade nätverksresurser;Utforskare;Finder; +Keywords[ta]=files;file management;file browsing;samba;network shares;Explorer;Finder; கோப்புகள்; கோப்பு; கோப்பு மேலாண்மை; கோப்பு நிர்வாகம்; கோப்பு உலாவல்; பிணையப் பகிர்வுகள்; பிணைய பகிர்வுகள்; உலாவி; Keywords[tr]=dosyalar;dosya yönetimi;dosya göz at;samba;ağ paylaşımları;Explorer;Finder; Keywords[uk]=files;file management;file browsing;samba;network shares;Explorer;Finder;файли;керування файлами;навігація;самба;спільні ресурси;мережа;експлорер;провідник;файндер; Keywords[vi]=files;file management;file browsing;samba;network shares;Explorer;Finder;tệp;quản lí tệp;duyệt tệp;chia sẻ mạng; |