Commit 3d61a273 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 ee0e42ba
......@@ -15,7 +15,7 @@ Name[en_GB]=Marble
Name[eo]=Marble
Name[es]=Marble
Name[et]=Marble
Name[eu]=Marmola
Name[eu]=Marble
Name[fi]=Marble
Name[fr]=Marble
Name[ga]=Marble
......
......@@ -14,7 +14,7 @@ Name[en_GB]=Marble Part
Name[eo]=Marble Part
Name[es]=Part Marble
Name[et]=Marble komponent
Name[eu]=Marmolaren zatia
Name[eu]=Marble-ren atala
Name[fi]=Marble-osa
Name[fr]=Composant Marble
Name[ga]=Comhpháirt Marble
......
......@@ -15,7 +15,7 @@ Name[en_GB]=Marble
Name[eo]=Marble
Name[es]=Marble
Name[et]=Marble
Name[eu]=Marmola
Name[eu]=Marble
Name[fi]=Marble
Name[fr]=Marble
Name[ga]=Marble
......
......@@ -12,6 +12,7 @@ Name[el]=KDE Marble
Name[en_GB]=KDE Marble
Name[es]=KDE Marble
Name[et]=KDE Marble
Name[eu]=KDEren Marble
Name[fi]=KDE Marble
Name[fr]=KDE Marble
Name[gl]=KDE Marble
......@@ -45,6 +46,7 @@ GenericName[en_GB]=Virtual Globe
GenericName[eo]=Virtuala Globuso
GenericName[es]=Globo terráqueo virtual
GenericName[et]=Virtuaalgloobus
GenericName[eu]=Alegiazko globoa
GenericName[fi]=Virtuaalinen maapallo
GenericName[fr]=Globe virtuel
GenericName[gl]=Globo virtual
......@@ -81,6 +83,7 @@ Comment[el]=Πλοήγηση και χάρτες
Comment[en_GB]=Navigation and Maps
Comment[es]=Navegación y mapas
Comment[et]=Liikumine ja kaardid
Comment[eu]=Nabigatzea eta mapak
Comment[fi]=Navigointi ja kartat
Comment[fr]=Navigation et cartes
Comment[gl]=Navegación e mapas
......
......@@ -12,6 +12,7 @@ Name[el]=Χάρτες Marble
Name[en_GB]=Marble Maps
Name[es]=Mapas de Marble
Name[et]=Marble Maps
Name[eu]=Marble-ren mapak
Name[fi]=Marble-kartat
Name[fr]=Cartes Marble
Name[gl]=Mapas de Marble
......@@ -42,6 +43,7 @@ GenericName[el]=Πλοήγηση OpenStreetMap
GenericName[en_GB]=OpenStreetMap Navigation
GenericName[es]=Navegación de OpenStreetMap
GenericName[et]=OpenStreetMapi liikumine
GenericName[eu]=OpenStreetMap nabigatzea
GenericName[fi]=OpenStreetMap-navigointi
GenericName[fr]=Navigation OpenStreetMap
GenericName[gl]=Navegación con OpenStreetMap
......@@ -72,6 +74,7 @@ Comment[el]=Βρείτε τον δρόμο σας
Comment[en_GB]=Find your way
Comment[es]=Encuentre su ruta
Comment[et]=Oma teekonna leidmine
Comment[eu]=Aurkitu zure bidea
Comment[fi]=Löydä perille
Comment[fr]=Trouvez votre chemin
Comment[gl]=Atopa o teu camiño
......
......@@ -16,7 +16,7 @@ Name[en_GB]=Marble
Name[eo]=Marble
Name[es]=Marble
Name[et]=Marble
Name[eu]=Marmola
Name[eu]=Marble
Name[fi]=Marble
Name[fr]=Marble
Name[ga]=Marble
......@@ -70,6 +70,7 @@ GenericName[en_GB]=Virtual Globe
GenericName[eo]=Virtuala Globuso
GenericName[es]=Globo terráqueo virtual
GenericName[et]=Virtuaalgloobus
GenericName[eu]=Alegiazko globoa
GenericName[fi]=Virtuaalinen maapallo
GenericName[fr]=Globe virtuel
GenericName[gl]=Globo virtual
......@@ -106,6 +107,7 @@ Comment[el]=Πλοήγηση και χάρτες
Comment[en_GB]=Navigation and Maps
Comment[es]=Navegación y mapas
Comment[et]=Liikumine ja kaardid
Comment[eu]=Nabigatzea eta mapak
Comment[fi]=Navigointi ja kartat
Comment[fr]=Navigation et cartes
Comment[gl]=Navegación e mapas
......
......@@ -62,7 +62,7 @@ Comment[en_GB]=Shows the time in different parts of the world
Comment[eo]=Montri la horojn en diversaj lokoj de la mondo
Comment[es]=Muestra la hora en las diferentes partes del mundo
Comment[et]=Kellaaja näitamine maailma eri kohtades
Comment[eu]=Erakutsi munduko zati desberdinetako orduak
Comment[eu]=Munduko hainbat tokitako ordua erakusten du
Comment[fi]=Näyttää kellonajan eri puolilla maailmaa
Comment[fr]=Affiche l'heure à travers le monde
Comment[ga]=Taispeáin an t-am in áiteanna ar fud an domhain
......
......@@ -9,6 +9,7 @@ Name[el]=Παγκόσμιος χάρτης
Name[en_GB]=World Map
Name[es]=Mapa mundial
Name[et]=Maailmakaart
Name[eu]=Munduko mapa
Name[fi]=Maailmankartta
Name[fr]=Carte du monde
Name[gl]=Mapa do mundo
......@@ -39,6 +40,7 @@ Comment[el]=Η ωραία μας υδρόγειος ως ταπετσαρία
Comment[en_GB]=Our beautiful globe as your wallpaper
Comment[es]=Nuestro bello globo como fondo de escritorio
Comment[et]=Meie kaunis maakera sinu taustapildina
Comment[eu]=Gure globo ederra zure horma-paper gisa
Comment[fi]=Maapallo taustakuvanasi
Comment[fr]=Notre magnifique globe comme fond d'écran
Comment[gl]=O noso fermoso globo terráqueo como fondo de escritorio
......
......@@ -12,6 +12,7 @@ Name[en_GB]=OpenStreetMap with Marble
Name[eo]=OpenStreetMap per Marble
Name[es]=OpenStreetMap con Marble
Name[et]=OpenStreetMap Marbles
Name[eu]=OpenStreetMap Marble-rekin
Name[fi]=OpenStreetMap Marblessa
Name[fr]=OpenStreetMap avec Marble
Name[ga]=OpenStreetMap le Marble
......@@ -54,6 +55,7 @@ Comment[en_GB]=Lookup places in OpenStreetMap with Marble
Comment[eo]=Serĉi lokojn en OpenStreetMap per Marble
Comment[es]=Buscar lugares en OpenStreetMap con Marble
Comment[et]=Kohtade otsimine OpenStreetMapis Marblega
Comment[eu]=OpenStreetMap-en tokiak bilatu Marble erabiliz
Comment[fi]=Paikkojen etsiminen OpenStreetMapista Marblella
Comment[fr]=Cherche des lieux sur OpenStreetMap avec Marble
Comment[ga]=Aimsigh áiteanna in OpenStreetMap le Marble
......
......@@ -16,7 +16,7 @@ Name[en_GB]=Marble
Name[eo]=Marble
Name[es]=Marble
Name[et]=Marble
Name[eu]=Marmola
Name[eu]=Marble
Name[fi]=Marble
Name[fr]=Marble
Name[ga]=Marble
......@@ -71,6 +71,7 @@ GenericName[en_GB]=Virtual Globe
GenericName[eo]=Virtuala Globuso
GenericName[es]=Globo terráqueo virtual
GenericName[et]=Virtuaalgloobus
GenericName[eu]=Alegiazko globoa
GenericName[fi]=Virtuaalinen maapallo
GenericName[fr]=Globe virtuel
GenericName[gl]=Globo virtual
......
......@@ -14,7 +14,7 @@ Name[en_GB]=Marble Part
Name[eo]=Marble Part
Name[es]=Part Marble
Name[et]=Marble komponent
Name[eu]=Marmolaren zatia
Name[eu]=Marble-ren atala
Name[fi]=Marble-osa
Name[fr]=Composant Marble
Name[ga]=Comhpháirt Marble
......
......@@ -13,6 +13,7 @@ Name[en_GB]=GPX Geographic Data
Name[eo]=GPX Geografiaj datumoj
Name[es]=Datos geográficos GPX
Name[et]=GPX geograafilised andmed
Name[eu]=GPX datu geografikoak
Name[fi]=GPX-paikkatieto
Name[fr]=Données géographiques GPX
Name[gl]=Datos xeográficos GPX
......
......@@ -16,7 +16,7 @@ Name[en_GB]=Marble
Name[eo]=Marble
Name[es]=Marble
Name[et]=Marble
Name[eu]=Marmola
Name[eu]=Marble
Name[fi]=Marble
Name[fr]=Marble
Name[ga]=Marble
......@@ -70,6 +70,7 @@ GenericName[en_GB]=Virtual Globe
GenericName[eo]=Virtuala Globuso
GenericName[es]=Globo terráqueo virtual
GenericName[et]=Virtuaalgloobus
GenericName[eu]=Alegiazko globoa
GenericName[fi]=Virtuaalinen maapallo
GenericName[fr]=Globe virtuel
GenericName[gl]=Globo virtual
......
......@@ -14,7 +14,7 @@ Name[en_GB]=Marble Part
Name[eo]=Marble Part
Name[es]=Part Marble
Name[et]=Marble komponent
Name[eu]=Marmolaren zatia
Name[eu]=Marble-ren atala
Name[fi]=Marble-osa
Name[fr]=Composant Marble
Name[ga]=Comhpháirt Marble
......
......@@ -10,6 +10,7 @@ Name[el]=Γεωγραφικά δεδομένα GeoJSON
Name[en_GB]=GeoJSON Geographic Data
Name[es]=Datos geográficos GeoJSON
Name[et]=GeoJSON-i geograafilised andmed
Name[eu]=GeoJSON datu geografikoak
Name[fi]=GeoJSON-paikkatieto
Name[fr]=Données géographiques GeoJSON
Name[gl]=Datos xeográficos GeoJSON
......
......@@ -16,7 +16,7 @@ Name[en_GB]=Marble
Name[eo]=Marble
Name[es]=Marble
Name[et]=Marble
Name[eu]=Marmola
Name[eu]=Marble
Name[fi]=Marble
Name[fr]=Marble
Name[ga]=Marble
......@@ -71,6 +71,7 @@ GenericName[en_GB]=Virtual Globe
GenericName[eo]=Virtuala Globuso
GenericName[es]=Globo terráqueo virtual
GenericName[et]=Virtuaalgloobus
GenericName[eu]=Alegiazko globoa
GenericName[fi]=Virtuaalinen maapallo
GenericName[fr]=Globe virtuel
GenericName[gl]=Globo virtual
......
......@@ -16,7 +16,7 @@ Name[en_GB]=Marble
Name[eo]=Marble
Name[es]=Marble
Name[et]=Marble
Name[eu]=Marmola
Name[eu]=Marble
Name[fi]=Marble
Name[fr]=Marble
Name[ga]=Marble
......@@ -71,6 +71,7 @@ GenericName[en_GB]=Virtual Globe
GenericName[eo]=Virtuala Globuso
GenericName[es]=Globo terráqueo virtual
GenericName[et]=Virtuaalgloobus
GenericName[eu]=Alegiazko globoa
GenericName[fi]=Virtuaalinen maapallo
GenericName[fr]=Globe virtuel
GenericName[gl]=Globo virtual
......
......@@ -14,7 +14,7 @@ Name[en_GB]=Marble Part
Name[eo]=Marble Part
Name[es]=Part Marble
Name[et]=Marble komponent
Name[eu]=Marmolaren zatia
Name[eu]=Marble-ren atala
Name[fi]=Marble-osa
Name[fr]=Composant Marble
Name[ga]=Comhpháirt Marble
......
......@@ -14,7 +14,7 @@ Name[en_GB]=Marble Part
Name[eo]=Marble Part
Name[es]=Part Marble
Name[et]=Marble komponent
Name[eu]=Marmolaren zatia
Name[eu]=Marble-ren atala
Name[fi]=Marble-osa
Name[fr]=Composant Marble
Name[ga]=Comhpháirt Marble
......
......@@ -13,6 +13,7 @@ Name[en_GB]=KML Geographic Data
Name[eo]=KML Geografiaj datumoj
Name[es]=Datos geográficos KML
Name[et]=KML geograafilised andmed
Name[eu]=KML datu geografikoak
Name[fi]=KML-paikkatieto
Name[fr]=Données géographiques KML
Name[gl]=Datos xeográficos KML
......
......@@ -13,6 +13,7 @@ Name[en_GB]=KML Geographic Compressed Data
Name[eo]=KML Densigitaj Geografiaj datumoj
Name[es]=Datos geográficos comprimidos KML
Name[et]=KML tihendatud geograafilised andmed
Name[eu]=KML datu geografiko konprimatuak
Name[fi]=Pakattu KML-paikkatieto
Name[fr]=Données géographiques KML compressées
Name[gl]=Datos xeográficos comprimidos KML
......
......@@ -16,7 +16,7 @@ Name[en_GB]=Marble
Name[eo]=Marble
Name[es]=Marble
Name[et]=Marble
Name[eu]=Marmola
Name[eu]=Marble
Name[fi]=Marble
Name[fr]=Marble
Name[ga]=Marble
......@@ -71,6 +71,7 @@ GenericName[en_GB]=Virtual Globe
GenericName[eo]=Virtuala Globuso
GenericName[es]=Globo terráqueo virtual
GenericName[et]=Virtuaalgloobus
GenericName[eu]=Alegiazko globoa
GenericName[fi]=Virtuaalinen maapallo
GenericName[fr]=Globe virtuel
GenericName[gl]=Globo virtual
......
......@@ -14,7 +14,7 @@ Name[en_GB]=Marble Part
Name[eo]=Marble Part
Name[es]=Part Marble
Name[et]=Marble komponent
Name[eu]=Marmolaren zatia
Name[eu]=Marble-ren atala
Name[fi]=Marble-osa
Name[fr]=Composant Marble
Name[ga]=Comhpháirt Marble
......
......@@ -13,6 +13,7 @@ Name[en_GB]=OSM Data
Name[eo]=OSM Datumoj
Name[es]=Datos OSM
Name[et]=OSM andmed
Name[eu]=OSM datuak
Name[fi]=OSM-data
Name[fr]=Données OSM
Name[gl]=Datos de OSM
......
......@@ -14,7 +14,7 @@ Name[en_GB]=Marble Part
Name[eo]=Marble Part
Name[es]=Part Marble
Name[et]=Marble komponent
Name[eu]=Marmolaren zatia
Name[eu]=Marble-ren atala
Name[fi]=Marble-osa
Name[fr]=Composant Marble
Name[ga]=Comhpháirt Marble
......
......@@ -16,7 +16,7 @@ Name[en_GB]=Marble
Name[eo]=Marble
Name[es]=Marble
Name[et]=Marble
Name[eu]=Marmola
Name[eu]=Marble
Name[fi]=Marble
Name[fr]=Marble
Name[ga]=Marble
......@@ -71,6 +71,7 @@ GenericName[en_GB]=Virtual Globe
GenericName[eo]=Virtuala Globuso
GenericName[es]=Globo terráqueo virtual
GenericName[et]=Virtuaalgloobus
GenericName[eu]=Alegiazko globoa
GenericName[fi]=Virtuaalinen maapallo
GenericName[fr]=Globe virtuel
GenericName[gl]=Globo virtual
......
......@@ -13,6 +13,7 @@ Name[en_GB]=ESRI Shapefile
Name[eo]=ESRI Shapefile
Name[es]=Archivo de formas ESRI
Name[et]=ESRI Shapefile
Name[eu]=ESRI formen fitxategia
Name[fi]=ESRI Shapefile
Name[fr]=Fichier de formes ESRI
Name[gl]=Ficheiro shapefile de ESRI
......
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