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-01-25 08:42:24 +01:00
parent 8fd0418187
commit 433a121838
2 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

@ -12,6 +12,7 @@ Name[nl]=Vervagende pop-ups
Name[nn]=Inn- og uttoning av sprettoppvindauge
Name[pl]=Zanikające okna wysuwne
Name[pt]=Mensagens Desvanecentes
Name[pt_BR]=Mensagens do fade
Name[ru]=Растворяющиеся всплывающие окна
Name[sk]=Miznúce vyskakovacie okná
Name[sv]=Borttonande meddelanderutor
@ -33,6 +34,7 @@ Comment[nl]=Laat pop-ups vloeiend opkomen/vervagen als ze worden weergegeven of
Comment[nn]=Ton sprettoppvindauge gradvis inn og ut når dei vert viste eller gøymde
Comment[pl]=Gładkie zanikanie i wyłanianie się okien wysuwnych przy ich otwieraniu i zamykaniu
Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando aparecem ou ficam escondidas
Comment[pt_BR]=Faz as mensagens aparecerem/desaparecerem suavemente quando são exibidas ou ocultadas
Comment[ru]=Всплывающие окна при закрытии будут становиться всё более прозрачными, а потом совсем исчезать
Comment[sk]=Okná sa plynule objavia/zmiznú pri ich zobrazení alebo skrytí
Comment[sv]=Gör att meddelanderutor mjukt tonas in eller ut när de visas eller döljs

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

@ -12,6 +12,7 @@ Comment[nl]=Krimp vensters wanneer ze geminimaliseerd zijn
Comment[nn]=Skvis vindauge når dei vert minimerte
Comment[pl]=Ściskanie okien, gdy ulegają minimalizacji
Comment[pt]=Esmagar as janelas quando são minimizadas
Comment[pt_BR]=Achatar as janelas quando são minimizadas
Comment[ru]=Сжатие окна при сворачивании
Comment[sk]=Deformuje okná pri ich minimalizovaní
Comment[sv]=Kläm fönster när de minimeras
@ -33,6 +34,7 @@ Name[nl]=Krimpen
Name[nn]=Skvis
Name[pl]=Ściskanie
Name[pt]=Esmagar
Name[pt_BR]=Achatar
Name[ru]=Сжатие
Name[sv]=Kläm
Name[uk]=Складування