Commit bc539537 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 4fd02993
......@@ -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
......
......@@ -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
......
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