Commit 0f6c58de 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 a23a063b
......@@ -12,6 +12,7 @@
"Description[ia]": "Gerente de configuration de GTK",
"Description[id]": "Pengelolaan konfig GTK",
"Description[it]": "Gestione della configurazione GTK",
"Description[lt]": "GTK konfigūracijos valdymas",
"Description[nl]": "GTK-configuratiebeheer",
"Description[pt]": "Gestão das configurações do GTK",
"Description[pt_BR]": "Gerenciamento das configurações do GTK",
......@@ -35,6 +36,7 @@
"Name[ia]": "Plasma GTKd",
"Name[id]": "Plasma GTKd",
"Name[it]": "Plasma GTKd",
"Name[lt]": "Plasma GTKd",
"Name[nl]": "Plasma GTKd",
"Name[pt]": "GTKd do Plasma",
"Name[pt_BR]": "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