diff options
| author | l10n daemon script <[email protected]> | 2022-09-28 02:00:06 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-09-28 02:00:06 +0000 |
| commit | 13712a50652047bda8d7c2683ef1278552061680 (patch) | |
| tree | 86d6793d9ee6be305e88dbc6d9697ceb114a15c8 /src/org.kde.dolphin.desktop | |
| parent | aa54a68e936af4a1a2de0cb7e153cd83b27d5cdb (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 66f4ddf70..0d99a03ef 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -135,7 +135,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[id]=file;berkas;pengelola file;peramban file;samba;pembagian jaringan;Explorer;Finder; 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[ka]=files;file management;file browsing;samba;network shares;Explorer;Finder; |