Commit 923883a3 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 1c493949
......@@ -7,6 +7,7 @@ Comment[en_GB]=Breeze Twilight by the KDE VDG
Comment[es]=Brisa crepúsculo por KDE VDG
Comment[et]=Breeze videvik KDE VDG-lt
Comment[eu]=Breeze ilunabarra, KDE VDGk egina
Comment[fi]=Hämärän Breeze KDE VDG:ltä
Comment[fr]=Breeze gris par l'équipe de conception visuelle de KDE « VDG »
Comment[hu]=Breeze Twilight a KDE VDG-től
Comment[ia]=Brisa Crepusculo (Breeze Twilight) per KDE VDG
......@@ -30,6 +31,7 @@ Name[en_GB]=Breeze Twilight
Name[es]=Brisa crepúsculo
Name[et]=Breeze videvik
Name[eu]=Breeze ilunabarra
Name[fi]=Hämärän Breeze
Name[fr]=Breeze gris
Name[hu]=Breeze Twilight
Name[ia]=Brisa Crepusculo (Breeze Twilight)
......
......@@ -10,6 +10,7 @@ Name[en_GB]=Shell
Name[es]=Shell
Name[et]=Merekarp
Name[eu]=Oskola
Name[fi]=Komentotulkki
Name[fr]=Interpréteur
Name[hu]=Kagylóhéj
Name[ia]=Shell
......
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