diff options
| author | l10n daemon script <[email protected]> | 2024-03-16 01:17:09 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-03-16 01:17:09 +0000 |
| commit | d7bdba870b88beca322ba667765828190d097e35 (patch) | |
| tree | d89f0769b873e73d4d612ba4b2f913e703f26e56 | |
| parent | d9c712fda89053b2a05929ea7a4c4babb3001d7a (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 4e3e4de2a..0ade424d6 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -168,7 +168,7 @@ Keywords[sk]=súbory;správa súborov;prehliadanie súborov;samba;zdieľanie v s 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[tr]=dosyalar;dosya yönetimi;dosya göz at;samba;ağ paylaşımları;Explorer;Finder;gezgin; 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; Keywords[x-test]=xxfilesxx;xxfile managementxx;xxfile browsingxx;xxsambaxx;xxnetwork sharesxx;xxExplorerxx;xxFinderxx; |