Commit 520bde4a 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 ee5f95c9
Pipeline #54921 skipped
......@@ -23,6 +23,7 @@
"Name[it]": "Züricher Verkehrsverbund (ZVV)",
"Name[nl]": "Züricher Verkehrsverbund (ZVV)",
"Name[pt]": "Züricher Verkehrsverbund (ZVV)",
"Name[pt_BR]": "Züricher Verkehrsverbund (ZVV)",
"Name[sl]": "Züricher Verkehrsverbund (ZVV)",
"Name[sv]": "Züricher Verkehrsverbund (ZVV)",
"Name[uk]": "Züricher Verkehrsverbund (ZVV)",
......
......@@ -8,6 +8,7 @@
"Description[it]": "Trasporto locale nell'area Reno-Sieg, Germania.",
"Description[nl]": "Lokaal transport in het gebied Rhein-Sieg, Duitsland.",
"Description[pt]": "Transportes locais na região de Rhein-Sieg, Alemanha.",
"Description[pt_BR]": "Transporte local na área de Reno-Sieg, Alemanha.",
"Description[sl]": "Lokalni transport na področju Rhein-Sieg, Nemčija.",
"Description[sv]": "Lokal transportoperatör i Rhein-Sieg-området, Tyskland.",
"Description[uk]": "Місцевий транспорт у регіоні Райн-Зіг, Німеччина.",
......@@ -20,6 +21,7 @@
"Name[it]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[nl]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[pt]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[pt_BR]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[sl]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[sv]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[uk]": "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