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"

plugins/mousepad/kdeconnect_mousepad.json

@@ -99,6 +99,7 @@
         "Name[hu]": "Virtuális bevitel",
         "Name[id]": "Virtual input",
         "Name[it]": "Inserimento virtuale",
+        "Name[ja]": "仮想入力",
         "Name[ko]": "가상 입력",
         "Name[nl]": "Virtuele invoer",
         "Name[nn]": "Virtuelt tastatur",

plugins/mousepad_windows/kdeconnect_mousepad.json

@@ -99,6 +99,7 @@
         "Name[hu]": "Virtuális bevitel",
         "Name[id]": "Virtual input",
         "Name[it]": "Inserimento virtuale",
+        "Name[ja]": "仮想入力",
         "Name[ko]": "가상 입력",
         "Name[nl]": "Virtuele invoer",
         "Name[nn]": "Virtuelt tastatur",

plugins/notifications/kdeconnect_notifications.json

@@ -96,7 +96,7 @@
         "Name[gl]": "Recibir notificacións",
         "Name[id]": "Receive notifications",
         "Name[it]": "Ricevi notifiche",
-        "Name[ja]": "通知を受け取る",
+        "Name[ja]": "通知の受信",
         "Name[ko]": "알림 받기",
         "Name[nl]": "Meldingen ontvangen",
         "Name[nn]": "Få varslingar",

plugins/sendnotifications/kdeconnect_sendnotifications.json

@@ -93,7 +93,7 @@
         "Name[gl]": "Enviar notificacións",
         "Name[id]": "Send notifications",
         "Name[it]": "Invia notifiche",
-        "Name[ja]": "通知を送信",
+        "Name[ja]": "通知の送信",
         "Name[ko]": "알림 보내기",
         "Name[nl]": "Stuur meldingen",
         "Name[nn]": "Send varslingar",