Commit 0901e41a 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 4a6da365
......@@ -117,6 +117,7 @@ Name[eu]=Breeze kontraste handikoa
Name[fi]=Suurikontrastinen Breeze
Name[fr]=Brise contraste élevé
Name[gl]=Breeze de alto contraste
Name[hu]=Breeze High Contrast
Name[id]=Breeze High Contrast
Name[it]=Brezza alto contrasto
Name[ko]=Breeze 고대비
......
......@@ -117,6 +117,7 @@ Name[eu]=Breeze argia
Name[fi]=Breeze Light
Name[fr]=Brise clair
Name[gl]=Breeze claro
Name[hu]=Breeze Light
Name[id]=Breeze Terang
Name[it]=Brezza chiaro
Name[ko]=Breeze Light
......
......@@ -57,6 +57,7 @@ Comment[eu]=Breeze, KDE VDGk egina
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[id]=Breeze oleh KDE VDG
Comment[it]=Brezza a cura del VDG di KDE
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze
......
......@@ -57,6 +57,7 @@ Comment[eu]=Breeze, KDE VDGk egina
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[id]=Breeze oleh KDE VDG
Comment[it]=Brezza a cura del VDG di KDE
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze
......
......@@ -12,6 +12,7 @@ Name[eu]=Breeze argia
Name[fi]=Breeze Light
Name[fr]=Brise clair
Name[gl]=Breeze claro
Name[hu]=Breeze Light
Name[id]=Breeze Terang
Name[it]=Brezza chiaro
Name[ko]=Breeze Light
......@@ -42,6 +43,7 @@ Comment[eu]=Breeze argia, KDE VDGk egina
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[id]=Breeze Terang oleh KDE VDG
Comment[it]=Brezza chiaro a cura del VDG di KDE
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light
......
......@@ -12,6 +12,7 @@ Name[eu]=Breeze argia
Name[fi]=Breeze Light
Name[fr]=Brise clair
Name[gl]=Breeze claro
Name[hu]=Breeze Light
Name[id]=Breeze Terang
Name[it]=Brezza chiaro
Name[ko]=Breeze Light
......@@ -42,6 +43,7 @@ Comment[eu]=Breeze argia, KDE VDGk egina
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[id]=Breeze Terang oleh KDE VDG
Comment[it]=Brezza chiaro a cura del VDG di KDE
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light
......
......@@ -12,6 +12,7 @@ Comment[eu]=Breeze iluna, KDE VDGk egina
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[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