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 2018-01-22 04:57:56 +01:00
parent 4fd02993ea
commit bc539537fc
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plasma-mobile.desktop.cmake
View file

@ -11,6 +11,7 @@ Name[en_GB]=Plasma Mobile
Name[es]=Plasma Mobile
Name[gl]=Plasma Mobile
Name[nl]=Plasma-mobiel
Name[nn]=Plasma Mobile
Name[pl]=Plazma Mobile
Name[pt]=Plasma Mobile
Name[sv]=Plasma mobil
@ -24,6 +25,7 @@ Comment[en_GB]=Plasma Mobile by KDE
Comment[es]=Plasma Mobile creado por KDE
Comment[gl]=Plasma Mobile de KDE
Comment[nl]=Plasma-mobiel door KDE
Comment[nn]=Plasma Mobile frå KDE
Comment[pl]=Plazma Mobile stworzona przez KDE
Comment[pt]=Plasma Mobile do KDE
Comment[sv]=Plasma mobil av KDE

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

@ -8,6 +8,7 @@ Name[en_GB]=Touch Test
Name[es]=Prueba táctil
Name[gl]=Proba táctil
Name[nl]=Aanraaktest
Name[nn]=Røretest
Name[pl]=Próba dotyku
Name[pt]=Teste de Toque
Name[sv]=Beröringsprov
@ -30,6 +31,7 @@ GenericName[es]=Terminal
GenericName[fr]=Terminal
GenericName[gl]=Terminal
GenericName[nl]=Terminal
GenericName[nn]=Terminal
GenericName[pl]=Terminal
GenericName[pt]=Terminal
GenericName[sv]=Terminal