Commit 0e5fc853 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 67fb670d
Pipeline #89701 skipped
[Desktop Entry]
Type=Application
Name=Marble Behaim
Name[ca]=Marble de Behaim
Name[ca]=Behaim del Marble
Name[ca@valencia]=Marble de Behaim
Name[de]=Marble Behaim
Name[en_GB]=Marble Behaim
......
......@@ -31,7 +31,7 @@ Name[x-test]=xxWorld Mapxx
Name[zh_CN]=世界地图
Name[zh_TW]=世界地圖
Comment=Our beautiful globe as your wallpaper
Comment[ca]=El nostre globus com a fons de pantalla
Comment[ca]=El nostre globus terraqüi com a fons de pantalla
Comment[ca@valencia]=El nostre globus com a fons de pantalla
Comment[cs]=Naše krásná planeta jako tapeta
Comment[da]=Vores smukke klode som din skrivebordsbaggrund
......
......@@ -45,7 +45,7 @@ Name[zh_TW]=Marble 的 OpenStreetMap 支援
Comment=Lookup places in OpenStreetMap with Marble
Comment[bg]=Търсене по карта OpenStreetMap с Marble
Comment[bs]=Traženje mjesta u OpenStreetMap sa Marble
Comment[ca]=Cerca llocs de l'OpenStreetMaps amb el Marble
Comment[ca]=Cerca llocs a l'OpenStreetMaps amb el Marble
Comment[ca@valencia]=Cerca llocs de l'OpenStreetMaps amb el Marble
Comment[cs]=Vyhledávat místa v OpenStreetMap pomocí Marble
Comment[da]=Slå steder op i OpenStreetMap med Marble
......
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