Commit f8edad26 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 3f7f157d
......@@ -2,6 +2,7 @@
Name=GNOME/GTK Application Styles
Name[ca]=Estils de les aplicacions GNOME/GTK
Name[es]=Estilo de las aplicaciones de GNOME/GTK
Name[eu]=GNOME/GTK aplikazioen estiloak
Name[fr]=Apparence des applications GNOME / GTK
Name[it]=Stili delle applicazioni GNOME/GTK
Name[nl]=Stijlen van GNOME/GTK-toepassingen
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