Commit 7306af75 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 9988ed46
......@@ -21,6 +21,7 @@ Name[eu]=Lasterbideak
Name[fi]=Pikanäppäimet
Name[fr]=Raccourcis
Name[it]=Scorciatoie
Name[ko]=단축키
Name[nl]=Sneltoetsen
Name[nn]=Snarvegar
Name[pt]=Atalhos
......@@ -40,6 +41,7 @@ Comment[eu]=Konfiguratu teklatuko lasterbideak
Comment[fi]=Pikanäppäinasetukset
Comment[fr]=Configurer les raccourcis de clavier
Comment[it]=Configura le scorciatoie della tastiera
Comment[ko]=키보드 단축키 설정
Comment[nl]=Sneltoetsen configureren
Comment[nn]=Set opp snøggtastar
Comment[pt]=Configurar os Atalhos do Teclado
......
......@@ -9,6 +9,7 @@ Name[eu]=Lasterbideak
Name[fi]=Pikanäppäimet
Name[fr]=Raccourcis
Name[it]=Scorciatoie
Name[ko]=단축키
Name[nl]=Sneltoetsen
Name[nn]=Snarvegar
Name[pt]=Atalhos
......@@ -28,6 +29,7 @@ Comment[eu]=Konfiguratu teklatuko lasterbideak
Comment[fi]=Pikanäppäinasetukset
Comment[fr]=Configurer les raccourcis de clavier
Comment[it]=Configura le scorciatoie della tastiera
Comment[ko]=키보드 단축키 설정
Comment[nl]=Sneltoetsen configureren
Comment[nn]=Set opp snøggtastar
Comment[pt]=Configurar os Atalhos do Teclado
......
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