Commit 82fdc0d9 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 2f9128c2
Pipeline #269744 skipped
......@@ -16,6 +16,7 @@
"Name[it]": "Alesya Khoteeva",
"Name[ka]": "ალესია ხოტეევა",
"Name[ko]": "Alesya Khoteeva",
"Name[lt]": "Alesya Khoteeva",
"Name[nl]": "Alesya Khoteeva",
"Name[nn]": "Alesya Khoteeva",
"Name[pl]": "Alesya Khoteeva",
......
......@@ -16,6 +16,7 @@
"Name[it]": "RJ Quiralta",
"Name[ka]": "RJ Quiralta",
"Name[ko]": "RJ Quiralta",
"Name[lt]": "RJ Quiralta",
"Name[nl]": "RJ Quiralta",
"Name[nn]": "RJ Quiralta",
"Name[pl]": "RJ Quiralta",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Maciej Wiklo",
"Name[ka]": "Maciej Wiklo",
"Name[ko]": "Maciej Wiklo",
"Name[lt]": "Maciej Wiklo",
"Name[nl]": "Maciej Wiklo",
"Name[nn]": "Maciej Wiklo",
"Name[pl]": "Maciej Wiklo",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Ken Vermette",
"Name[ka]": "Ken Vermette",
"Name[ko]": "Ken Vermette",
"Name[lt]": "Ken Vermette",
"Name[nl]": "Ken Vermette",
"Name[nn]": "Ken Vermette",
"Name[pl]": "Ken Vermette",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Ken Vermette",
"Name[ka]": "Ken Vermette",
"Name[ko]": "Ken Vermette",
"Name[lt]": "Ken Vermette",
"Name[nl]": "Ken Vermette",
"Name[nn]": "Ken Vermette",
"Name[pl]": "Ken Vermette",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Ken Vermette",
"Name[ka]": "Ken Vermette",
"Name[ko]": "Ken Vermette",
"Name[lt]": "Ken Vermette",
"Name[nl]": "Ken Vermette",
"Name[nn]": "Ken Vermette",
"Name[pl]": "Ken Vermette",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Risto Saukonpää",
"Name[ka]": "Risto Saukonpää",
"Name[ko]": "Risto Saukonpää",
"Name[lt]": "Risto Saukonpää",
"Name[nl]": "Risto Saukonpää",
"Name[nn]": "Risto Saukonpää",
"Name[pl]": "Risto Saukonpää",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Dmitri Popov",
"Name[ka]": "Dmitri Popov",
"Name[ko]": "Dmitri Popov",
"Name[lt]": "Dmitri Popov",
"Name[nl]": "Dmitri Popov",
"Name[nn]": "Dmitri Popov",
"Name[pl]": "Dmitri Popov",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Risto Saukonpää",
"Name[ka]": "Risto Saukonpää",
"Name[ko]": "Risto Saukonpää",
"Name[lt]": "Risto Saukonpää",
"Name[nl]": "Risto Saukonpää",
"Name[nn]": "Risto Saukonpää",
"Name[pl]": "Risto Saukonpää",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Nuno Pinheiro",
"Name[ka]": "Nuno Pinheiro",
"Name[ko]": "Nuno Pinheiro",
"Name[lt]": "Nuno Pinheiro",
"Name[nl]": "Nuno Pinheiro",
"Name[nn]": "Nuno Pinheiro",
"Name[pl]": "Nuno Pinheiro",
......
......@@ -15,6 +15,7 @@
"Name[it]": "Ian Hex",
"Name[ka]": "Ian Hex",
"Name[ko]": "Ian Hex",
"Name[lt]": "Ian Hex",
"Name[nl]": "Ian Hex",
"Name[nn]": "Ian Hex",
"Name[pl]": "Ian Hex",
......
......@@ -17,6 +17,7 @@
"Name[it]": "Martin Klapetek",
"Name[ka]": "Martin Klapetek",
"Name[ko]": "Martin Klapetek",
"Name[lt]": "Martin Klapetek",
"Name[nl]": "Martin Klapetek",
"Name[nn]": "Martin Klapetek",
"Name[pl]": "Martin Klapetek",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Sandra Smukaste",
"Name[ka]": "Sandra Smukaste",
"Name[ko]": "Sandra Smukaste",
"Name[lt]": "Sandra Smukaste",
"Name[nl]": "Sandra Smukaste",
"Name[nn]": "Sandra Smukaste",
"Name[pl]": "Sandra Smukaste",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Timothée Giet",
"Name[ka]": "Timothée Giet",
"Name[ko]": "Timothée Giet",
"Name[lt]": "Timothée Giet",
"Name[nl]": "Timothée Giet",
"Name[nn]": "Timothée Giet",
"Name[pl]": "Timothée Giet",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Sigi Sagi",
"Name[ka]": "Sigi Sagi",
"Name[ko]": "Sigi Sagi",
"Name[lt]": "Sigi Sagi",
"Name[nl]": "Sigi Sagi",
"Name[nn]": "Sigi Sagi",
"Name[pl]": "Sigi Sagi",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Ken Vermette",
"Name[ka]": "Ken Vermette",
"Name[ko]": "Ken Vermette",
"Name[lt]": "Ken Vermette",
"Name[nl]": "Ken Vermette",
"Name[nn]": "Ken Vermette",
"Name[pl]": "Ken Vermette",
......@@ -48,6 +49,7 @@
"Name[it]": "Honeywave",
"Name[ka]": "Honeywave",
"Name[ko]": "허니웨이브",
"Name[lt]": "Medaus banga",
"Name[nl]": "Honeywave",
"Name[nn]": "Honningbølgje",
"Name[pl]": "Fala miodu",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Santiago Cézar",
"Name[ka]": "Santiago Cézar",
"Name[ko]": "Santiago Cézar",
"Name[lt]": "Santiago Cézar",
"Name[nl]": "Santiago Cézar",
"Name[nn]": "Santiago Cézar",
"Name[pl]": "Santiago Cézar",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Risto Saukonpää",
"Name[ka]": "Risto Saukonpää",
"Name[ko]": "Risto Saukonpää",
"Name[lt]": "Risto Saukonpää",
"Name[nl]": "Risto Saukonpää",
"Name[nn]": "Risto Saukonpää",
"Name[pl]": "Risto Saukonpää",
......
......@@ -16,6 +16,7 @@
"Name[it]": "Ken Vermette",
"Name[ka]": "Ken Vermette",
"Name[ko]": "Ken Vermette",
"Name[lt]": "Ken Vermette",
"Name[nl]": "Ken Vermette",
"Name[nn]": "Ken Vermette",
"Name[pl]": "Ken Vermette",
......
......@@ -16,6 +16,7 @@
"Name[it]": "ruvkr",
"Name[ka]": "ruvkr",
"Name[ko]": "ruvkr",
"Name[lt]": "ruvkr",
"Name[nl]": "ruvkr",
"Name[nn]": "ruvkr",
"Name[pl]": "ruvkr",
......
Supports Markdown
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