diff options
| author | l10n daemon script <[email protected]> | 2021-10-09 01:19:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-10-09 01:19:17 +0000 |
| commit | 1937681d50d12a8c1a7f21c854aa99d3f4b0277b (patch) | |
| tree | a9c8c03264e9e339c927575e95c020a719d13bcd /src/org.kde.dolphin.desktop | |
| parent | ec031d0f7dfecfe0fb1cd7c17e0e60296f308c3d (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, 2 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 0031f088c..1d2f43f64 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[is]=Dolphin Name[it]=Dolphin Name[ja]=Dolphin Name[ko]=Dolphin @@ -79,6 +80,7 @@ GenericName[hi]=फ़ाइल प्रबंधक GenericName[hu]=Fájlkezelő GenericName[ia]=Gerente de file GenericName[id]=Pengelola File +GenericName[is]=Skráastjóri GenericName[it]=Gestore dei file GenericName[ja]=ファイルマネージャ GenericName[ko]=파일 관리자 |