marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 09:48:50 +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-16 05:07:09 +02:00
parent 6cebe54981
commit f086f31b5b
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,24 @@
[Desktop Entry] [Desktop Entry]
Name=Touch Test Name=Touch Test
Name[ca]=Prova el tàctil
Name[ca@valencia]=Prova el tàctil
Name[nl]=Aanraaktest
Name[pt]=Teste de Toque
Name[sv]=Beröringsprov
Name[uk]=Тестування дотику
Name[x-test]=xxTouch Testxx
Categories=Qt;KDE;System;Development; Categories=Qt;KDE;System;Development;
Exec=touchtest Exec=touchtest
GenericName=Terminal GenericName=Terminal
GenericName[ca]=Terminal
GenericName[ca@valencia]=Terminal
GenericName[nl]=Terminal
GenericName[pt]=Terminal
GenericName[sv]=Terminal
GenericName[uk]=Термінал
GenericName[x-test]=xxTerminalxx
Icon=input-touchpad Icon=input-touchpad
MimeType= MimeType=