Commit 200a219e 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 f8bdb085
Pipeline #35793 skipped
......@@ -5,6 +5,7 @@ Icon=kirogi
GenericName=Drone ground control
GenericName[ca]=Control terrestre de drons
GenericName[ca@valencia]=Control terrestre de drons
GenericName[en_GB]=Drone ground control
GenericName[es]=Control desde tierra de drones
GenericName[et]=Droonide maapealne juhtimine
GenericName[fr]=Contrôle sol pour drone
......@@ -24,6 +25,7 @@ Name=Kirogi
Name[ca]=Kirogi
Name[ca@valencia]=Kirogi
Name[cs]=Kirogi
Name[en_GB]=Kirogi
Name[es]=Kirogi
Name[et]=Kirogi
Name[fr]=Kirogi
......
......@@ -5,6 +5,7 @@ X-KDE-Derived=
Comment=Kirogi Vehicle Support Plugin
Comment[ca]=Connector de suport de vehicles Kirogi
Comment[ca@valencia]=Connector de suport de vehicles Kirogi
Comment[en_GB]=Kirogi Vehicle Support Plugin
Comment[es]=Complemento de uso de vehículos Kirogi
Comment[et]=Kirogi drooni toetuse plugin
Comment[fr]=Module externe Kirogi pour prendre en charge un véhicule
......
......@@ -7,6 +7,7 @@
"Name[ca@valencia]": "Patrick José Pereira",
"Name[ca]": "Patrick José Pereira",
"Name[cs]": "Patrick José Pereira",
"Name[en_GB]": "Patrick José Pereira",
"Name[es]": "Patrick José Pereira",
"Name[et]": "Patrick José Pereira",
"Name[fr]": "Patrick José Pereira",
......@@ -23,6 +24,7 @@
"Description": "A Kirogi plugin to support MAVLink vehicles",
"Description[ca@valencia]": "Un connector del Kirogi per a admetre vehicles MAVLink",
"Description[ca]": "Un connector del Kirogi per a admetre vehicles MAVLink",
"Description[en_GB]": "A Kirogi plugin to support MAVLink vehicles",
"Description[es]": "Un complemento de Kirogi para usar los vehículos MAVLink",
"Description[et]": "Kirogi plugin MAVLinki sõidukite toetusega",
"Description[fr]": "Un module externe Kirogi pour prendre en charge un véhicule utilisant MAVLink",
......@@ -39,6 +41,7 @@
"Name[ca@valencia]": "MAVLink",
"Name[ca]": "MAVLink",
"Name[cs]": "MAVLink",
"Name[en_GB]": "MAVLink",
"Name[es]": "MAVLink",
"Name[et]": "MAVLink",
"Name[fr]": "MAVLink",
......
......@@ -7,6 +7,7 @@
"Name[ca@valencia]": "Eike Hein",
"Name[ca]": "Eike Hein",
"Name[cs]": "Eike Hein",
"Name[en_GB]": "Eike Hein",
"Name[es]": "Eike Hein",
"Name[et]": "Eike Hein",
"Name[fr]": "Eike Hein",
......@@ -25,6 +26,7 @@
"Description": "A Kirogi plugin to support Parrot UAVs",
"Description[ca@valencia]": "Un connector del Kirogi per a admetre l'UAV Parrot",
"Description[ca]": "Un connector del Kirogi per a admetre l'UAV Parrot",
"Description[en_GB]": "A Kirogi plugin to support Parrot UAVs",
"Description[es]": "Un complemento de Kirogi para usar los vehículos voladores no tripulados Parrot",
"Description[et]": "Kirogi plugin Parroti droonide toetusega",
"Description[fr]": "Un module externe Kirogi pour prendre en charge des drones Parrot",
......@@ -41,6 +43,7 @@
"Name": "Parrot",
"Name[ca@valencia]": "Parrot",
"Name[ca]": "Parrot",
"Name[en_GB]": "Parrot",
"Name[es]": "Parrot",
"Name[et]": "Parrot",
"Name[fr]": "Parrot",
......
......@@ -7,6 +7,7 @@
"Name[ca@valencia]": "Eike Hein",
"Name[ca]": "Eike Hein",
"Name[cs]": "Eike Hein",
"Name[en_GB]": "Eike Hein",
"Name[es]": "Eike Hein",
"Name[et]": "Eike Hein",
"Name[fr]": "Eike Hein",
......@@ -25,6 +26,7 @@
"Description": "A Kirogi plugin to support the Ryze Tello UAV",
"Description[ca@valencia]": "Un connector del Kirogi per a admetre l'UAV Ryze Tello",
"Description[ca]": "Un connector del Kirogi per a admetre l'UAV Ryze Tello",
"Description[en_GB]": "A Kirogi plugin to support the Ryze Tello UAV",
"Description[es]": "Un complemento de Kirogi para usar el vehículo volador no tripulado Ryze Tello",
"Description[et]": "Kirogi plugin Ryze Tello droonide toetusega",
"Description[fr]": "Un module externe Kirogi pour prendre en charge des drones Ryze Tello",
......@@ -42,6 +44,7 @@
"Name[ca@valencia]": "Ryze Tello",
"Name[ca]": "Ryze Tello",
"Name[cs]": "Ryze Tello",
"Name[en_GB]": "Ryze Tello",
"Name[es]": "Ryze Tello",
"Name[et]": "Ryze Tello",
"Name[fr]": "Ryze Tello",
......
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