marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues 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 2017-09-26 05:00:45 +02:00
parent 4123f08c89
commit 4c3d5bcb7f
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
touchscreentest/org.kde.touchtest.desktop
View file

@ -14,6 +14,7 @@ Exec=touchtest
GenericName=Terminal GenericName=Terminal
GenericName[ca]=Terminal GenericName[ca]=Terminal
GenericName[ca@valencia]=Terminal GenericName[ca@valencia]=Terminal
GenericName[de]=Terminal
GenericName[nl]=Terminal GenericName[nl]=Terminal
GenericName[pt]=Terminal GenericName[pt]=Terminal
GenericName[sv]=Terminal GenericName[sv]=Terminal