diff options
| author | l10n daemon script <[email protected]> | 2021-09-20 01:28:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-09-20 01:28:18 +0000 |
| commit | f8c292c556b87a19e9099cc98bf0ab88424472b2 (patch) | |
| tree | c0f088c45041b562e517b9c9c173430626d894e3 /src/org.kde.dolphin.desktop | |
| parent | 084dbbe2f7b62a50a9c2d44fb5f6ae0aebac97eb (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 9489ab370..0031f088c 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -27,6 +27,7 @@ Name[ko]=Dolphin Name[lt]=Dolphin Name[lv]=Dolphin Name[ml]=ഡോള്ഫിന് +Name[my]=လင်းပိုင် Name[nb]=Dolphin Name[nl]=Dolphin Name[nn]=Dolphin @@ -84,6 +85,7 @@ GenericName[ko]=파일 관리자 GenericName[lt]=Failų tvarkytuvė GenericName[lv]=Datņu pārvaldnieks GenericName[ml]=ഫയല് മാനേജര് +GenericName[my]=ဖိုင်လ်မန်နေဂျာ GenericName[nb]=Filbehandler GenericName[nl]=Bestandsbeheerder GenericName[nn]=Filhandsamar |