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-09-22 01:19:05 +00:00
parent c29c437e58
commit c27e4df375
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/effects/overview/kcm/overvieweffectkcm.desktop
View file

@ -10,6 +10,7 @@ X-KDE-Library=kwin_overview_config
X-KDE-ParentComponents=overview
Name=overview
Name[az]=ümumi baxış
Name[ca]=Vista general
Name[cs]=přehled
Name[en_GB]=overview