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"

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"
9861ac18 · l10n daemon script · 1ec8e6cd · 9861ac18
--- a/src/effects/scale/package/metadata.json
+++ b/src/effects/scale/package/metadata.json
@@ -64,7 +64,7 @@
        "Description[eu]": "Leihoak emeki barrura eta kanpora eskalatu haiek erakutsi edo ezkutatzean",
        "Description[fi]": "Skaalaa ponnahdusikkunat pehmeästi näytölle tai näytöltä",
        "Description[fr]": "Faire un re-dimensionnement en avant ou en arrière des fenêtres lorsqu'elles sont affichées ou masquées",
-        "Description[gl]": "Facer que as xanelas crezan ou decrezan suavemente cando se mostran ou agochan.",
+        "Description[gl]": "Facer que as xanelas crezan ou decrezan suavemente cando se amosan ou agochan.",
        "Description[ia]": "Face que fenestras pote dulcemente scalar intra e foras quando illos es monstrate o celate",
        "Description[id]": "Buat jendela secara halus menskala ketika ia ditampilkan atau disembunyikan",
        "Description[it]": "Ridimensiona le finestre dolcemente quando sono mostrate o nascoste",