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-08-21 01:16:14 +00:00
parent 6336bb71ba
commit 17b161213c
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/effects/overview/kcm/overvieweffectkcm.desktop
View file

@ -10,3 +10,11 @@ X-KDE-Library=kwin_overview_config
X-KDE-ParentComponents=overview
Name=overview
Name[ca]=Vista general
Name[cs]=přehled
Name[es]=vista general
Name[eu]=Ikuspegi orokorra
Name[nl]=overzicht
Name[sv]=översikt
Name[uk]=огляд
Name[x-test]=xxoverviewxx