Commit 648f784d authored by Script Kiddy's avatar Script Kiddy
Browse files

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 78af8191
......@@ -16,6 +16,7 @@ Name[it]=Strumenti di Plasma Nano
Name[ko]=Plasma Nano 도구 상자
Name[lt]=Plasma Nano priemonių komplektas
Name[nl]=Plasma Nano-hulpmiddelen
Name[nn]=Plasma Nano-verktøykasse
Name[pl]=Pasek narzędzi Plazma Nano
Name[pt]=Área de Ferramentas do Plasma Nano
Name[pt_BR]=Área de ferramentas do Plasma Nano
......@@ -43,6 +44,7 @@ Comment[it]=Gestisce immagini di sfondo ed oggetti
Comment[ko]=배경 그림과 위젯 관리
Comment[lt]=Tvarkyti darbalaukio foną ir valdiklius
Comment[nl]=Achtergrondafbeeldingen en widgets beheren
Comment[nn]=Handsam bakgrunnsbilete og skjermelement
Comment[pl]=Zarządzaj tapetami i elementami interfejsu
Comment[pt]=Gerir o Papel de Parede e Elementos
Comment[pt_BR]=Gerenciar papel de parede e widgets
......@@ -17,6 +17,7 @@ Name[it]=Plasma Nano
Name[ko]=Plasma Nano
Name[lt]=Plasma Nano
Name[nl]=Plasma Nano
Name[nn]=Plasma Nano
Name[pl]=Plazma Nano
Name[pt]=Plasma Nano
Name[pt_BR]=Plasma Nano
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