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-01-31 09:47:38 +01:00
parent 76297196e8
commit 9ca27c6690
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwinoptions/kwinactions.desktop
View file

@ -12,6 +12,7 @@ X-KDE-PluginKeyword=kwinactions
Name=Window Actions
Name[ca]=Accions de la finestra
Name[cs]=Činnosti oken
Name[da]=Vindueshandlinger
Name[de]=Fensteraktionen
Name[en_GB]=Window Actions
Name[es]=Acciones de ventanas