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 2019-02-17 08:30:42 +01:00
parent b5b4cff18c
commit 0015ff2ac6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/minimizeall/metadata.desktop
View file

@ -7,7 +7,7 @@ Name[da]=Minimér alle
Name[de]=Alle minimieren
Name[el]=ΕλαχιστοποίησηΌλων
Name[en_GB]=MinimiseAll
Name[es]=Maximizar todo
Name[es]=Minimizar todo
Name[et]=Kõigi minimeerimine
Name[eu]=Minimizatu guztiak
Name[fi]=Pienennä kaikki