Commit 56ac7e1d 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 a9135c35
Pipeline #56425 skipped
......@@ -21,6 +21,7 @@
"Name[ca]": "Züricher Verkehrsverbund (ZVV)",
"Name[cs]": "Züricher Verkehrsverbund (ZVV)",
"Name[de]": "Züricher Verkehrsverbund (ZVV)",
"Name[en_GB]": "Züricher Verkehrsverbund (ZVV)",
"Name[es]": "Züricher Verkehrsverbund (ZVV)",
"Name[fr]": "Züricher Verkehrsverbund (ZVV)",
"Name[it]": "Züricher Verkehrsverbund (ZVV)",
......
......@@ -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[cs]": "Místní doprava v oblasti Rhein-Sieg, Německo.",
"Description[en_GB]": "Local transport in the Rhein-Sieg area, Germany.",
"Description[es]": "Transporte local del área de Rin-Sieg, Alemania.",
"Description[fr]": "Transports régionaux dans la région Rhin-Sieg, Allemagne.",
"Description[it]": "Trasporto locale nell'area Reno-Sieg, Germania.",
......@@ -20,6 +21,7 @@
"Name[ca]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[cs]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[de]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[en_GB]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[es]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[fr]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[it]": "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