Commit 34ff3501 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 5ecf266f
......@@ -24,6 +24,7 @@ Name[fi]=Pikanäppäimet
Name[fr]=Raccourcis
Name[it]=Scorciatoie
Name[ko]=단축키
Name[lt]=Spartieji klavišai
Name[nl]=Sneltoetsen
Name[nn]=Snarvegar
Name[pl]=Skróty
......@@ -52,6 +53,7 @@ Comment[fi]=Pikanäppäinasetukset
Comment[fr]=Configurer les raccourcis de clavier
Comment[it]=Configura le scorciatoie della tastiera
Comment[ko]=키보드 단축키 설정
Comment[lt]=Konfigūruoti sparčiuosius klavišus
Comment[nl]=Sneltoetsen configureren
Comment[nn]=Set opp snøggtastar
Comment[pl]=Ustawienia skrótów klawiszowych
......
......@@ -13,6 +13,7 @@ Name[fi]=Pikanäppäimet
Name[fr]=Raccourcis
Name[it]=Scorciatoie
Name[ko]=단축키
Name[lt]=Spartieji klavišai
Name[nl]=Sneltoetsen
Name[nn]=Snarvegar
Name[pl]=Skróty
......@@ -41,6 +42,7 @@ Comment[fi]=Pikanäppäinasetukset
Comment[fr]=Configurer les raccourcis de clavier
Comment[it]=Configura le scorciatoie della tastiera
Comment[ko]=키보드 단축키 설정
Comment[lt]=Konfigūruoti sparčiuosius klavišus
Comment[nl]=Sneltoetsen configureren
Comment[nn]=Set opp snøggtastar
Comment[pl]=Ustawienia skrótów klawiszowych
......
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