diff options
| author | l10n daemon script <[email protected]> | 2019-09-25 05:15:10 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-09-25 05:15:10 +0200 |
| commit | a2730fad4323c3af0b5198a31021eed9c9a336e7 (patch) | |
| tree | d713e3f00da2f918cc9dac3b837bec1829d6bc3e /src/settings/kcm/kcmdolphinnavigation.desktop | |
| parent | c0ca8f2c79c9b0e9f6db47dd86a1434d4e3de5bb (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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 0018e056a..24bf0dff5 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -20,7 +20,7 @@ Name[id]=Navigasi Dolphin Name[it]=Navigazione di Dolphin Name[ja]=Dolphin ナビゲーション Name[ko]=Dolphin 탐색 -Name[lt]=Dolphin navigacija +Name[lt]=Dolphin naršymas Name[ml]=ഡോള്ഫിന് നാവിഗേഷന് Name[nb]=Navigasjon i Dolphin Name[nl]=Dolphin-navigatie @@ -65,7 +65,7 @@ Comment[id]=Layanan ini memungkinkan konfigurasi navigasi Dolphin. Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin. Comment[ja]=Dolphin でのナビゲーションを設定します Comment[ko]=이 서비스는 Dolphin 탐색을 설정합니다. -Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin navigaciją. +Comment[lt]=Ši paslauga leidžia Dolphin naršymo konfigūravimą. Comment[ml]=ഡോള്ഫിന് നാവിഗേഷൻ ക്രമീകരിയ്ക്കാന് ഈ സേവനം അനുവദിയ്ക്കുന്നു. Comment[nb]=Med denne tjenesten kan du sette opp navigasjon for Dolphin. Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren. @@ -121,7 +121,7 @@ Name[id]=Navigasi Name[it]=Navigazione Name[ja]=ナビゲーション Name[ko]=탐색 -Name[lt]=Navigacija +Name[lt]=Naršymas Name[ml]=നാവിഗേഷന് Name[nb]=Navigasjon Name[nl]=Navigatie @@ -166,7 +166,7 @@ Comment[id]=Konfigurasikan navigasi pengelola file Comment[it]=Configura la navigazione col gestore dei file Comment[ja]=ファイルマネージャでのナビゲーションを設定します Comment[ko]=파일 관리자 탐색 설정 -Comment[lt]=Konfigūruokite failų tvarkyklės navigaciją +Comment[lt]=Konfigūruoti failų tvarkytuvės naršymą Comment[ml]=ഫയല് മാനേജർ നാവിഗേഷൻ ക്രമീകരിയ്ക്കുക Comment[nb]=Sett opp navigasjon i filbehandleren Comment[nl]=Bestandsbeheerdernavigatie configureren @@ -212,7 +212,7 @@ X-KDE-Keywords[id]=pengelola file X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[ja]=ファイルマネージャ X-KDE-Keywords[ko]=파일 관리자 -X-KDE-Keywords[lt]=Failų tvarkyklė +X-KDE-Keywords[lt]=failų tvarkytuvė X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder |