Commit 9a7ef259 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 9cd4be75
......@@ -118,6 +118,7 @@ Name[fi]=Suurikontrastinen Breeze
Name[fr]=Brise contraste élevé
Name[gl]=Breeze de alto contraste
Name[hu]=Breeze High Contrast
Name[ia]=Brisa Alte contrasto
Name[id]=Breeze High Contrast
Name[it]=Brezza alto contrasto
Name[ko]=Breeze 고대비
......
......@@ -118,6 +118,7 @@ Name[fi]=Breeze Light
Name[fr]=Brise clair
Name[gl]=Breeze claro
Name[hu]=Breeze Light
Name[ia]=Brisa Ligier
Name[id]=Breeze Terang
Name[it]=Brezza chiaro
Name[ko]=Breeze Light
......
......@@ -58,6 +58,7 @@ Comment[fi]=Breeze KDE VDG:ltä
Comment[fr]=Brise par KDE VDG
Comment[gl]=Breeze de KDE VDG
Comment[hu]=Breeze a KDE VDG-től
Comment[ia]=Breeze (Brisa) per le KDE VDG
Comment[id]=Breeze oleh KDE VDG
Comment[it]=Brezza a cura del VDG di KDE
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze
......
......@@ -58,6 +58,7 @@ Comment[fi]=Breeze KDE VDG:ltä
Comment[fr]=Brise par KDE VDG
Comment[gl]=Breeze de KDE VDG
Comment[hu]=Breeze a KDE VDG-től
Comment[ia]=Breeze (Brisa) per le KDE VDG
Comment[id]=Breeze oleh KDE VDG
Comment[it]=Brezza a cura del VDG di KDE
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze
......
......@@ -13,6 +13,7 @@ Name[fi]=Breeze Light
Name[fr]=Brise clair
Name[gl]=Breeze claro
Name[hu]=Breeze Light
Name[ia]=Brisa Ligier
Name[id]=Breeze Terang
Name[it]=Brezza chiaro
Name[ko]=Breeze Light
......@@ -44,6 +45,7 @@ Comment[fi]=Breeze Light KDE VDG:ltä
Comment[fr]=Brise Light par KDE VDG
Comment[gl]=Breeze claro de KDE VDG
Comment[hu]=Breeze Light a KDE VDG-től
Comment[ia]=Brisa Ligier per KDE VDG
Comment[id]=Breeze Terang oleh KDE VDG
Comment[it]=Brezza chiaro a cura del VDG di KDE
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light
......
......@@ -13,6 +13,7 @@ Name[fi]=Breeze Light
Name[fr]=Brise clair
Name[gl]=Breeze claro
Name[hu]=Breeze Light
Name[ia]=Brisa Ligier
Name[id]=Breeze Terang
Name[it]=Brezza chiaro
Name[ko]=Breeze Light
......@@ -44,6 +45,7 @@ Comment[fi]=Breeze Light KDE VDG:ltä
Comment[fr]=Brise Light par KDE VDG
Comment[gl]=Breeze claro de KDE VDG
Comment[hu]=Breeze Light a KDE VDG-től
Comment[ia]=Brisa Ligier per KDE VDG
Comment[id]=Breeze Terang oleh KDE VDG
Comment[it]=Brezza chiaro a cura del VDG di KDE
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light
......
......@@ -63,6 +63,7 @@ Comment[fr]=Style de composants graphiques pour KDE
Comment[gl]=Estilo dos trebellos para a infraestrutura de KDE
Comment[he]=עיצוב יישומונים לספריות KDE
Comment[hu]=Eszközstílus a KDE Frameworkshöz
Comment[ia]=Stilo de Elemento Graphic de Fenestra (Widget) per Framework de KDE
Comment[id]=Gaya widget untuk Frameworks KDE
Comment[it]=Stile di oggetti per KDE Frameworks
Comment[ko]=KDE 프레임워크 위젯 스타일
......
......@@ -13,6 +13,7 @@ Comment[fi]=Breeze Dark KDE VDG:ltä
Comment[fr]=Breeze sombre, par KDE VDG
Comment[gl]=Breeze escuro de KDE VDG
Comment[hu]=Breeze Dark a KDE VDG-től
Comment[ia]=Breeze Dark (Brisa Obscure) per le KDE VDG
Comment[id]=Breeze Gelap oleh KDE VDG
Comment[it]=Brezza scuro a cura del VDG di KDE
Comment[ko]=KDE VDG에서 만든 어두운 Breeze
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment