Commit 3f1e05e8 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 1c944fe8
Pipeline #3941 passed with stage
in 18 minutes and 47 seconds
......@@ -41,7 +41,7 @@
"Name[et]": "DOT graafifailivorming",
"Name[fi]": "DOT-graafitiedostomuoto",
"Name[fr]": "Format de fichier de graphe « DOT »",
"Name[gl]": "Complemento do formato de ficheiro de gráficos DOT",
"Name[gl]": "Formato de ficheiro de gráficos DOT",
"Name[it]": "Formato di file di grafi DOT",
"Name[nl]": "Bestandsformaat voor DOT Graph",
"Name[pl]": "Format plików grafów DOT",
......
......@@ -40,7 +40,7 @@
"Name[et]": "TGF graafifailivorming",
"Name[fi]": "TGF-graafitiedostomuoto",
"Name[fr]": "Format de fichier de graphe « TGF »",
"Name[gl]": "Complemento de ficheiros de gráficos TGF",
"Name[gl]": "Formato de ficheiros de gráficos TGF",
"Name[it]": "Formato di file di grafi TGF",
"Name[nl]": "Bestandsformaat voor TGF Graph",
"Name[pl]": "Format plików grafów TGF",
......
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