Commit 4c51cbf3 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 bb0ffc4e
Pipeline #28829 skipped
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
"Description[nl]": "Deze plugin laat patches herzien direct in de editor.", "Description[nl]": "Deze plugin laat patches herzien direct in de editor.",
"Description[pl]": "Umożliwia przeglądanie łatek bezpośrednio w edytorze.", "Description[pl]": "Umożliwia przeglądanie łatek bezpośrednio w edytorze.",
"Description[pt]": "Este 'plugin' permite a revisão das modificações directamente no editor.", "Description[pt]": "Este 'plugin' permite a revisão das modificações directamente no editor.",
"Description[pt_BR]": "Este plugin permite obter as modificações diretamente no editor.", "Description[pt_BR]": "Este plugin permite obter as correções diretamente no editor.",
"Description[sk]": "Tento plugin umožňuje zhodnotenie záplat priamo v editore.", "Description[sk]": "Tento plugin umožňuje zhodnotenie záplat priamo v editore.",
"Description[sl]": "Vstavek omogoča pregled popravkov neposredno v urejevalniku.", "Description[sl]": "Vstavek omogoča pregled popravkov neposredno v urejevalniku.",
"Description[sv]": "Insticksprogrammet gör det möjligt att direkt granska programfixar i editorn.", "Description[sv]": "Insticksprogrammet gör det möjligt att direkt granska programfixar i editorn.",
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
"Name[nl]": "Patchoverzicht", "Name[nl]": "Patchoverzicht",
"Name[pl]": "Przeglądanie poprawek", "Name[pl]": "Przeglądanie poprawek",
"Name[pt]": "Revisão da Modificação", "Name[pt]": "Revisão da Modificação",
"Name[pt_BR]": "Revisão da Modificação", "Name[pt_BR]": "Revisão da correção",
"Name[ru]": "Рецензирование патчей", "Name[ru]": "Рецензирование патчей",
"Name[sk]": "Zhodnotenie záplaty", "Name[sk]": "Zhodnotenie záplaty",
"Name[sl]": "Pregled popravkov", "Name[sl]": "Pregled popravkov",
......
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