yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2019-08-30 05:26:49 +02:00
parent e8fada8a36
commit 082baf6662
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/fadingpopups/package/metadata.desktop
View file

@ -2,6 +2,7 @@
Name=Fading Popups
Name[ca]=Missatges emergents esvaïts
Name[ca@valencia]=Missatges emergents que es fonen
Name[cs]=Mizející vyskakovací okna
Name[da]=Pop-op'er udtoner
Name[de]=Überblendete Aufklappfenster
Name[en_GB]=Fading Popups
@ -29,6 +30,7 @@ Icon=preferences-system-windows-effect-fadingpopups
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'encenguen o s'apaguen de manera gradual quan es mostren o s'oculten
Comment[cs]=Nechá vyskakovací okna plynule zmizet/objevit se, pokud jsou zobrazeny resp. skryty
Comment[da]=Få pop-op'er til at tone ud og ind når de vises eller skjules
Comment[de]=Blendet Aufklappfenster beim Öffnen/Schließen langsam ein bzw. aus
Comment[en_GB]=Make popups smoothly fade in and out when they are shown or hidden

1
effects/scale/package/metadata.desktop
View file

@ -32,6 +32,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[cs]=Nechá okna plynule zvětšit/zmenšit se, pokud jsou zobrazeny resp. skryty
Comment[da]=Få vinduer til at skalere blidt ud og ind når de vises eller skjules
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

1
plugins/kpackage/effect/kwin-packagestructure-effect.desktop
View file

@ -2,6 +2,7 @@
Name=KWin Effect
Name[ca]=Efecte del KWin
Name[ca@valencia]=Efecte de KWin
Name[cs]=Efekt KWinu
Name[da]=KWin-effekt
Name[de]=KWin-Effekt
Name[el]=Εφέ KWin