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"

plasma_phone_components.notifyrc

@@ -2,9 +2,12 @@
 IconName=preferences-system-windows-effect-screenshot
 Name=Plasma
 Name[ca]=Plasma
+Name[cs]=Plasma
 Name[es]=Plasma
 Name[nl]=Plasma
+Name[nn]=Plasma
 Name[pt]=Plasma
+Name[pt_BR]=Plasma
 Name[sl]=Plasma
 Name[sv]=Plasma
 Name[uk]=Плазма
@@ -15,7 +18,9 @@ Name=Captured
 Name[ca]=Captura
 Name[es]=Capturado
 Name[nl]=Opgenomen
+Name[nn]=Opptak
 Name[pt]=Capturada
+Name[pt_BR]=Capturado
 Name[sl]=Zajeto
 Name[sv]=Lagrad
 Name[uk]=Захоплено
@@ -24,7 +29,9 @@ Comment=Captured
 Comment[ca]=Captura
 Comment[es]=Capturado
 Comment[nl]=Opgenomen
+Comment[nn]=Opptak
 Comment[pt]=Capturada
+Comment[pt_BR]=Capturado
 Comment[sl]=Zajeto
 Comment[sv]=Lagrad
 Comment[uk]=Захоплено