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"
KDE · Jan 10, 2018 · b05f2f8 · b05f2f8
1 parent ca7fe7e
commit b05f2f8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 0 deletions.
diff --git a/src/apps/marble-kde/org.kde.marble.desktop b/src/apps/marble-kde/org.kde.marble.desktop
@@ -13,6 +13,7 @@ Name[en_GB]=KDE Marble
 Name[es]=KDE Marble
 Name[et]=KDE Marble
 Name[fi]=KDE Marble
+Name[fr]=KDE Marble
 Name[gl]=KDE Marble
 Name[it]=Marble KDE
 Name[nl]=KDE Marble
@@ -75,6 +76,7 @@ Comment[en_GB]=Navigation and Maps
 Comment[es]=Navegación y mapas
 Comment[et]=Liikumine ja kaardid
 Comment[fi]=Navigointi ja kartat
+Comment[fr]=Navigation et cartes
 Comment[gl]=Navegación e mapas
 Comment[it]=Navigazione e mappe
 Comment[nl]=Navigatie en kaarten

diff --git a/src/apps/marble-maps/org.kde.marble.maps.desktop b/src/apps/marble-maps/org.kde.marble.maps.desktop
@@ -13,6 +13,7 @@ Name[en_GB]=Marble Maps
 Name[es]=Mapas de Marble
 Name[et]=Marble Maps
 Name[fi]=Marble-kartat
+Name[fr]=Cartes Marble
 Name[gl]=Mapas de Marble
 Name[it]=Mappe di Marble
 Name[nl]=Kaarten van Marble
@@ -37,6 +38,7 @@ GenericName[en_GB]=OpenStreetMap Navigation
 GenericName[es]=Navegación de OpenStreetMap
 GenericName[et]=OpenStreetMapi liikumine
 GenericName[fi]=OpenStreetMap-navigointi
+GenericName[fr]=Navigation OpenStreetMap
 GenericName[gl]=Navegación con OpenStreetMap
 GenericName[it]=Navigazione con OpenStreetMap
 GenericName[nl]=Navigatie met OpenStreetMap
@@ -62,6 +64,7 @@ Comment[en_GB]=Find your way
 Comment[es]=Encuentre su ruta
 Comment[et]=Oma teekonna leidmine
 Comment[fi]=Löydä perille
+Comment[fr]=Trouvez votre chemin
 Comment[gl]=Atopa o teu camiño
 Comment[it]=Trova la via
 Comment[nl]=Uw weg vinden

diff --git a/src/apps/marble-qt/org.kde.marble-qt.desktop b/src/apps/marble-qt/org.kde.marble-qt.desktop
@@ -106,6 +106,7 @@ Comment[en_GB]=Navigation and Maps
 Comment[es]=Navegación y mapas
 Comment[et]=Liikumine ja kaardid
 Comment[fi]=Navigointi ja kartat
+Comment[fr]=Navigation et cartes
 Comment[gl]=Navegación e mapas
 Comment[it]=Navigazione e mappe
 Comment[nl]=Navigatie en kaarten

diff --git a/src/plasma/wallpapers/worldmap/metadata.desktop b/src/plasma/wallpapers/worldmap/metadata.desktop
@@ -10,6 +10,7 @@ Name[en_GB]=World Map
 Name[es]=Mapa mundial
 Name[et]=Maailmakaart
 Name[fi]=Maailmankartta
+Name[fr]=Carte du monde
 Name[it]=Mappa del mondo
 Name[nl]=Wereldkaart
 Name[pl]=Mapa świata

diff --git a/src/plugins/runner/json/marble_thumbnail_geojson.desktop b/src/plugins/runner/json/marble_thumbnail_geojson.desktop
@@ -11,6 +11,7 @@ Name[en_GB]=GeoJSON Geographic Data
 Name[es]=Datos geográficos GeoJSON
 Name[et]=GeoJSON-i geograafilised andmed
 Name[fi]=GeoJSON-paikkatieto
+Name[fr]=Données géographiques GeoJSON
 Name[gl]=Datos xeográficos GeoJSON
 Name[it]=Dati geografici GeoJSON
 Name[nl]=GeoJSON Geografische gegevens