Commit 4dd987f5 authored by Script Kiddy's avatar Script Kiddy

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 5bf2c3aa
Pipeline #1206 failed with stage
in 60 minutes
......@@ -18,6 +18,7 @@
"Name[pl]": "Alexander Dymo",
"Name[pt]": "Alexander Dymo",
"Name[pt_BR]": "Alexander Dymo",
"Name[ru]": "Александр Дымо",
"Name[sk]": "Alexander Dymo",
"Name[sl]": "Alexander Dymo",
"Name[sv]": "Alexander Dymo",
......
......@@ -19,6 +19,7 @@
"Name[pl]": "Maciej Poleski",
"Name[pt]": "Maciej Poleski",
"Name[pt_BR]": "Maciej Poleski",
"Name[ru]": "Maciej Poleski",
"Name[sk]": "Maciej Poleski",
"Name[sl]": "Maciej Poleski",
"Name[sv]": "Maciej Poleski",
......
......@@ -16,6 +16,7 @@
"Name[pl]": "Carlos Nihelton",
"Name[pt]": "Carlos Nihelton",
"Name[pt_BR]": "Carlos Nihelton",
"Name[ru]": "Carlos Nihelton",
"Name[sv]": "Carlos Nihelton",
"Name[uk]": "Carlos Nihelton",
"Name[x-test]": "xxCarlos Niheltonxx",
......@@ -55,7 +56,7 @@
"Description[en_GB]": "clang-tidy provides an extensible framework for diagnosing and fixing typical programming errors, like style violations, interface misuse, or bugs that can be deduced via static analysis. http://clang.llvm.org/extra/clang-tidy/",
"Description[es]": "Clang-Tidy proporciona una infraestructura extensible para diagnosticar y corregir errores típicos de programación, como violaciones de estilo, mal uso de la interfaz o fallos que se pueden deducir mediante análisis estáticos. http://clang.llvm.org/extra/clang-tidy/",
"Description[fr]": "clang-tidy offre une infrastructure extensible pour le diagnostic et la correction des erreurs de programmation fréquentes : violations de normes de code, mauvaise utilisation des interfaces ou bogues pouvant être identifiés grâce à l'analyse statique. http://clang.llvm.org/extra/clang-tidy/",
"Description[gl]": "clang-tidy fornece unha infraestrutura extensíbel para diagnosticar e solucionar erros de programación típicos, como violacións das regras de estilo, ou erros que poden deducirse mediante a análise sintáctica. http://clang.llvm.org/extra/clang-tidy/",
"Description[gl]": "clang-tidy fornece unha infraestrutura extensíbel para diagnosticar e solucionar erros de programación típicos, como violacións das regras de estilo, ou fallos que poden deducirse mediante a análise sintáctica. http://clang.llvm.org/extra/clang-tidy/",
"Description[nl]": "clang-tidy biedt een uitbreidbaar framework voor diagnose en repareren van typische programmeringsfouten, zoals ingaan tegen de stijl, misbruik van interface of bugs die afgeleid worden via statische analyse. http://clang.llvm.org/extra/clang-tidy/",
"Description[pl]": "clang-tidy dostarcza szkielet do diagnostyki i naprawiania powszechnych błędów programistycznych, takich jak łamanie zasad, nadużycia w interfejsie, lub błędy, które można wykryć poprzez analizę statyczną. http://clang.llvm.org/extra/clang-tidy/",
"Description[pt]": "O 'clang-tidy' oferece uma plataforma extensível para diagnosticar e corrigir erros de programação típicos, como as violações do estilo, mau uso das interfaces ou erros que possam ser deduzidos por análise estática. http://clang.llvm.org/extra/clang-tidy/",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Hamish Rodda",
"Name[pt]": "Hamish Rodda",
"Name[pt_BR]": "Hamish Rodda",
"Name[ru]": "Hamish Rodda",
"Name[sk]": "Hamish Rodda",
"Name[sl]": "Hamish Rodda",
"Name[sv]": "Hamish Rodda",
......
......@@ -17,6 +17,7 @@
"Name[pl]": "Anton Anikin",
"Name[pt]": "Anton Anikin",
"Name[pt_BR]": "Anton Anikin",
"Name[ru]": "Антон Аникин",
"Name[sk]": "Anton Anikin",
"Name[sl]": "Anton Anikin",
"Name[sv]": "Anton Anikin",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Christoph Thielecke",
"Name[pt]": "Christoph Thielecke",
"Name[pt_BR]": "Christoph Thielecke",
"Name[ru]": "Christoph Thielecke",
"Name[sk]": "Christoph Thielecke",
"Name[sl]": "Christoph Thielecke",
"Name[sv]": "Christoph Thielecke",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Andreas Pakulat",
"Name[pt]": "Andreas Pakulat",
"Name[pt_BR]": "Andreas Pakulat",
"Name[ru]": "Andreas Pakulat",
"Name[sk]": "Andreas Pakulat",
"Name[sl]": "Andreas Pakulat",
"Name[sv]": "Andreas Pakulat",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Adam Treat",
"Name[pt]": "Adam Treat",
"Name[pt_BR]": "Adam Treat",
"Name[ru]": "Adam Treat",
"Name[sk]": "Adam Treat",
"Name[sl]": "Adam Treat",
"Name[sv]": "Adam Treat",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Hamish Rodda",
"Name[pt]": "Hamish Rodda",
"Name[pt_BR]": "Hamish Rodda",
"Name[ru]": "Hamish Rodda",
"Name[sk]": "Hamish Rodda",
"Name[sl]": "Hamish Rodda",
"Name[sv]": "Hamish Rodda",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Niko Sams",
"Name[pt]": "Niko Sams",
"Name[pt_BR]": "Niko Sams",
"Name[ru]": "Niko Sams",
"Name[sk]": "Niko Sams",
"Name[sl]": "Niko Sams",
"Name[sv]": "Niko Sams",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Milian Wolff",
"Name[pt]": "Milian Wolff",
"Name[pt_BR]": "Milian Wolff",
"Name[ru]": "Milian Wolff",
"Name[sk]": "Milian Wolff",
"Name[sl]": "Milian Wolff",
"Name[sv]": "Milian Wolff",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Alexander Dymo",
"Name[pt]": "Alexander Dymo",
"Name[pt_BR]": "Alexander Dymo",
"Name[ru]": "Александр Дымо",
"Name[sk]": "Alexander Dymo",
"Name[sl]": "Alexander Dymo",
"Name[sv]": "Alexander Dymo",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Alexander Dymo",
"Name[pt]": "Alexander Dymo",
"Name[pt_BR]": "Alexander Dymo",
"Name[ru]": "Александр Дымо",
"Name[sk]": "Alexander Dymo",
"Name[sl]": "Alexander Dymo",
"Name[sv]": "Alexander Dymo",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Milian Wolff",
"Name[pt]": "Milian Wolff",
"Name[pt_BR]": "Milian Wolff",
"Name[ru]": "Milian Wolff",
"Name[sk]": "Milian Wolff",
"Name[sl]": "Milian Wolff",
"Name[sv]": "Milian Wolff",
......
......@@ -19,6 +19,7 @@
"Name[pl]": "Evgeniy Ivanov",
"Name[pt]": "Evgeniy Ivanov",
"Name[pt_BR]": "Evgeniy Ivanov",
"Name[ru]": "Евгений Иванов",
"Name[sk]": "Evgeniy Ivanov",
"Name[sl]": "Evgeniy Ivanov",
"Name[sv]": "Evgeniy Ivanov",
......
......@@ -17,6 +17,7 @@
"Name[pl]": "Anton Anikin",
"Name[pt]": "Anton Anikin",
"Name[pt_BR]": "Anton Anikin",
"Name[ru]": "Антон Аникин",
"Name[sk]": "Anton Anikin",
"Name[sl]": "Anton Anikin",
"Name[sv]": "Anton Anikin",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Andreas Pakulat",
"Name[pt]": "Andreas Pakulat",
"Name[pt_BR]": "Andreas Pakulat",
"Name[ru]": "Andreas Pakulat",
"Name[sk]": "Andreas Pakulat",
"Name[sl]": "Andreas Pakulat",
"Name[sv]": "Andreas Pakulat",
......
......@@ -19,6 +19,7 @@
"Name[pl]": "Alex Richardson",
"Name[pt]": "Alex Richardson",
"Name[pt_BR]": "Alex Richardson",
"Name[ru]": "Alex Richardson",
"Name[sk]": "Alex Richardson",
"Name[sl]": "Alex Richardson",
"Name[sv]": "Alex Richardson",
......
......@@ -17,6 +17,7 @@
"Name[pl]": "Morten Danielsen Volden",
"Name[pt]": "Morten Danielsen Volden",
"Name[pt_BR]": "Morten Danielsen Volden",
"Name[ru]": "Morten Danielsen Volden",
"Name[sk]": "Morten Danielsen Volden",
"Name[sl]": "Morten Danielsen Volden",
"Name[sv]": "Morten Danielsen Volden",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Hamish Rodda",
"Name[pt]": "Hamish Rodda",
"Name[pt_BR]": "Hamish Rodda",
"Name[ru]": "Hamish Rodda",
"Name[sk]": "Hamish Rodda",
"Name[sl]": "Hamish Rodda",
"Name[sv]": "Hamish Rodda",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Milian Wolff",
"Name[pt]": "Milian Wolff",
"Name[pt_BR]": "Milian Wolff",
"Name[ru]": "Milian Wolff",
"Name[sk]": "Milian Wolff",
"Name[sl]": "Milian Wolff",
"Name[sv]": "Milian Wolff",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Roberto Raggi",
"Name[pt]": "Roberto Raggi",
"Name[pt_BR]": "Roberto Raggi",
"Name[ru]": "Roberto Raggi",
"Name[sk]": "Roberto Raggi",
"Name[sl]": "Roberto Raggi",
"Name[sv]": "Roberto Raggi",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Dukju Ahn",
"Name[pt]": "Dukju Ahn",
"Name[pt_BR]": "Dukju Ahn",
"Name[ru]": "Dukju Ahn",
"Name[sk]": "Dukju Ahn",
"Name[sl]": "Dukju Ahn",
"Name[sv]": "Dukju Ahn",
......
......@@ -18,6 +18,7 @@
"Name[pl]": "Miha Čančula",
"Name[pt]": "Miha Čančula",
"Name[pt_BR]": "Miha Čančula",
"Name[ru]": "Miha Čančula",
"Name[sk]": "Miha Čančula",
"Name[sl]": "Miha Čančula",
"Name[sv]": "Miha Čančula",
......
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