Commit 59df0e51 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 f5b422eb
......@@ -11,6 +11,7 @@ Name[fr]=Galerie Kirigami
Name[gl]=Galería de Kirigami
Name[nl]=Kirigami galerij
Name[pl]=Galeria Kirigami
Name[pt]=Galeria do Kirigami
Name[pt_BR]=Galeria do Kirigami
Name[sk]=Galéria Kirigami
......@@ -30,6 +31,7 @@ Comment[fr]=Affiche des exemples des composants Kirigami et permet de jouer avec
Comment[gl]=Mostra exemplos de compoñentes de Kirigami e permítelle fedellar con eles.
Comment[nl]=Toont voorbeelden van Kirigami componenten en laat u met ze spelen
Comment[nn]=Viser eksempel på Kirigami-komponentar og lèt deg leika med dei
Comment[pl]=Pokazuje przykłady składników Kirigami i umożliwia zabawę nimi
Comment[pt]=Mostra exemplos dos componentes do Kirigami e permite-lhe jogar com eles
Comment[pt_BR]=Mostra exemplos dos componentes do Kirigami e permite-lhe jogar com eles
Comment[sk]=Zobrazí príklady Kirigami komponentov a umožní vám hrať sa s nimi
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