From 6ce11522437995cf7ab3932cc051a9971b798b1c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 6 Nov 2018 06:01:41 +0100 Subject: [PATCH] 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" --- effects/scale/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/scale/package/metadata.desktop b/effects/scale/package/metadata.desktop index e4b5a18830..e7e62a1ab2 100644 --- a/effects/scale/package/metadata.desktop +++ b/effects/scale/package/metadata.desktop @@ -31,6 +31,7 @@ Icon=preferences-system-windows-effect-scale Comment=Make windows smoothly scale in and out when they are shown or hidden Comment[ca]=Fa que les finestres entrin o surtin volant quan es mostren o s'oculten Comment[ca@valencia]=Fa que les finestres entrin o isquen volant quan es mostren o s'oculten +Comment[de]=Ändert die Fenstergröße langsam beim Ein- oder Ausblenden Comment[gl]=Facer que as xanelas crezan ou decrezan suavemente cando se mostran ou agochan Comment[id]=Buat jendela menskala besar atau kecil secara mulus ketika ia ditampilkan atau disembunyikan Comment[nl]=Laat vensters vloeiend kleiner en groter schalen als ze worden getoond of verborgen