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"

kcms/nightcolor/kcm_nightcolor.json

@@ -5,6 +5,7 @@
         "Description[bg]": "Регулиране на цветната температура според часа",
         "Description[ca@valencia]": "Ajusta la temperatura del color en funció de l'hora",
         "Description[ca]": "Ajusta la temperatura del color en funció de l'hora",
+        "Description[en_GB]": "Adjust colour temperature based on time",
         "Description[es]": "Ajustar la temperatura del color según la hora",
         "Description[eu]": "Egokitu kolorearen tenperatura orduaren arabera",
         "Description[fr]": "Ajuster la température de couleurs selon les heures.",

systemmonitor/org.kde.systemmonitor.desktop

@@ -7,6 +7,7 @@ Name[ar]=نشاط النظام
 Name[bg]=Системна активност
 Name[ca]=Activitat del sistema
 Name[ca@valencia]=Activitat del sistema
+Name[en_GB]=System Activity
 Name[es]=Actividad del sistema
 Name[eu]=Sistemaren jarduera
 Name[fr]=Activité du système