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"

colors/BreezeClassic.colors

@@ -123,6 +123,7 @@ Name[hu]=Breeze Classic
 Name[ia]=Brisa Classic
 Name[id]=Breeze Klasik
 Name[it]=Brezza classico
+Name[ja]=Breeze クラシック
 Name[ko]=Breeze 고전
 Name[nl]=Breeze Classic
 Name[nn]=Breeze klassisk

wallpapers/Next/metadata.desktop

@@ -16,6 +16,7 @@ Name[hu]=Honeywave
 Name[ia]=Honeywave
 Name[id]=Honeywave
 Name[it]=Honeywave
+Name[ja]=Honeywave
 Name[ko]=허니웨이브
 Name[nl]=Honeywave
 Name[pl]=Fala miodu