Commit 3e848aa5 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 0598677d
......@@ -4,7 +4,7 @@ Comment=Juk Music Player
Comment[bg]=Слушане на музика (Juk)
Comment[bs]=Muzički plejer Juk
Comment[ca]=Reproductor musical JuK
Comment[ca@valencia]=Reproductor musical Juk
Comment[ca@valencia]=Reproductor musical JuK
Comment[cs]=Přehrávač hudby Juk
Comment[da]=Juk musikafspiller
Comment[de]=JuK-Audio-Wiedergabe
......@@ -105,7 +105,7 @@ Name=Cover Successfully Downloaded
Name[bg]=Обложката е изтеглена
Name[bs]=Omot uspješno preuzet
Name[ca]=La caràtula s'ha baixat correctament
Name[ca@valencia]=La caràtula ha baixat correctament
Name[ca@valencia]=La caràtula s'ha baixat correctament
Name[cs]=Obal úspěšně stažen
Name[da]=Download af omslag gennemført
Name[de]=Titelbild erfolgreich heruntergeladen
......@@ -346,7 +346,7 @@ Comment=Use context menu in system tray to restore.
Comment[bg]=Може да възстановите от контекстното меню в системния поднос.
Comment[bs]=Koristite kontekstsni meni u sistemskom uglu za obnovu
Comment[ca]=Useu el menú contextual a la safata del sistema per a restaurar.
Comment[ca@valencia]=Useu el menú contextual en la safata del sistema per restaurar.
Comment[ca@valencia]=Useu el menú contextual a la safata del sistema per a restaurar.
Comment[cs]=Pro návrat použijte kontextovou nabídky v systémové liště.
Comment[da]=Brug kontekstmenuen i statusområdet til at gendanne.
Comment[de]=Kontextmenü im Systemabschnitt der Kontrollleiste zum Wiederherstellen verwenden
......
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