Commit d0d8d644 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 eb549f23
Pipeline #53454 skipped
......@@ -6,6 +6,7 @@
"Description[en_GB]": "Local public transport in the canton Zürich, Switzerland",
"Description[es]": "Transporte público local del cantón de Zúrich, Suiza.",
"Description[fr]": "Transports régionaux publiques de la région de Zürich, Suisse.",
"Description[it]": "Trasporto locale nel Canton Zurigo, Svizzera",
"Description[nl]": "Lokaal openbaar vervoer in het kanton Zürich, Zwitserland",
"Description[pt]": "Transportes públicos locais na região de Zurique, Suíça.",
"Description[pt_BR]": "Transporte público local na região de Zurique, Suíça.",
......@@ -14,9 +15,12 @@
"Description[uk]": "Місцевий транспорт у кантоні Цюрих, Швейцарія",
"Description[x-test]": "xxLocal public transport in the canton Zürich, Switzerlandxx",
"Name": "Züricher Verkehrsverbund (ZVV)",
"Name[ca@valencia]": "Züricher Verkehrsverbund (ZVV)",
"Name[ca]": "Züricher Verkehrsverbund (ZVV)",
"Name[de]": "Züricher Verkehrsverbund (ZVV)",
"Name[es]": "Züricher Verkehrsverbund (ZVV)",
"Name[fr]": "Züricher Verkehrsverbund (ZVV)",
"Name[it]": "Züricher Verkehrsverbund (ZVV)",
"Name[nl]": "Züricher Verkehrsverbund (ZVV)",
"Name[pt]": "Züricher Verkehrsverbund (ZVV)",
"Name[sl]": "Züricher Verkehrsverbund (ZVV)",
......
......@@ -21,6 +21,7 @@
"Name": "bwegt",
"Name[ca@valencia]": "bwegt",
"Name[ca]": "bwegt",
"Name[de]": "bwegt",
"Name[en_GB]": "bwegt",
"Name[es]": "bwegt",
"Name[et]": "bwegt",
......
......@@ -21,9 +21,11 @@
"Name": "Nordhessischer Verkehrsverbund (NVV)",
"Name[ca@valencia]": "Nordhessischer Verkehrsverbund (NVV)",
"Name[ca]": "Nordhessischer Verkehrsverbund (NVV)",
"Name[de]": "Nordhessischer Verkehrsverbund (NVV)",
"Name[en_GB]": "Nordhessischer Verkehrsverbund (NVV)",
"Name[es]": "Nordhessischer Verkehrsverbund (NVV)",
"Name[fr]": "Nordhessischer Verkehrsverbund (NVV)",
"Name[it]": "Nordhessischer Verkehrsverbund (NVV)",
"Name[nl]": "Nordhessischer Verkehrsverbund (NVV)",
"Name[pt]": "Nordhessischer Verkehrsverbund (NVV)",
"Name[pt_BR]": "Nordhessischer Verkehrsverbund (NVV)",
......
......@@ -5,6 +5,7 @@
"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[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[sl]": "Lokalni transport na področju Rhein-Sieg, Nemčija.",
......@@ -16,6 +17,7 @@
"Name[ca]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[es]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[fr]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[it]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[nl]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[pt]": "Verkehrsverbund Rhein-Sieg (VRS)",
"Name[sl]": "Verkehrsverbund Rhein-Sieg (VRS)",
......
......@@ -21,6 +21,7 @@
"Name": "Delfi NRW",
"Name[ca@valencia]": "Delfi NRW",
"Name[ca]": "Delfi NRW",
"Name[de]": "Delfi NRW",
"Name[en_GB]": "Delfi NRW",
"Name[es]": "Delfi NRW",
"Name[et]": "Delfi NRW",
......
......@@ -21,6 +21,7 @@
"Name": "Rolph",
"Name[ca@valencia]": "Rolph",
"Name[ca]": "Rolph",
"Name[de]": "Rolph",
"Name[en_GB]": "Rolph",
"Name[es]": "Rolph",
"Name[et]": "Rolph",
......
......@@ -6,6 +6,7 @@
"Description[en_GB]": "Local public transport in the Rhein-Neckar area.",
"Description[es]": "Transporte público local del área de Rhein-Neckar.",
"Description[fr]": "Transports régionaux dans la région Rhin-Neckar.",
"Description[it]": "Trasporto locale nell'area Reno-Neckar, Germania.",
"Description[nl]": "Lokaal openbaar vervoer in het gebied Rijn-Neckar, Duitsland.",
"Description[pt]": "Transportes locais na área de Rhein-Neckar.",
"Description[pt_BR]": "Transporte local na área de Reno-Neckar, Alemanha.",
......@@ -16,9 +17,11 @@
"Name": "Verkehrsverbund Rhein-Neckar (VRN)",
"Name[ca@valencia]": "Verkehrsverbund Rhein-Neckar (VRN)",
"Name[ca]": "Verkehrsverbund Rhein-Neckar (VRN)",
"Name[de]": "Verkehrsverbund Rhein-Neckar (VRN)",
"Name[en_GB]": "Verkehrsverbund Rhein-Neckar (VRN)",
"Name[es]": "Verkehrsverbund Rhein-Neckar (VRN)",
"Name[fr]": "Verkehrsverbund Rhein-Neckar (VRN)",
"Name[it]": "Verkehrsverbund Rhein-Neckar (VRN)",
"Name[nl]": "Verkehrsverbund Rhein-Neckar (VRN)",
"Name[pt]": "Verkehrsverbund Rhein-Neckar (VRN)",
"Name[pt_BR]": "Verkehrsverbund Rhein-Neckar (VRN)",
......
......@@ -23,6 +23,7 @@
"Name[ca@valencia]": "Digitransit Finlàndia",
"Name[ca]": "Digitransit Finlàndia",
"Name[cs]": "Digitransit Finland",
"Name[de]": "Digitransit Finland",
"Name[en_GB]": "Digitransit Finland",
"Name[es]": "Digitransit Finland",
"Name[et]": "Digitransit Finland",
......
......@@ -22,6 +22,7 @@
"Name[ca@valencia]": "Metromobilite",
"Name[ca]": "Metromobilite",
"Name[cs]": "Metromobilite",
"Name[de]": "Metromobilite",
"Name[en_GB]": "Metromobilite",
"Name[es]": "Metromobilite",
"Name[et]": "Metromobilite",
......
......@@ -22,6 +22,7 @@
"Name[ca@valencia]": "Société Nationale des Chemins de Fer Français (SNCF)",
"Name[ca]": "Société Nationale des Chemins de Fer Français (SNCF)",
"Name[cs]": "Société Nationale des Chemins de Fer Français (SNCF)",
"Name[de]": "Société Nationale des Chemins de Fer Français (SNCF)",
"Name[en_GB]": "Société Nationale des Chemins de Fer Français (SNCF)",
"Name[es]": "Société Nationale des Chemins de Fer Français (SNCF)",
"Name[et]": "Société Nationale des Chemins de Fer Français (SNCF)",
......
......@@ -22,6 +22,7 @@
"Name": "Chemins de Fer Luxembourgeois (CFL)",
"Name[ca@valencia]": "Chemins de Fer Luxembourgeois (CFL)",
"Name[ca]": "Chemins de Fer Luxembourgeois (CFL)",
"Name[de]": "Chemins de Fer Luxembourgeois (CFL)",
"Name[en_GB]": "Chemins de Fer Luxembourgeois (CFL)",
"Name[es]": "Chemins de Fer Luxembourgeois (CFL)",
"Name[et]": "Chemins de Fer Luxembourgeois (CFL)",
......
......@@ -22,6 +22,7 @@
"Name[ca@valencia]": "Entur",
"Name[ca]": "Entur",
"Name[cs]": "Entur",
"Name[de]": "Entur",
"Name[en_GB]": "Entur",
"Name[es]": "Entur",
"Name[et]": "Entur",
......
......@@ -21,6 +21,7 @@
"Name[ca@valencia]": "Resrobot",
"Name[ca]": "Resrobot",
"Name[cs]": "Resrobot",
"Name[de]": "Resrobot",
"Name[en_GB]": "Resrobot",
"Name[es]": "Resrobot",
"Name[et]": "Resrobot",
......
......@@ -21,6 +21,7 @@
"Name[ca@valencia]": "Navitia",
"Name[ca]": "Navitia",
"Name[cs]": "Navitia",
"Name[de]": "Navitia",
"Name[en_GB]": "Navitia",
"Name[es]": "Navitia",
"Name[et]": "Navitia",
......
......@@ -22,6 +22,7 @@
"Name[ca@valencia]": "Los Angeles Metro",
"Name[ca]": "Los Angeles Metro",
"Name[cs]": "Los Angeles Metro",
"Name[de]": "Los Angeles Metro",
"Name[en_GB]": "Los Angeles Metro",
"Name[es]": "Los Angeles Metro",
"Name[et]": "Los Angelese metroo",
......
......@@ -22,6 +22,7 @@
"Name[ca@valencia]": "Marta",
"Name[ca]": "Marta",
"Name[cs]": "Marta",
"Name[de]": "Marta",
"Name[en_GB]": "Marta",
"Name[es]": "Marta",
"Name[et]": "Marta",
......
......@@ -21,6 +21,7 @@
"Name": "Capital Metropolitan Transportation Authority (CMTA)",
"Name[ca@valencia]": "Capital Metropolitan Transportation Authority (CMTA)",
"Name[ca]": "Capital Metropolitan Transportation Authority (CMTA)",
"Name[de]": "Capital Metropolitan Transportation Authority (CMTA)",
"Name[en_GB]": "Capital Metropolitan Transportation Authority (CMTA)",
"Name[es]": "Capital Metropolitan Transportation Authority (CMTA)",
"Name[et]": "Capital Metropolitani transpordiamet (CMTA)",
......
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