Commit f3b1522b authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

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"
parent 9f7ad747
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment