Commit 0de5df85 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 b4c7f920
Pipeline #53244 skipped
......@@ -4,6 +4,7 @@
"Description[ca@valencia]": "Transport local a l'àrea de Rin-Sieg, Alemanya.",
"Description[ca]": "Transport local a l'àrea de Rin-Sieg, Alemanya.",
"Description[es]": "Transporte local del área de Rin-Sieg, Alemania.",
"Description[fr]": "Transports régionaux dans la région Rhin-Sieg, Allemagne.",
"Description[nl]": "Lokaal transport in het gebied Rhein-Sieg, Duitsland.",
"Description[pt]": "Transportes locais na região de Rhein-Sieg, Alemanha.",
"Description[sl]": "Lokalni transport na področju Rhein-Sieg, Nemčija.",
......@@ -14,6 +15,7 @@
"Name[ca@valencia]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[ca]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[es]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[fr]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[nl]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[pt]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[sl]": "Verkehrsverbund Rhein-Sieg (VRS)",
......
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