Commit cec4a273 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 c217379e
......@@ -9,6 +9,7 @@
"Name[cs]": "Patrick José Pereira",
"Name[es]": "Patrick José Pereira",
"Name[et]": "Patrick José Pereira",
"Name[fr]": "Patrick José Pereira",
"Name[it]": "Patrick José Pereira",
"Name[ko]": "Patrick José Pereira",
"Name[nl]": "Patrick José Pereira",
......@@ -23,6 +24,7 @@
"Description[ca]": "Un connector del Kirogi per admetre vehicles MAVLink",
"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",
"Description[it]": "Un'estensione di Kirogi per supportare i veicoli MAVLink",
"Description[ko]": "MAVLink 비행체를 지원하는 기러기 플러그인",
"Description[nl]": "Een Kirogi plug-in om MAVLink voertuigen te ondersteunen",
......@@ -37,6 +39,7 @@
"Name[cs]": "MAVLink",
"Name[es]": "MAVLink",
"Name[et]": "MAVLink",
"Name[fr]": "MAVLink",
"Name[it]": "MAVLink",
"Name[ko]": "MAVLink",
"Name[nl]": "MAVLink",
......
......@@ -9,6 +9,7 @@
"Name[cs]": "Eike Hein",
"Name[es]": "Eike Hein",
"Name[et]": "Eike Hein",
"Name[fr]": "Eike Hein",
"Name[it]": "Eike Hein",
"Name[ko]": "Eike Hein",
"Name[nl]": "Eike Hein",
......@@ -25,6 +26,7 @@
"Description[ca]": "Un connector del Kirogi per admetre l'UAV Parrot",
"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",
"Description[it]": "Un'estensione di Kirogi per supportare gli APR Parrot",
"Description[ko]": "Parrot UAV를 지원하는 기러기 플러그인",
"Description[nl]": "Een Kirogi plug-in om Parrot UAV's te ondersteunen",
......@@ -39,6 +41,7 @@
"Name[ca]": "Parrot",
"Name[es]": "Parrot",
"Name[et]": "Parrot",
"Name[fr]": "Parrot",
"Name[it]": "Parrot",
"Name[ko]": "Parrot",
"Name[nl]": "Papegaai",
......
......@@ -9,6 +9,7 @@
"Name[cs]": "Eike Hein",
"Name[es]": "Eike Hein",
"Name[et]": "Eike Hein",
"Name[fr]": "Eike Hein",
"Name[it]": "Eike Hein",
"Name[ko]": "Eike Hein",
"Name[nl]": "Eike Hein",
......@@ -25,6 +26,7 @@
"Description[ca]": "Un connector del Kirogi per admetre l'UAV Ryze Tello",
"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",
"Description[it]": "Un'estensione di Kirogi per supportare gli APR Ryze Tello",
"Description[ko]": "Ryze Tello UAV를 지원하는 기러기 플러그인",
"Description[nl]": "Een Kirogi plug-in om de Ryze Tello UAV te ondersteunen",
......@@ -40,6 +42,7 @@
"Name[cs]": "Ryze Tello",
"Name[es]": "Ryze Tello",
"Name[et]": "Ryze Tello",
"Name[fr]": "Ryze Tello",
"Name[it]": "Ryze Tello",
"Name[ko]": "Ryze Tello",
"Name[nl]": "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