Commit 451c3868 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 f083177c
......@@ -11,6 +11,7 @@
"Name[es]": "Carlos Nihelton",
"Name[fr]": "Carlos Nihelton",
"Name[gl]": "Carlos Nihelton",
"Name[it]": "Carlos Nihelton",
"Name[nl]": "Carlos Nihelton",
"Name[pl]": "Carlos Nihelton",
"Name[pt]": "Carlos Nihelton",
......@@ -75,6 +76,7 @@
"Name[es]": "Implementación de Clang-Tidy",
"Name[fr]": "Prise en charge de Clang-Tidy",
"Name[gl]": "Compatibilidade con Clang-Tidy",
"Name[it]": "Supporto per Clang-Tidy",
"Name[nl]": "Ondersteuning van Clang-Tidy",
"Name[pl]": "Obsługa Clang-Tidy",
"Name[pt]": "Suporte para o Clang-Tidy",
......
......@@ -6,6 +6,7 @@
"Description[ca]": "Importa i edita projectes del Meson",
"Description[es]": "Importa y edita proyectos Meson",
"Description[gl]": "Importa e edita proxectos Meson",
"Description[it]": "Importa e modifica i progetti Meson",
"Description[nl]": "Importeert en bewerkt Meson-projecten",
"Description[pl]": "Importuje i edytuje projekty Meson",
"Description[pt]": "Importa e edita os projectos do Meson",
......@@ -19,6 +20,7 @@
"Name[ca]": "Gestor de projectes Meson",
"Name[es]": "Gestor de proyectos Meson",
"Name[gl]": "Xestor de proxectos Meson",
"Name[it]": "Gestore progetto Meson",
"Name[nl]": "Meson projectbeheerder",
"Name[pl]": "Zarządzanie projektem Meson",
"Name[pt]": "Gestor de Projectos do Meson",
......
......@@ -9,6 +9,7 @@
"Description[es]": "Implementación del lenguaje QML/JS (basado en qmljs de QtCreator)",
"Description[fr]": "Prise en charge du langage QML/JS (utilisant qmljs de QtCreator)",
"Description[gl]": "Compatibilidade con QML/JS (baseada en qmljs de QtCreator)",
"Description[it]": "Supporto al linguaggio QML/JS (basato su qmljs di QtCreator)",
"Description[nl]": "Taalondersteuning voor QML/JS (gebaseerd op qmljs uit QtCreator)",
"Description[pl]": "Obsługa języka QML/JS (oparty na qmljs z QtCreator)",
"Description[pt]": "Suporte para a linguagem QML/JS (baseado no 'qmljs' do QtCreator)",
......
......@@ -19,6 +19,7 @@
"Name[ca]": "Scratchpad",
"Name[es]": "Scratchpad",
"Name[gl]": "Caderno de notas",
"Name[it]": "Blocco note",
"Name[nl]": "Kladblok",
"Name[pl]": "Bazgroszyt",
"Name[pt]": "Área de Rascunhos",
......
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