marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23: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-10-01 05:16:25 +02:00
parent 812c61c5ff
commit 1bce6ee8fa
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[ca]=Prova el tàctil
Name[ca@valencia]=Prova el tàctil
Name[es]=Prueba táctil
Name[nl]=Aanraaktest
Name[pt]=Teste de Toque
Name[sv]=Beröringsprov
@ -16,6 +17,7 @@ GenericName=Terminal
GenericName[ca]=Terminal
GenericName[ca@valencia]=Terminal
GenericName[de]=Terminal
GenericName[es]=Terminal
GenericName[nl]=Terminal
GenericName[pt]=Terminal
GenericName[sv]=Terminal