Commit 59a9a0c3 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 4c555dc9
...@@ -48,7 +48,7 @@ Name[ka]=KDE-ს პროგრამები ...@@ -48,7 +48,7 @@ Name[ka]=KDE-ს პროგრამები
Name[kk]=KDE қолданбалары Name[kk]=KDE қолданбалары
Name[km]=កម្មវិធី​របស់ KDE Name[km]=កម្មវិធី​របស់ KDE
Name[kn]=ಕೆಡಿಇ ಅನ್ವಯಗಳು Name[kn]=ಕೆಡಿಇ ಅನ್ವಯಗಳು
Name[ko]=KDE 응용 프로그램 Name[ko]=KDE 프로그램
Name[ku]=Sepanên KDE'yê Name[ku]=Sepanên KDE'yê
Name[lt]=KDE programos Name[lt]=KDE programos
Name[lv]=KDE programmas Name[lv]=KDE programmas
...@@ -49,7 +49,7 @@ Name[ka]=პროგრამები ...@@ -49,7 +49,7 @@ Name[ka]=პროგრამები
Name[kk]=Қолданбалар Name[kk]=Қолданбалар
Name[km]=កម្មវិធី Name[km]=កម្មវិធី
Name[kn]=ಅನ್ವಯಗಳು Name[kn]=ಅನ್ವಯಗಳು
Name[ko]=응용 프로그램 Name[ko]=프로그램
Name[ku]=Sepan Name[ku]=Sepan
Name[lt]=Programos Name[lt]=Programos
Name[lv]=Programmas Name[lv]=Programmas
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