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 2020-02-28 05:55:39 +01:00
parent d664b8fdbf
commit 5411a5f770
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ Name[pt]=Olho no Ecrã
Name[sv]=Ögat på skärmen Name[sv]=Ögat på skärmen
Name[uk]=Око на екрані Name[uk]=Око на екрані
Name[x-test]=xxEye on Screenxx Name[x-test]=xxEye on Screenxx
Name[zh_TW]=螢幕之眼
Icon=preferences-system-windows-effect-eyeonscreen Icon=preferences-system-windows-effect-eyeonscreen
Comment=Suck windows into the desktop Comment=Suck windows into the desktop
Comment[ca]=Enganxa les finestres a l'escriptori Comment[ca]=Enganxa les finestres a l'escriptori
@ -16,6 +17,7 @@ Comment[pt]=Aspira as janelas para o ecrã
Comment[sv]=Sug in fönster i skrivbordet Comment[sv]=Sug in fönster i skrivbordet
Comment[uk]=Засмоктування вікон до стільниці Comment[uk]=Засмоктування вікон до стільниці
Comment[x-test]=xxSuck windows into the desktopxx Comment[x-test]=xxSuck windows into the desktopxx
Comment[zh_TW]=將視窗吸進桌面
Type=Service Type=Service
X-Plasma-API=javascript X-Plasma-API=javascript

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

@ -49,6 +49,7 @@ Comment[pt]=Mover as janelas para os cantos do ecrã
Comment[sv]=Flytta fönster till skärmhörn Comment[sv]=Flytta fönster till skärmhörn
Comment[uk]=Пересування вікон до кутів екрана Comment[uk]=Пересування вікон до кутів екрана
Comment[x-test]=xxMove windows into screen cornersxx Comment[x-test]=xxMove windows into screen cornersxx
Comment[zh_TW]=將視窗移至螢幕角落
Type=Service Type=Service
X-Plasma-API=javascript X-Plasma-API=javascript