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-11-14 04:37:12 +01:00
parent 15c3acdc61
commit 00e4e8b232
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
Name=Touch Test Name=Touch Test
Name[ca]=Prova el tàctil Name[ca]=Prova el tàctil
Name[ca@valencia]=Prova el tàctil Name[ca@valencia]=Prova el tàctil
Name[cs]=Test doteku
Name[es]=Prueba táctil Name[es]=Prueba táctil
Name[nl]=Aanraaktest Name[nl]=Aanraaktest
Name[pl]=Próba dotyku Name[pl]=Próba dotyku
@ -18,6 +19,7 @@ Exec=touchtest
GenericName=Terminal GenericName=Terminal
GenericName[ca]=Terminal GenericName[ca]=Terminal
GenericName[ca@valencia]=Terminal GenericName[ca@valencia]=Terminal
GenericName[cs]=Terminál
GenericName[de]=Terminal GenericName[de]=Terminal
GenericName[es]=Terminal GenericName[es]=Terminal
GenericName[nl]=Terminal GenericName[nl]=Terminal