Commit b41087e8 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 7753abec
......@@ -39,7 +39,7 @@
"Description[et]": "See plugin aitab hankida KDE projekte",
"Description[fi]": "Tämä liitännäinen auttaa KDE-projektien hakemisessa",
"Description[fr]": "Ce module aide à obtenir des projets KDE",
"Description[gl]": "Este engadido permite obter proxectos de KDE.",
"Description[gl]": "Este complemento permite obter proxectos de KDE.",
"Description[it]": "Questa estensione consente di ottenere progetti di KDE",
"Description[nl]": "Deze plugin helpt om KDE-projects te verkrijgen",
"Description[pl]": "Wtyczka ta pozwala na pobieranie projektów KDE",
......
......@@ -10,7 +10,7 @@
"Description[et]": "See plugin pakub manuaalilehekülgede lõimimist",
"Description[fi]": "Tämä liitännäinen tarjoaa integraation manuaalisivuille",
"Description[fr]": "Ce module fournit une intégration des pages de manuel",
"Description[gl]": "Este engadido fornece integración coas páxinas de manual.",
"Description[gl]": "Este complemento fornece integración coas páxinas de manual.",
"Description[it]": "Questa estensione fornisce l'integrazione delle pagine del manuale",
"Description[nl]": "Deze plugin biedt integratie met man-pagina's",
"Description[pl]": "Wtyczka ta zapewnia integrację stron instrukcji",
......
......@@ -39,7 +39,7 @@
"Description[et]": "See plugin pakub QtHelpi lõimimist",
"Description[fi]": "Tämä liitännäinen tarjoaa QtHelp-integraation",
"Description[fr]": "Ce module fournit une intégration de l'aide Qt",
"Description[gl]": "Este engadido fornece integración con QtHelp",
"Description[gl]": "Este complemento fornece integración con QtHelp",
"Description[it]": "Questa estensione fornisce l'integrazione di QtHelp",
"Description[nl]": "Deze plug-in biedt integratie met QtHelp",
"Description[pl]": "Wtyczka ta zapewnia integrację QtHelp",
......
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