Commit 4621c97b 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 0318d810
......@@ -18,7 +18,6 @@ GenericName[sk]=Pozemné ovládanie dronov
GenericName[sl]=Letalska kontrola dronov
GenericName[sv]=Markkontroll av drönare
GenericName[uk]=Програма для керування дроном
GenericName[x-test]=xxDrone ground controlxx
Terminal=false
Name=Kirogi
Name[ca]=Kirogi
......@@ -37,7 +36,6 @@ Name[sk]=Kirogi
Name[sl]=Kirogi
Name[sv]=Kirogi
Name[uk]=Kirogi
Name[x-test]=xxKirogixx
Name[zh_TW]=Kirogi
Categories=Qt;KDE;Network;IRCClient;Science;Geoscience;RemoteAccess;Sports;Photography
X-DBUS-StartupType=Unique
......
......@@ -18,4 +18,3 @@ Comment[sk]=Plugin podpory vozidla Kirogi
Comment[sl]=Vtičnik za podporo zrakoplovov Kirogi
Comment[sv]=Kirogi insticksprogram för fordonsstöd
Comment[uk]=Додаток підтримки дронів Kirogi
Comment[x-test]=xxKirogi Vehicle Support Pluginxx
......@@ -16,8 +16,7 @@
"Name[pt]": "Patrick José Pereira",
"Name[sl]": "Patrick José Pereira",
"Name[sv]": "Patrick José Pereira",
"Name[uk]": "Patrick José Pereira",
"Name[x-test]": "xxPatrick José Pereiraxx"
"Name[uk]": "Patrick José Pereira"
}
],
"Description": "A Kirogi plugin to support MAVLink vehicles",
......@@ -33,7 +32,6 @@
"Description[sl]": "Kirogi vtičnik za podporo naprav MAVLink",
"Description[sv]": "Ett Kirogi insticksprogram för att stödja MAVLink-fordon",
"Description[uk]": "Додаток до Kirogi для підтримки машин MAVLink",
"Description[x-test]": "xxA Kirogi plugin to support MAVLink vehiclesxx",
"Icon": "uav",
"Name": "MAVLink",
"Name[ca@valencia]": "MAVLink",
......@@ -49,7 +47,6 @@
"Name[sl]": "MAVLink",
"Name[sv]": "MAVLink",
"Name[uk]": "MAVLink",
"Name[x-test]": "xxMAVLinkxx",
"ServiceTypes": [
"Kirogi/VehicleSupport"
]
......
......@@ -18,8 +18,7 @@
"Name[sk]": "Eike Hein",
"Name[sl]": "Eike Hein",
"Name[sv]": "Eike Hein",
"Name[uk]": "Eike Hein",
"Name[x-test]": "xxEike Heinxx"
"Name[uk]": "Eike Hein"
}
],
"Description": "A Kirogi plugin to support Parrot UAVs",
......@@ -36,7 +35,6 @@
"Description[sl]": "Kirogi vtičnik za podporo naprav Parrot UAV",
"Description[sv]": "Ett Kirogi insticksprogram för att stödja Parrot drönare",
"Description[uk]": "Додаток до Kirogi для підтримки дронів Parrot",
"Description[x-test]": "xxA Kirogi plugin to support Parrot UAVsxx",
"Icon": "uav",
"Name": "Parrot",
"Name[ca@valencia]": "Parrot",
......@@ -53,7 +51,6 @@
"Name[sl]": "Parrot",
"Name[sv]": "Parrot",
"Name[uk]": "Parrot",
"Name[x-test]": "xxParrotxx",
"ServiceTypes": [
"Kirogi/VehicleSupport"
]
......
......@@ -18,8 +18,7 @@
"Name[sk]": "Eike Hein",
"Name[sl]": "Eike Hein",
"Name[sv]": "Eike Hein",
"Name[uk]": "Eike Hein",
"Name[x-test]": "xxEike Heinxx"
"Name[uk]": "Eike Hein"
}
],
"Description": "A Kirogi plugin to support the Ryze Tello UAV",
......@@ -36,7 +35,6 @@
"Description[sl]": "Kirogi vtičnik za podporo naprav Ryze Tello UAV",
"Description[sv]": "Ett Kirogi insticksprogram för att stödja Ryze Tello drönare",
"Description[uk]": "Додаток до Kirogi для підтримки дронів Ryze Tello",
"Description[x-test]": "xxA Kirogi plugin to support the Ryze Tello UAVxx",
"Icon": "uav",
"Name": "Ryze Tello",
"Name[ca@valencia]": "Ryze Tello",
......@@ -54,7 +52,6 @@
"Name[sl]": "Ryze Tello",
"Name[sv]": "Ryze Tello",
"Name[uk]": "Ryze Tello",
"Name[x-test]": "xxRyze Telloxx",
"ServiceTypes": [
"Kirogi/VehicleSupport"
]
......
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