Commit b78a104f 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 ba2c0324
......@@ -45,7 +45,7 @@ Comment[es]=Configurar las opciones avanzadas de la gestión de ventanas
Comment[et]=Muude aknahalduse valikute seadistamine
Comment[eu]=Konfiguratu leiho kudeaketa aukera aurreratuak
Comment[fi]=Ikkunanhallinnan lisäasetukset
Comment[fr]=Configuré les options de gestion avancée des fenêtres
Comment[fr]=Configurer les options de gestion avancée des fenêtres
Comment[gl]=Configurar as funcionalidades avanzadas da xestión de xanelas
Comment[id]=Konfigurasikan opsi pengelolaan window tingkat-lanjut
Comment[it]=Configura opzioni avanzate della gestione delle finestre
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