Commit 07218461 authored by Script Kiddy's avatar Script Kiddy

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 522b4b5a
......@@ -6,6 +6,7 @@ Name[de]=KTrip
Name[en_GB]=KTrip
Name[es]=KTrip
Name[et]=KTrip
Name[fr]=KTrip
Name[it]=KTrip
Name[nl]=KTrip
Name[pl]=KTrip
......@@ -23,6 +24,7 @@ GenericName[de]=Navigation für öffentliche Verkehrsmittel
GenericName[en_GB]=Public transport navigator
GenericName[es]=Navegador de transporte público
GenericName[et]=Ühistranspordi navigaator
GenericName[fr]=Navigateur de transports publics
GenericName[it]=Navigatore del trasporto pubblico
GenericName[nl]=Navigator van openbaar vervoer
GenericName[pl]=Przemieszczanie się transportem publicznym
......@@ -41,6 +43,7 @@ Comment[de]=Navigation für öffentliche Verkehrsmittel.
Comment[en_GB]=Public transport navigator.
Comment[es]=Navegador de transporte público.
Comment[et]=Ühistranspordi navigaator.
Comment[fr]=Navigateur de transports publics.
Comment[it]=Navigatore del trasporto pubblico.
Comment[nl]=Navigator van openbaar vervoer.
Comment[pl]=Przemieszczanie się transportem publicznym.
......
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