diff options
| author | l10n daemon script <[email protected]> | 2022-11-06 01:51:33 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-11-06 01:51:33 +0000 |
| commit | 4f1d8fef9216d6ae7b5b9bd1fa5523103ccf419a (patch) | |
| tree | 6cc95efdd867c960936267a1c723349a3a3d138a /src/org.kde.dolphin.desktop | |
| parent | 5ef1136ea3362a6722b6f4da020d44513f690b31 (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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 854997b56..83c289d19 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -21,6 +21,7 @@ Name[hi]=डॉल्फ़िन Name[hu]=Dolphin Name[ia]=Dolphin Name[id]=Dolphin +Name[ie]=Dolphin Name[is]=Dolphin Name[it]=Dolphin Name[ja]=Dolphin @@ -81,6 +82,7 @@ GenericName[hi]=फ़ाइल प्रबंधक GenericName[hu]=Fájlkezelő GenericName[ia]=Gerente de file GenericName[id]=Pengelola File +GenericName[ie]=Gerente de files GenericName[is]=Skráastjóri GenericName[it]=Gestore dei file GenericName[ja]=ファイルマネージャ @@ -134,6 +136,7 @@ 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]=file;berkas;pengelola file;peramban file;samba;pembagian jaringan;Explorer;Finder; +Keywords[ie]=files;gestie;gerente;navigation;rete;samba;partite;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; |