Commit f418bcec 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 f3ba74fd
......@@ -47,7 +47,6 @@ Comment[tr]=Juk Müzik Çalar
Comment[ug]=Juk نەغمە چالغۇچ
Comment[uk]=Програвач музики JuK
Comment[x-test]=xxJuk Music Playerxx
Comment[zh_CN]=Juk 音乐播放器
Comment[zh_TW]=Juk 音樂播放器
Name=JuK
Name[ast]=JuK
......@@ -97,7 +96,6 @@ Name[tr]=JuK
Name[ug]=JuK
Name[uk]=JuK
Name[x-test]=xxJuKxx
Name[zh_CN]=JuK
Name[zh_TW]=音樂播放_JuK
[Event/coverDownloaded]
......@@ -148,7 +146,6 @@ Name[tr]=Kapak Başarılı Şekilde İndirildi
Name[ug]=مۇقاۋا مۇۋەپپەقىيەتلىك چۈشۈرۈلدى
Name[uk]=Обкладинку успішно отримано
Name[x-test]=xxCover Successfully Downloadedxx
Name[zh_CN]=下载封面成功
Name[zh_TW]=已成功下載封面
Comment=A requested cover has been downloaded
Comment[bg]=Поисканата обложка е изтеглена
......@@ -197,7 +194,6 @@ Comment[tr]=İstenilen kapak indirildi
Comment[ug]=ئىلتىماس قىلىنغان مۇقاۋا چۈشۈرۈلدى
Comment[uk]=Потрібну обкладинку було отримано
Comment[x-test]=xxA requested cover has been downloadedxx
Comment[zh_CN]=已下载请求的封面
Comment[zh_TW]=要求的封面已下載
Action=Popup
......@@ -249,7 +245,6 @@ Name[tr]=Kapak İndirilemedi
Name[ug]=مۇقاۋىنى چۈشۈرەلمىدى
Name[uk]=Невдала спроба отримання обкладинки
Name[x-test]=xxCover Failed to Downloadxx
Name[zh_CN]=下载封面失败
Name[zh_TW]=下載封面失敗
Comment=A requested cover has failed to download
Comment[bg]=Грешка при изтегляне на поисканата обложка
......@@ -298,7 +293,6 @@ Comment[tr]=İstenilen kapak indirilemedi
Comment[ug]=ئىلتىماس قىلىنغان مۇقاۋىنى چۈشۈرەلمىدى
Comment[uk]=Потрібну обкладинку не вдалося отримати
Comment[x-test]=xxA requested cover has failed to downloadxx
Comment[zh_CN]=请求的封面下载失败
Comment[zh_TW]=要求的封面無法成功下載
Action=Popup
......@@ -340,7 +334,6 @@ Name[sv]=JuK kör i dockningsläge
Name[tr]=JuK yerleşik kipte çalışıyor
Name[uk]=JuK запущено у згорнутому режимі
Name[x-test]=xxJuK running in dock modexx
Name[zh_CN]=JuK 正以停靠部件模式运行
Name[zh_TW]=JuK 以嵌入模式執行中
Comment=Use context menu in system tray to restore.
Comment[bg]=Може да възстановите от контекстното меню в системния поднос.
......@@ -380,6 +373,5 @@ Comment[sv]=Använd sammanhangsberoende meny i systembrickan för att återstäl
Comment[tr]=Geri yüklemek için sistem çekmecesindeki bağlam menüsünü kullanın.
Comment[uk]=Скористайтеся контекстним меню піктограми системного лотка, щоб розгорнути вікно програми.
Comment[x-test]=xxUse context menu in system tray to restore.xx
Comment[zh_CN]=使用系统托盘中的环境菜单来恢复为原模式。
Comment[zh_TW]=用系統匣的內文選單來回復。
Action=Popup
......@@ -51,7 +51,6 @@ Name[tr]=JuK Koleksiyonuna Ekle
Name[ug]=JuK توپلىمىغا قوش
Name[uk]=Додати до збірки JuK
Name[x-test]=xxAdd to JuK Collectionxx
Name[zh_CN]=添加到 Juk 收藏
Name[zh_TW]=新增到 JuK 收藏清單
Icon=juk
Exec=qdbus org.kde.juk /Collection org.kde.juk.collection.openFile %f
......@@ -55,7 +55,6 @@ Name[tr]=JuK
Name[ug]=JuK
Name[uk]=JuK
Name[x-test]=xxJuKxx
Name[zh_CN]=JuK
Name[zh_TW]=音樂播放_JuK
GenericName=Music Player
GenericName[bg]=Слушане на музика
......@@ -104,6 +103,5 @@ GenericName[tr]=Müzik Çalar
GenericName[ug]=نەغمە قويغۇ
GenericName[uk]=Програвач музики
GenericName[x-test]=xxMusic Playerxx
GenericName[zh_CN]=音乐播放器
GenericName[zh_TW]=音樂播放器
Categories=Qt;KDE;AudioVideo;Player;
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