diff options
| author | l10n daemon script <[email protected]> | 2022-05-15 01:59:30 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-15 01:59:30 +0000 |
| commit | 2ceaa0ba1be1317b52a5a5d4439585b9af3bab2d (patch) | |
| tree | 20e951aa8bab3ab154e47f2da7b8786c3341aba0 /src/org.kde.dolphin.desktop | |
| parent | 0fc218fd264adf0f67396409cdd1d44265c71f07 (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 d3a4e8680..bd6d921ef 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -129,6 +129,7 @@ Keywords[fr]=fichiers ; gestion de fichiers ; navigation parmi les fichiers ; Keywords[hi]=फ़ाइलें;फ़ाइल प्रबंधन;फ़ाइल ब्राउज़िंग;सांबा;नेटवर्क शेयर;एक्सप्लोरर;खोजक; Keywords[hu]=fájlok;fájlkezelés;fájlböngészés;samba;hálózati megosztások;Explorer;Finder; Keywords[ia]=files; gestion de file; navigation de file;samba; partes de rete;Explorator;Trovator; +Keywords[id]=files;file management;file browsing;samba;network shares;Explorer;Finder;manajer; Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;Explorer;Finder; Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;Explorer;Finder; Keywords[ko]=files;file management;file browsing;samba;network shares;Explorer;Finder;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유; |