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 2021-12-19 01:42:01 +00:00
parent 4459463823
commit 5d99392d1e
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
View file

@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=desktopbehavior
X-KDE-Weight=50
Name=Touch Screen
Name[ar]=شاشة اللمس
Name[ast]=Pantalla táctil
Name[az]=Toxunma ekranı
Name[ca]=Pantalla tàctil