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"

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index ca3f48c48af614de2ab3a1bb6ead2d906c67feac..13e267ad5df8e365e9d2f4cfdbeea5abb561982f 100644 (file)
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -137,7 +137,7 @@ Name[ja]=コンパクト
 Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[lv]=Kompakts
 Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[lv]=Kompakts

-Name[ml]=തിà´\99àµ\8dà´\99ിയതായി
+Name[ml]=തിà´\99àµ\8dà´\99ിയതàµ\8d

 Name[nb]=Kompakt
 Name[nl]=Compact
 Name[nn]=Kompakt
 Name[nb]=Kompakt
 Name[nl]=Compact
 Name[nn]=Kompakt

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index c8eb36c720d3255c222ceca2ef9c341917ef97e7..f46d5118b1df2275e241256dd75fc1df128b623e 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -217,7 +217,7 @@ X-KDE-Keywords[ja]=ファイルマネージャ
 X-KDE-Keywords[ko]=파일 관리자
 X-KDE-Keywords[lt]=failų tvarkytuvė
 X-KDE-Keywords[lv]=datņu pārvaldnieks
 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[ml]=ഫയൽ മാനേജർ

 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 88c125235293f4b2771f85e326e201edaf2187f1..503f163d1896cd28fda8ec6333a80fcc19ff51a3 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -218,7 +218,7 @@ X-KDE-Keywords[ja]=ファイルマネージャ
 X-KDE-Keywords[ko]=파일 관리자
 X-KDE-Keywords[lt]=failų tvarkytuvė
 X-KDE-Keywords[lv]=datņu pārvaldnieks
 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[ml]=ഫയൽ മാനേജർ

 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index ea4dd15cf3ed242552b9dbd4374310da3f04bf0e..1187733a47331ee15471a7a615bedb951e1e00a2 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -170,7 +170,7 @@ X-KDE-Keywords[ja]=ファイルマネージャ
 X-KDE-Keywords[ko]=파일 관리자
 X-KDE-Keywords[lt]=failų tvarkytuvė
 X-KDE-Keywords[lv]=datņu pārvaldnieks
 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[ml]=ഫയൽ മാനേജർ

 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 486e63ca582e10fcd63e031ce63ea22a5fee754e..16b3fd56818b80854024b66f57839b389593f336 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -170,7 +170,7 @@ Comment[ja]=ファイルマネージャの表示モードを設定します
 Comment[ko]=파일 관리자 보기 모드 구성
 Comment[lt]=Konfigūruoti failų tvarkytuvės rodinio veiksenas
 Comment[lv]=Konfigurēt datņu pārvaldnieka skata režīmus
 Comment[ko]=파일 관리자 보기 모드 구성
 Comment[lt]=Konfigūruoti failų tvarkytuvės rodinio veiksenas
 Comment[lv]=Konfigurēt datņu pārvaldnieka skata režīmus

-Comment[ml]=ഫയലàµ\8dâ\80\8d മാനàµ\87à´\9cറിനàµ\8dà´±àµ\86 à´\85വതരണ ദശകള്‍ ക്രമീകരിയ്ക്കുക
+Comment[ml]=ഫയലàµ\8dâ\80\8d മാനàµ\87à´\9cറിനàµ\8dà´±àµ\86 à´\85വതരണ à´°àµ\80തികള്‍ ക്രമീകരിയ്ക്കുക

 Comment[nb]=Tilpass filbehandlerens visningsmåter
 Comment[nl]=Bestandsbeheerderweergavemodussen configureren
 Comment[nn]=Set opp visingsmodusane i filhandsamaren
 Comment[nb]=Tilpass filbehandlerens visningsmåter
 Comment[nl]=Bestandsbeheerderweergavemodussen configureren
 Comment[nn]=Set opp visingsmodusane i filhandsamaren


@@ -217,7 +217,7 @@ X-KDE-Keywords[ja]=ファイルマネージャ
 X-KDE-Keywords[ko]=파일 관리자
 X-KDE-Keywords[lt]=failų tvarkytuvė
 X-KDE-Keywords[lv]=datņu pārvaldnieks
 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[ml]=ഫയൽ മാനേജർ

 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar