Commit 17746acf 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 68e271b2
......@@ -117,6 +117,7 @@ Comment[nl]=Opties voor toegankelijkheid configureren
Comment[nn]=Set opp tilgjengeval
Comment[pt]=Configurar as Opções de Acessibilidade
Comment[pt_BR]=Configurar opções de acessibilidade
Comment[ro]=Configurează opțiuni de accesibilitate
Comment[sl]=Nastavi možnosti dostopnosti
Comment[sv]=Anpassa alternativ för handikappstöd
Comment[uk]=Налаштувати параметри доступності
......
......@@ -105,6 +105,7 @@ Comment[nl]=Opties voor toegankelijkheid configureren
Comment[nn]=Set opp tilgjengeval
Comment[pt]=Configurar as Opções de Acessibilidade
Comment[pt_BR]=Configurar opções de acessibilidade
Comment[ro]=Configurează opțiuni de accesibilitate
Comment[sl]=Nastavi možnosti dostopnosti
Comment[sv]=Anpassa alternativ för handikappstöd
Comment[uk]=Налаштувати параметри доступності
......
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