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"

lookandfeel.twilight/metadata.desktop

@@ -8,12 +8,14 @@ Comment[es]=Brisa crepúsculo por KDE VDG
 Comment[et]=Breeze videvik KDE VDG-lt
 Comment[eu]=Breeze ilunabarra, KDE VDGk egina
 Comment[fr]=Breeze gris par l'équipe de conception visuelle de KDE « VDG »
+Comment[ia]=Brisa Crepusculo (Breeze Twilight) per KDE VDG
 Comment[it]=Brezza crepuscolo a cura del VDG di KDE
 Comment[lt]=Breeze prieblanda pagal KDE VDG
 Comment[nl]=Breeze Twilight door de KDE VDG
 Comment[nn]=Breeze skumring frå KDE VDG
 Comment[pt]=Brisa da Madrugada da VDG do KDE
 Comment[pt_BR]=Breeze Twilight pelo KDE VDG
+Comment[ro]=Briză, amurg, de KDE VDG
 Comment[sl]=Sapica ob mraku s strani KDE VDG
 Comment[sv]=Breeze skymning av KDE:s visuella designgrupp
 Comment[uk]=Сутінкова Breeze, автори — KDE VDG
@@ -27,12 +29,14 @@ Name[es]=Brisa crepúsculo
 Name[et]=Breeze videvik
 Name[eu]=Breeze ilunabarra
 Name[fr]=Breeze gris
+Name[ia]=Brisa Crepusculo (Breeze Twilight)
 Name[it]=Brezza crepuscolo
 Name[lt]=Breeze prieblanda
 Name[nl]=Breeze Twilight
 Name[nn]=Breeze skumring
 Name[pt]=Brisa da Madrugada
 Name[pt_BR]=Breeze Twilight
+Name[ro]=Briză, amurg
 Name[sl]=Sapica ob mraku
 Name[sv]=Breeze skymning
 Name[uk]=Сутінкова Breeze

wallpapers/Next/metadata.desktop

@@ -11,6 +11,7 @@ Name[es]=Shell
 Name[et]=Merekarp
 Name[eu]=Oskola
 Name[fr]=Interpréteur
+Name[ia]=Shell
 Name[it]=Shell
 Name[ko]=셸
 Name[lt]=Apvalkalas