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 2022-02-08 01:45:25 +00:00
parent bb935aa5de
commit 1386c4325c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kcmkwin/kwintabbox/kwintabbox.desktop
View file

@ -21,7 +21,7 @@ Name[da]=Opgaveskifter
Name[de]=Anwendungsumschalter Name[de]=Anwendungsumschalter
Name[el]=Εναλλαγή εργασιών Name[el]=Εναλλαγή εργασιών
Name[en_GB]=Task Switcher Name[en_GB]=Task Switcher
Name[es]=Cambiador de tareas Name[es]=Selector de tareas
Name[et]=Ülesannete vahetaja Name[et]=Ülesannete vahetaja
Name[eu]=Ataza-aldarazlea Name[eu]=Ataza-aldarazlea
Name[fi]=Ikkunanvalitsin Name[fi]=Ikkunanvalitsin