Commit ca08ebb3 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 9bed162d
......@@ -27,6 +27,7 @@ Name[ko]=단축키
Name[lt]=Spartieji klavišai
Name[nl]=Sneltoetsen
Name[nn]=Snarvegar
Name[pa]=ਸ਼ਾਰਟਕੱਟ
Name[pl]=Skróty
Name[pt]=Atalhos
Name[pt_BR]=Atalhos
......@@ -56,6 +57,7 @@ Comment[ko]=키보드 단축키 설정
Comment[lt]=Konfigūruoti sparčiuosius klavišus
Comment[nl]=Sneltoetsen configureren
Comment[nn]=Set opp snøggtastar
Comment[pa]=ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਦੀ ਸੰਰਚਨਾ ਕਰੋ
Comment[pl]=Ustawienia skrótów klawiszowych
Comment[pt]=Configurar os Atalhos do Teclado
Comment[pt_BR]=Configurar atalhos do teclado
......
......@@ -16,6 +16,7 @@ Name[ko]=단축키
Name[lt]=Spartieji klavišai
Name[nl]=Sneltoetsen
Name[nn]=Snarvegar
Name[pa]=ਸ਼ਾਰਟਕੱਟ
Name[pl]=Skróty
Name[pt]=Atalhos
Name[pt_BR]=Atalhos
......@@ -45,6 +46,7 @@ Comment[ko]=키보드 단축키 설정
Comment[lt]=Konfigūruoti sparčiuosius klavišus
Comment[nl]=Sneltoetsen configureren
Comment[nn]=Set opp snøggtastar
Comment[pa]=ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਦੀ ਸੰਰਚਨਾ ਕਰੋ
Comment[pl]=Ustawienia skrótów klawiszowych
Comment[pt]=Configurar os Atalhos do Teclado
Comment[pt_BR]=Configurar 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