Commit 8ef9e333 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 e08ea20b
[Desktop Entry]
Name=KTrip
Name[ca]=KTrip
Name[cs]=KTrip
Name[de]=KTrip
Name[it]=KTrip
......@@ -11,6 +12,7 @@ Name[sv]=Ktripp
Name[uk]=KTrip
Name[x-test]=xxKTripxx
GenericName=Public transport navigator
GenericName[ca]=Navegador del transport públic
GenericName[de]=Navigation für öffentliche Verkehrsmittel
GenericName[it]=Navigatore del trasporto pubblico
GenericName[nl]=Navigator van openbaar vervoer
......@@ -24,6 +26,7 @@ Exec=ktrip
Icon=org.kde.ktrip
Type=Application
Comment=Public transport navigator.
Comment[ca]=Navegador del transport públic.
Comment[de]=Navigation für öffentliche Verkehrsmittel.
Comment[it]=Navigatore del trasporto pubblico.
Comment[nl]=Navigator van openbaar vervoer.
......
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