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-03-23 06:03:07 +01:00
parent 679427da24
commit 93e8231b61
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Eye on Screen
Name[ca]=Ull a la pantalla
Name[cs]=Oko na obrazovce
Name[es]=Ojo a la pantalla
Name[et]=Eye on Screen
Name[eu]=Begirada pantailan

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

@ -43,6 +43,7 @@ Name[zh_TW]=視窗光圈
Icon=preferences-system-windows-effect-windowaperture
Comment=Move windows into screen corners
Comment[ca]=Mou les finestres cap a les cantonades de la pantalla
Comment[cs]=Přesunout okna do rohů obrazovky
Comment[es]=Mover las ventanas a las esquinas de la pantalla
Comment[et]=Akende liigutamine ekraani nurkadesse
Comment[eu]=Eraman leihoak pantailako bazterretara