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 2019-08-20 05:05:24 +02:00
parent 9f7ad74775
commit f3b1522bf6
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applets/clock/metadata.desktop
View file

@ -29,7 +29,7 @@ Comment=Time displayed in a digital format
Comment[ca]=Mostra l'hora en un format digital
Comment[ca@valencia]=Mostra l'hora en un format digital
Comment[cs]=Čas zobrazený v digitální podobě
Comment[de]=Zeigt die Uhrzeit in digitaler Form an.
Comment[de]=Zeigt die Uhrzeit in digitaler Form an
Comment[en_GB]=Time displayed in a digital format
Comment[es]=La hora mostrada en formato digital
Comment[fi]=Aika näytettynä digitaalimuodossa

1
shell/metadata.desktop
View file

@ -26,6 +26,7 @@ Comment=Plasma shell for phones
Comment[ca]=Espai de treball Plasma per a telèfons
Comment[ca@valencia]=Espai de treball Plasma per a telèfons
Comment[cs]=Plasma Shell pro telefony
Comment[de]=Plasma-Shell für Telefone
Comment[es]=Interfaz de Plasma para teléfonos
Comment[fr]=Terminal Plasma pour smartphones
Comment[gl]=Intérprete de ordes de Plasma para móbiles

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

@ -3,6 +3,7 @@ Name=Touch Test
Name[ca]=Prova el tàctil
Name[ca@valencia]=Prova el tàctil
Name[cs]=Test doteku
Name[de]=Touch-Test
Name[en_GB]=Touch Test
Name[es]=Prueba táctil
Name[fi]=Kosketustesti