Commit 7467269a 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 3d6bea0c
......@@ -7,6 +7,7 @@ GenericName[ca]=Control terrestre de drons
GenericName[ca@valencia]=Control terrestre de drons
GenericName[es]=Control desde tierra de drones
GenericName[et]=Droonide maapealne juhtimine
GenericName[fr]=Contrôle sol pour drone
GenericName[it]=Controllo da terra dei droni
GenericName[ko]=드론 지상 제어
GenericName[nl]=Besturing vanaf de grond voor drones
......@@ -24,6 +25,7 @@ Name[ca@valencia]=Kirogi
Name[cs]=Kirogi
Name[es]=Kirogi
Name[et]=Kirogi
Name[fr]=Kirogi
Name[it]=Kirogi
Name[ko]=기러기
Name[nl]=Kirogi
......
......@@ -7,6 +7,7 @@ Comment[ca]=Connector de suport de vehicles Kirogi
Comment[ca@valencia]=Connector de suport de vehicles Kirogi
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
Comment[it]=Estensione di supporto per veicoli Kirogi
Comment[ko]=기러기 비행체 지원 플러그인
Comment[nl]=Kirogi plug-in voor ondersteuning van voertuig
......
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