Commit 4278442b 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 8634467f
[Desktop Entry] [Desktop Entry]
Name=KTrip Name=KTrip
Name[nl]=KTrip Name[nl]=KTrip
Name[pl]=KTrip Name[pl]=KTrip
Name[pt]=KTrip Name[pt]=KTrip
...@@ -8,6 +9,7 @@ Name[sv]=Ktripp ...@@ -8,6 +9,7 @@ Name[sv]=Ktripp
Name[uk]=KTrip Name[uk]=KTrip
Name[x-test]=xxKTripxx Name[x-test]=xxKTripxx
GenericName=Public transport navigator GenericName=Public transport navigator
GenericName[it]=Navigatore del trasporto pubblico
GenericName[nl]=Navigator van openbaar vervoer GenericName[nl]=Navigator van openbaar vervoer
GenericName[pl]=Przemieszczanie się transportem publicznym GenericName[pl]=Przemieszczanie się transportem publicznym
GenericName[pt]=Navegador de transportes públicos GenericName[pt]=Navegador de transportes públicos
...@@ -19,6 +21,7 @@ Exec=ktrip ...@@ -19,6 +21,7 @@ Exec=ktrip
Icon=org.kde.ktrip Icon=org.kde.ktrip
Type=Application Type=Application
Comment=Public transport navigator. Comment=Public transport navigator.
Comment[it]=Navigatore del trasporto pubblico.
Comment[nl]=Navigator van openbaar vervoer. Comment[nl]=Navigator van openbaar vervoer.
Comment[pl]=Przemieszczanie się transportem publicznym. Comment[pl]=Przemieszczanie się transportem publicznym.
Comment[pt]=Navegador de transportes públicos. Comment[pt]=Navegador de transportes públicos.
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