Commit 447ae7d1 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 6c504b4a
......@@ -5,6 +5,7 @@
"Description[ca]": "Gestió de la configuració del GTK",
"Description[cs]": "Správa nastavení GTK",
"Description[da]": "Håndtering af GTK-config",
"Description[de]": "Verwaltung der GTK-Einstellungen",
"Description[en_GB]": "GTK config management",
"Description[es]": "Gestión de configuración de GTK",
"Description[et]": "GTK seadistuste haldamine",
......@@ -35,6 +36,7 @@
"Name[ca]": "Plasma GTKd",
"Name[cs]": "Plasma GTKd",
"Name[da]": "Plasma GTKd",
"Name[de]": "Plasma GTKd",
"Name[en_GB]": "Plasma GTKd",
"Name[es]": "Plasma GTKd",
"Name[et]": "Plasma GTKd",
......
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