diff options
| author | l10n daemon script <[email protected]> | 2019-05-22 05:14:39 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-05-22 05:14:39 +0200 |
| commit | 22f78c474acec7e2c4a81caa8a4a2d0025bec663 (patch) | |
| tree | 72496d0ecdcd3cc866da8fa7cb398083277f8829 /src/org.kde.dolphin.desktop | |
| parent | 1b985d1ef400de024ed221264a55fd58affdec0c (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 060dd526e..e75eeab99 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -22,6 +22,7 @@ Name[it]=Dolphin Name[ja]=Dolphin Name[ko]=Dolphin Name[lt]=Dolphin +Name[ml]=ഡോള്ഫിന് Name[nb]=Dolphin Name[nl]=Dolphin Name[nn]=Dolphin @@ -72,6 +73,7 @@ GenericName[it]=Gestore dei file GenericName[ja]=ファイルマネージャ GenericName[ko]=파일 관리자 GenericName[lt]=Failų tvarkyklė +GenericName[ml]=ഫയല് മാനേജര് GenericName[nb]=Filbehandler GenericName[nl]=Bestandsbeheerder GenericName[nn]=Filhandsamar |