Commit bad4afdf 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 5f9692da
......@@ -130,7 +130,7 @@ X-KDE-Keywords[fr]=agenda,tâches,configuration,paramètres
X-KDE-Keywords[ga]=féilire, tascanna, cumraigh, socruithe
X-KDE-Keywords[gl]=calendario,tarefas,configurar,opcións
X-KDE-Keywords[hu]=naptár, feladatok, beállítás, beállítások
X-KDE-Keywords[ia]=calendario,cosas de facer, configura, preferentias
X-KDE-Keywords[ia]=calendario,agenda o cosas de facer, configura, preferentias
X-KDE-Keywords[it]=calendario, cose da fare, configurazione, impostazioni
X-KDE-Keywords[kk]=calendar, todos, configure, settings
X-KDE-Keywords[km]=ប្រតិទិន កិច្ចការ​ត្រូវ​ធ្វើ កំណត់​រចនាសម្ព័ន្ធ កំណត់
......
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