Commit ccd29737 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 bbd5d481
Pipeline #3629 failed with stage
in 60 minutes
......@@ -13,6 +13,7 @@
"Description[nl]": "Importeert en bewerkt Meson-projecten",
"Description[pl]": "Importuje i edytuje projekty Meson",
"Description[pt]": "Importa e edita os projectos do Meson",
"Description[pt_BR]": "Importa e edita os projetos do Meson",
"Description[sv]": "Importerar och redigerar Meson-projekt",
"Description[uk]": "Імпортує і дає змогу редагувати проекти Meson",
"Description[x-test]": "xxImports and edits Meson projectsxx",
......@@ -31,6 +32,7 @@
"Name[nl]": "Meson projectbeheerder",
"Name[pl]": "Zarządzanie projektem Meson",
"Name[pt]": "Gestor de Projectos do Meson",
"Name[pt_BR]": "Gerenciador de projetos do Meson",
"Name[sv]": "Meson projekthanterare",
"Name[uk]": "Керування проектами Meson",
"Name[x-test]": "xxMeson Project Managerxx",
......
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