Commit 3776ad6a 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 f1dd73e6
......@@ -23,6 +23,7 @@ Name[zh_TW]=Plasma 電話
Comment=Plasma workspace for smartphones
Comment[ca]=Espai de treball del plasma per a telèfons intel·ligents
Comment[ca@valencia]=Espai de treball del plasma per a telèfons intel·ligents
Comment[de]=Plasma-Arbeitsbereich für Smartphones
Comment[en_GB]=Plasma workspace for smartphones
Comment[es]=Espacio de trabajo de Plasma para teléfonos inteligentes
Comment[fi]=Plasma-työtila älypuhelimiin
......@@ -43,6 +44,7 @@ Comment[zh_TW]=智慧型手機的 Plasma 工作空間
Keywords=Phone, Workspace, Look and Feel
Keywords[ca]=Telèfon, Espai de treball, Aspecte i comportament
Keywords[ca@valencia]=Telèfon, Espai de treball, Aspecte i comportament
Keywords[de]=Telefon, Handy, Smartphone, Arbeitsbereich, Erscheinungsbild
Keywords[en_GB]=Phone, Workspace, Look and Feel
Keywords[es]=Teléfono, espacio de trabajo, aspecto visual
Keywords[fi]=Puhelin, työtila, ulkoasu ja tuntuma
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