Commit bbc8d9d8 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 4734aedd
......@@ -313,6 +313,7 @@ Name[fr]=JuK fonctionne en mode intégré
Name[gl]=JuK está no modo acoplado
Name[hu]=A JuK dokkolt módban fut
Name[ia]=Juck executante de modo dock
Name[is]=JuK keyrandi í tengikvíarham
Name[it]=JuK in esecuzione nel vassoio di sistema
Name[kk]=JuK бүктелген күйде жегілген
Name[ko]=도킹 모드에서 JuK 실행 중
......@@ -352,6 +353,7 @@ Comment[fr]=utilisez le menu contextuel de la boîte à miniatures pour le resta
Comment[gl]=Use o menú contextual na bandexa do sistema para restauralo.
Comment[hu]=Helyi menü használata a rendszertálcán a visszaállításhoz.
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]=시스템 트레이의 컨텍스트 메뉴를 사용하여 복원하십시오.
......
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