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"
2017-06-25 04:33:13 +02:00 · 2017-06-25 04:33:13 +02:00 · a4d401c028
parent 66f0839925
commit a4d401c028
8 changed files with 8 additions and 1 deletions
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@ -16,6 +16,7 @@ Name[hu]=Ablakkezelő-effektusok
 Name[ia]=Gerente de effectos de fenestra
 Name[it]=Effetti del gestore delle finestre
 Name[ko]=창 관리자 효과
+Name[lt]=Langų tvarkyklės efektai
 Name[nl]=Effecten van vensterbeheerder
 Name[nn]=Effektar for vindaugshandsamar
 Name[pl]=Efekty zarządzania oknami
--- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
+++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
@ -22,6 +22,7 @@ Name[eu]=Ukimen-pantaila
 Name[fi]=Kosketusnäyttö
 Name[he]=מסך מגע
 Name[it]=Schermo a sfioramento
+Name[lt]=Jutiklinis ekranas
 Name[nl]=Aanraakscherm
 Name[pl]=Ekran dotykowy
 Name[pt]=Ecrã Táctil
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@ -15,6 +15,7 @@ Name[hu]=Ablakkezelő szkriptek
 Name[ia]=Gerente de scripts de fenestra 
 Name[it]=Script del gestore delle finestre
 Name[ko]=창 관리자 스크립트
+Name[lt]=Langų tvarkyklės scenarijai
 Name[nl]=Scripts van vensterbeheerder
 Name[nn]=Skript for vindaugshandsamar
 Name[pl]=Skrypty zarządzania oknami
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@ -16,6 +16,7 @@ Name[hu]=Ablakkezelő-váltó elrendezések
 Name[ia]=Disposition de commutator de gerente de fenestra
 Name[it]=Disposizione scambiafinestre del gestore delle finestre
 Name[ko]=창 관리자 전환기 레이아웃
+Name[lt]=Langų perjungimo išdėstymai
 Name[nl]=Omschakelende indelingen van vensterbeheerder
 Name[pl]=Układ przełączania zarządzana oknami
 Name[pt]=Disposições da Mudança de Janelas do KWin
--- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop
+++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop
@ -12,6 +12,7 @@ Name[fi]=KWin-ikkunakehykset
 Name[hu]=KWin dekoráció
 Name[ia]=Decorationes de KWin
 Name[it]=Decorazioni di KWin
+Name[lt]=Kwin dekoracijos
 Name[nl]=KWin-decoraties
 Name[pl]=Wygląd KWin
 Name[pt]=Decorações do KWin
--- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop
+++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop
@ -14,6 +14,7 @@ Name[hu]=KWin szkript
 Name[ia]=Script de KWin
 Name[it]=Script di KWin
 Name[ko]=KWin 스크립트
+Name[lt]=KWin scenarijus
 Name[nl]=KWin-script
 Name[pl]=Skrypt KWin
 Name[pt]=Programa do KWin
--- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
+++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
@ -14,6 +14,7 @@ Name[hu]=KWin ablakváltó
 Name[ia]=Commutator de fenestra de KWin
 Name[it]=Scambiafinestre di KWin
 Name[ko]=KWin 창 전환기
+Name[lt]=KWin langų perjungiklis
 Name[nl]=KWin-vensterwisselaar
 Name[pl]=Przełącznik okien KWin
 Name[pt]=Mudança de Janelas do KWin
--- a/scripts/minimizeall/metadata.desktop
+++ b/scripts/minimizeall/metadata.desktop
@ -19,7 +19,7 @@ Name[ia]=MaximizaOmne
 Name[it]=Minimizza tutto
 Name[ja]=すべて最小化
 Name[ko]=모두최소화
-Name[lt]=SumažintiVisus
+Name[lt]=Sumažinti visus
 Name[nb]=Minimer alt
 Name[nl]=Alles-minimaliseren
 Name[nn]=Minimer alle