diff options
| author | l10n daemon script <[email protected]> | 2019-11-11 09:42:43 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-11-11 09:42:43 +0100 |
| commit | 3984e607bb4437a38af16e007f1c23fbcff7dfb2 (patch) | |
| tree | 3f19b3d4d36c0f3eed6d827b771dcde9842bc63c /src/org.kde.dolphin.desktop | |
| parent | d8f9ca49d333540796713a8842a1bea7622d0444 (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 3e71051ef..6404808ee 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[lv]=Dolphin Name[ml]=ഡോള്ഫിന് Name[nb]=Dolphin Name[nl]=Dolphin @@ -73,6 +74,7 @@ GenericName[it]=Gestore dei file GenericName[ja]=ファイルマネージャ GenericName[ko]=파일 관리자 GenericName[lt]=Failų tvarkytuvė +GenericName[lv]=Datņu pārvaldnieks GenericName[ml]=ഫയല് മാനേജര് GenericName[nb]=Filbehandler GenericName[nl]=Bestandsbeheerder |