From 8f12ba90b9af0a15c6a5cbdb93619edb504d6df2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 11 Jan 2019 05:41:32 +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/fadingpopups/package/metadata.desktop | 2 ++ effects/scale/package/metadata.desktop | 1 + effects/squash/package/metadata.desktop | 2 ++ 3 files changed, 5 insertions(+) diff --git a/effects/fadingpopups/package/metadata.desktop b/effects/fadingpopups/package/metadata.desktop index 9fdecb9cf9..aae7193973 100644 --- a/effects/fadingpopups/package/metadata.desktop +++ b/effects/fadingpopups/package/metadata.desktop @@ -3,6 +3,7 @@ Name=Fading Popups Name[ca]=Missatges emergents esvaïts Name[ca@valencia]=Missatges emergents esvaïts Name[en_GB]=Fading Popups +Name[es]=Desvanecer ventanas emergentes Name[fi]=Hiipuvat ponnahdusikkunat Name[gl]=Xanelas emerxentes que esvaen Name[id]=Fading Popups @@ -22,6 +23,7 @@ Comment=Make popups smoothly fade in and out when they are shown or hidden Comment[ca]=Fa que els missatges emergents s'encenguin o s'apaguin de manera gradual quan es mostren o s'oculten Comment[ca@valencia]=Fa que els missatges emergents s'encenguin o s'apaguin de manera gradual quan es mostren o s'oculten Comment[en_GB]=Make popups smoothly fade in and out when they are shown or hidden +Comment[es]=Hace que las ventanas emergentes aparezcan o se desvanezcan suavemente al mostrarlas u ocultarlas Comment[fi]=Ponnahdusikkunat tulevat näkyviin tai poistuvat näkyvistä pehmeästi häivyttäen Comment[gl]=Esvae e fai opacas as xanelas emerxentes con suavidade ao mostralas ou agochadas Comment[id]=Buat sembulan secara halus lesap-masuk dan lesap-keluar ketika ia ditampilkan atau disembunyikan diff --git a/effects/scale/package/metadata.desktop b/effects/scale/package/metadata.desktop index 18c333ce96..6ec7728ecc 100644 --- a/effects/scale/package/metadata.desktop +++ b/effects/scale/package/metadata.desktop @@ -34,6 +34,7 @@ Comment[ca]=Fa que les finestres entrin o surtin volant quan es mostren o s'ocul 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[en_GB]=Make windows smoothly scale in and out when they are shown or hidden +Comment[es]=Hace que las ventanas se agranden o se encojan suavemente al mostrarlas u ocultarlas Comment[fi]=Ikkunat ilmestyvät näkyviin tai poistuvat näkyvistä hiljalleen Comment[gl]=Facer que as xanelas crezan ou decrezan suavemente cando se mostran ou agochan Comment[id]=Buat window menskala besar atau kecil secara mulus ketika ia ditampilkan atau disembunyikan diff --git a/effects/squash/package/metadata.desktop b/effects/squash/package/metadata.desktop index d17e185c70..9f6f3da258 100644 --- a/effects/squash/package/metadata.desktop +++ b/effects/squash/package/metadata.desktop @@ -3,6 +3,7 @@ Comment=Squash windows when they are minimized Comment[ca]=Amuntega les finestres quan estan minimitzades Comment[ca@valencia]=Amuntega les finestres quan estan minimitzades Comment[en_GB]=Squash windows when they are minimised +Comment[es]=Aplastar las ventanas al minimizarlas Comment[fi]=Litistä ikkunat, kun ne pienennetään Comment[gl]=Xuntar as xanelas cando estean minimizadas Comment[id]=Sesakkan window ketika mereka diminimalkan @@ -22,6 +23,7 @@ Name=Squash Name[ca]=Amuntega Name[ca@valencia]=Amuntega Name[en_GB]=Squash +Name[es]=Aplastar Name[fi]=Litistä Name[gl]=Xuntar Name[id]=Squash