Commit 2f36b972 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 16d7c04b
......@@ -3,11 +3,14 @@ Name=KTrip
Name[ca]=KTrip
Name[cs]=KTrip
Name[de]=KTrip
Name[en_GB]=KTrip
Name[es]=KTrip
Name[it]=KTrip
Name[nl]=KTrip
Name[pl]=KTrip
Name[pt]=KTrip
Name[pt_BR]=KTrip
Name[ru]=KTrip
Name[sk]=KTrip
Name[sv]=Ktripp
Name[uk]=KTrip
......@@ -16,11 +19,13 @@ Name[zh_TW]=KTrip
GenericName=Public transport navigator
GenericName[ca]=Navegador del transport públic
GenericName[de]=Navigation für öffentliche Verkehrsmittel
GenericName[en_GB]=Public transport navigator
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
GenericName[pt]=Navegador de transportes públicos
GenericName[pt_BR]=Navegador de transportes públicos
GenericName[sk]=Navigátor verejnej dopravy
GenericName[sv]=Kollektivtrafiknavigering
GenericName[uk]=Навігатор громадським транспортом
......@@ -31,11 +36,13 @@ Type=Application
Comment=Public transport navigator.
Comment[ca]=Navegador del transport públic.
Comment[de]=Navigation für öffentliche Verkehrsmittel.
Comment[en_GB]=Public transport navigator.
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.
Comment[pt]=Navegador de transportes públicos.
Comment[pt_BR]=Navegador de transportes públicos.
Comment[sk]=Navigátor verejnej dopravy.
Comment[sv]=Kollektivtrafiknavigering
Comment[uk]=Навігатор громадським транспортом.
......
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