Commit 397481c5 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 0d7a5c3f
......@@ -4,6 +4,7 @@ DesktopEntry=org.kde.itinerary
Name=KDE Itinerary
Name[ca]=KDE Itinerary
Name[ca@valencia]=KDE Itinerary
Name[de]=KDE-Itinerary
Name[en_GB]=KDE Itinerary
Name[es]=KDE Itinerary
Name[et]=KDE itineraar
......@@ -51,6 +52,7 @@ Comment[x-test]=xxTravel assistance application.xx
Name=Disruption
Name[ca]=Interrupció
Name[ca@valencia]=Interrupció
Name[de]=Störung
Name[en_GB]=Disruption
Name[es]=Alteración
Name[et]=Häired
......
......@@ -2,6 +2,7 @@
Name=KDE Itinerary
Name[ca]=KDE Itinerary
Name[ca@valencia]=KDE Itinerary
Name[de]=KDE-Itinerary
Name[en_GB]=KDE Itinerary
Name[es]=KDE Itinerary
Name[et]=KDE itineraar
......@@ -24,6 +25,7 @@ Name[x-test]=xxKDE Itineraryxx
GenericName=Itinerary management
GenericName[ca]=Gestió de l'itinerari
GenericName[ca@valencia]=Gestió de l'itinerari
GenericName[de]=Reiseplanverwaltung
GenericName[en_GB]=Itinerary management
GenericName[es]=Gestión de itinerarios
GenericName[et]=Itineraarihaldus
......
Supports Markdown
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