Commit b28d5f69 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 00bf08a9
...@@ -19,6 +19,7 @@ Comment[nn]=Breeze skumring frå KDE VDG ...@@ -19,6 +19,7 @@ Comment[nn]=Breeze skumring frå KDE VDG
Comment[pt]=Brisa da Madrugada da VDG do KDE Comment[pt]=Brisa da Madrugada da VDG do KDE
Comment[pt_BR]=Breeze Twilight pelo KDE VDG Comment[pt_BR]=Breeze Twilight pelo KDE VDG
Comment[ro]=Briză, amurg, de KDE VDG Comment[ro]=Briză, amurg, de KDE VDG
Comment[ru]=Breeze Twilight от KDE VDG
Comment[sl]=Sapica ob mraku s strani KDE VDG Comment[sl]=Sapica ob mraku s strani KDE VDG
Comment[sv]=Breeze skymning av KDE:s visuella designgrupp Comment[sv]=Breeze skymning av KDE:s visuella designgrupp
Comment[uk]=Сутінкова Breeze, автори — KDE VDG Comment[uk]=Сутінкова Breeze, автори — KDE VDG
...@@ -44,6 +45,7 @@ Name[nn]=Breeze skumring ...@@ -44,6 +45,7 @@ Name[nn]=Breeze skumring
Name[pt]=Brisa da Madrugada Name[pt]=Brisa da Madrugada
Name[pt_BR]=Breeze Twilight Name[pt_BR]=Breeze Twilight
Name[ro]=Briză, amurg Name[ro]=Briză, amurg
Name[ru]=Breeze Twilight
Name[sl]=Sapica ob mraku Name[sl]=Sapica ob mraku
Name[sv]=Breeze skymning Name[sv]=Breeze skymning
Name[uk]=Сутінкова Breeze Name[uk]=Сутінкова Breeze
......
Supports Markdown
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