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 2018-11-13 06:26:14 +01:00
parent 688d946ffb
commit b5a2bb2abf
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,6 +40,7 @@ Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando ap
Comment[sv]=Gör att fönster mjukt skalas in eller ut när de visas eller döljs
Comment[uk]=Плавне масштабування вікон при появі або приховуванні
Comment[x-test]=xxMake windows smoothly scale in and out when they are shown or hiddenxx
Comment[zh_CN]=窗口显示或隐藏时平滑缩放
Comment[zh_TW]=顯示或隱藏視窗時以平順的比例縮放方式呈現。
Type=Service

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

@ -12,6 +12,7 @@ Comment[pt]=Esmagar as janelas quando são minimizadas
Comment[sv]=Kläm fönster när de minimeras
Comment[uk]=Складує вікна, якщо їх мінімізовано
Comment[x-test]=xxSquash windows when they are minimizedxx
Comment[zh_CN]=最小化时压扁窗口
Comment[zh_TW]=壓縮最小化的視窗
Icon=preferences-system-windows-effect-squash
Name=Squash
@ -27,6 +28,7 @@ Name[pt]=Esmagar
Name[sv]=Kläm
Name[uk]=Складування
Name[x-test]=xxSquashxx
Name[zh_CN]=压扁
Name[zh_TW]=壓縮
Type=Service