Commit 440df523 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 13503d66
Pipeline #66002 skipped
......@@ -17,6 +17,7 @@ Name[fi]=Breeze Dark
Name[fr]=Breeze sombre
Name[gd]=Oiteag dhorcha
Name[gl]=Breeze escuro
Name[hi]=ब्रीज़ डार्क
Name[hu]=Breeze Dark
Name[ia]=Breeze Dark
Name[id]=Breeze Gelap
......@@ -60,6 +61,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[hi]=केडीई वीडीजी द्वारा ब्रीज़ डार्क
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
......
......@@ -17,6 +17,7 @@ Name[fi]=Breeze
Name[fr]=Breeze
Name[gd]=Oiteag
Name[gl]=Breeze
Name[hi]=ब्रीज़
Name[hu]=Breeze
Name[ia]=Breeze
Name[id]=Breeze
......@@ -60,6 +61,7 @@ Comment[eu]=Breeze, KDE VDGk egina
Comment[fi]=Breeze KDE VDG:ltä
Comment[fr]=Breeze, par KDE VDG
Comment[gl]=Breeze de KDE VDG
Comment[hi]=केडीई वीडीजी द्वारा ब्रीज़
Comment[hu]=Breeze a KDE VDG-től
Comment[ia]=Breeze (Brisa) per le KDE VDG
Comment[id]=Breeze oleh KDE VDG
......
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