Commit 6f8fbce7 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 5438542e
......@@ -4,7 +4,29 @@
{
"Email": "svenbrauch@googlemail.com",
"Name": "Sven Brauch",
"Name[x-test]": "xxSven Brauchxx"
"Name[ca@valencia]": "Sven Brauch",
"Name[ca]": "Sven Brauch",
"Name[cs]": "Sven Brauch",
"Name[de]": "Sven Brauch",
"Name[en_GB]": "Sven Brauch",
"Name[es]": "Sven Brauch",
"Name[et]": "Sven Brauch",
"Name[fi]": "Sven Brauch",
"Name[fr]": "Sven Brauch",
"Name[gl]": "Sven Brauch",
"Name[it]": "Sven Brauch",
"Name[nl]": "Sven Brauch",
"Name[pl]": "Sven Brauch",
"Name[pt]": "Sven Brauch",
"Name[pt_BR]": "Sven Brauch",
"Name[ru]": "Sven Brauch",
"Name[sk]": "Sven Brauch",
"Name[sl]": "Sven Brauch",
"Name[sv]": "Sven Brauch",
"Name[tr]": "Sven Brauch",
"Name[uk]": "Sven Brauch",
"Name[x-test]": "xxSven Brauchxx",
"Name[zh_CN]": "Sven Brauch"
}
],
"Category": "Debugging",
......@@ -13,6 +35,7 @@
"Description[ca]": "Aquest connector proveeix d'un frontal pel PDB",
"Description[cs]": "Tento modul poskytuje rozhraní pro PDB",
"Description[de]": "Dieses Modul stellt eine Oberfläche für PDB zur Verfügung.",
"Description[en_GB]": "This plugin provides a frontend for PDB",
"Description[es]": "Este complemento proporciona una interfaz para PDB",
"Description[et]": "PDB kasutajaliidese plugin",
"Description[fi]": "Tämä liitännäinen tarjoaa PDB-käyttöliittymän",
......
......@@ -4,7 +4,29 @@
{
"Email": "svenbrauch@googlemail.com",
"Name": "Sven Brauch",
"Name[x-test]": "xxSven Brauchxx"
"Name[ca@valencia]": "Sven Brauch",
"Name[ca]": "Sven Brauch",
"Name[cs]": "Sven Brauch",
"Name[de]": "Sven Brauch",
"Name[en_GB]": "Sven Brauch",
"Name[es]": "Sven Brauch",
"Name[et]": "Sven Brauch",
"Name[fi]": "Sven Brauch",
"Name[fr]": "Sven Brauch",
"Name[gl]": "Sven Brauch",
"Name[it]": "Sven Brauch",
"Name[nl]": "Sven Brauch",
"Name[pl]": "Sven Brauch",
"Name[pt]": "Sven Brauch",
"Name[pt_BR]": "Sven Brauch",
"Name[ru]": "Sven Brauch",
"Name[sk]": "Sven Brauch",
"Name[sl]": "Sven Brauch",
"Name[sv]": "Sven Brauch",
"Name[tr]": "Sven Brauch",
"Name[uk]": "Sven Brauch",
"Name[x-test]": "xxSven Brauchxx",
"Name[zh_CN]": "Sven Brauch"
}
],
"Category": "Language Support",
......@@ -13,6 +35,7 @@
"Description[ca]": "Implementació del llenguatge Python",
"Description[cs]": "Podpora jazyka Python",
"Description[de]": "Sprachunterstützung für Python",
"Description[en_GB]": "Python Language Support",
"Description[es]": "Implementación del lenguaje Python",
"Description[et]": "Pythoni keele toetus",
"Description[fi]": "Python-kielituki",
......@@ -38,6 +61,7 @@
"Name[ca]": "Implementació de Python",
"Name[cs]": "Podpora Pythonu",
"Name[de]": "Unterstützung für Python",
"Name[en_GB]": "Python Support",
"Name[es]": "Implementación de Python",
"Name[et]": "Pythoni toetus",
"Name[fi]": "Python-tuki",
......
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