Commit fdc63fe4 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 b421adcd
......@@ -3,6 +3,7 @@ Name=KTrip
Name[ca]=KTrip
Name[cs]=KTrip
Name[de]=KTrip
Name[es]=KTrip
Name[it]=KTrip
Name[nl]=KTrip
Name[pl]=KTrip
......@@ -14,6 +15,7 @@ Name[x-test]=xxKTripxx
GenericName=Public transport navigator
GenericName[ca]=Navegador del transport públic
GenericName[de]=Navigation für öffentliche Verkehrsmittel
GenericName[es]=Navegador de transporte público
GenericName[it]=Navigatore del trasporto pubblico
GenericName[nl]=Navigator van openbaar vervoer
GenericName[pl]=Przemieszczanie się transportem publicznym
......@@ -28,6 +30,7 @@ Type=Application
Comment=Public transport navigator.
Comment[ca]=Navegador del transport públic.
Comment[de]=Navigation für öffentliche Verkehrsmittel.
Comment[es]=Navegador de transporte público.
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