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/settings/kcm/kcmdolphinnavigation.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/settings/kcm/kcmdolphinnavigation.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index b7f7fe8d3..6df10ac24 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -26,6 +26,7 @@ Name[ko]=Dolphin 탐색 Name[lt]=Dolphin naršymas Name[lv]=Dolphin navigācija Name[ml]=ഡോള്ഫിന് നാവിഗേഷന് +Name[my]=လင်းပိုင် လမ်းညွှန် Name[nb]=Navigasjon i Dolphin Name[nl]=Dolphin-navigatie Name[nn]=Navigasjon i Dolphin @@ -78,6 +79,7 @@ Comment[ko]=이 서비스를 통해 Dolphin 탐색을 설정할 수 있습니다 Comment[lt]=Ši paslauga leidžia Dolphin naršymo konfigūravimą. Comment[lv]=Šis serviss ļauj konfigurēt Dolphin navigāciju. Comment[ml]=ഡോള്ഫിന് നാവിഗേഷൻ ക്രമീകരിയ്ക്കാന് ഈ സേവനം അനുവദിയ്ക്കുന്നു. +Comment[my]=ဤဝန်ဆောင်မှုက လင်းပိုင် လမ်းညွှန်ကို ပြင်ဆင်နိုင်စေသည်။ Comment[nb]=Med denne tjenesten kan du sette opp navigasjon for Dolphin. Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren. Comment[nn]=Denne tenesta lèt deg setja opp navigasjonen for Dolphin. @@ -137,6 +139,7 @@ Name[ko]=탐색 Name[lt]=Naršymas Name[lv]=Navigācija Name[ml]=നാവിഗേഷന് +Name[my]=လမ်းညွှန် Name[nb]=Navigasjon Name[nl]=Navigatie Name[nn]=Navigasjon @@ -189,6 +192,7 @@ Comment[ko]=파일 관리자 탐색 설정 Comment[lt]=Konfigūruoti failų tvarkytuvės naršymą Comment[lv]=Konfigurēt datņu pārvaldnieka navigāciju Comment[ml]=ഫയല് മാനേജർ നാവിഗേഷൻ ക്രമീകരിയ്ക്കുക +Comment[my]=ဖိုင်လ်မန်နေဂျာ လမ်းညွှန် ပြင်ဆင်မည် Comment[nb]=Sett opp navigasjon i filbehandleren Comment[nl]=Bestandsbeheerdernavigatie configureren Comment[nn]=Set opp navigasjonen i filhandsamaren @@ -241,6 +245,7 @@ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=failų tvarkytuvė X-KDE-Keywords[lv]=datņu pārvaldnieks X-KDE-Keywords[ml]=ഫയൽ മാനേജർ +X-KDE-Keywords[my]=ဖိုင်လ်မန်နေဂျာ X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar |