Commit 0b50e388 authored by Script Kiddy's avatar Script Kiddy

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 18118105
Pipeline #2927 passed with stage
in 4 minutes and 53 seconds
......@@ -370,7 +370,7 @@ Comment[ia]=Usa menu de contexto in tabuliero de systema pro restabilir.
Comment[is]=Notaðu samhengisvalmynd í kerfisbakka til að endurheimta.
Comment[it]=Usa il menu contestuale nel vassoio di sistema per ripristinare.
Comment[kk]=Қалпына келтіруге жүйелік сөре контекстті мәзірін пайдаланыңыз.
Comment[ko]=시스템 트레이의 텍스트 메뉴를 사용하여 복원하십시오.
Comment[ko]=시스템 트레이의 텍스트 메뉴를 사용하여 복원하십시오.
Comment[nb]=Bruk kontekstmenyen i systemkurven for å tilbakestille.
Comment[nds]=Du kannst dat över't Kontextmenü binnen den Systeemafsnitt wedderherstellen.
Comment[nl]=Contextmenu in systeemvak gebruiken voor herstellen.
......
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