Commit dfbbc927 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 a9b347db
...@@ -47,6 +47,7 @@ Comment[tr]=Juk Müzik Çalar ...@@ -47,6 +47,7 @@ Comment[tr]=Juk Müzik Çalar
Comment[ug]=Juk نەغمە چالغۇچ Comment[ug]=Juk نەغمە چالغۇچ
Comment[uk]=Програвач музики JuK Comment[uk]=Програвач музики JuK
Comment[x-test]=xxJuk Music Playerxx Comment[x-test]=xxJuk Music Playerxx
Comment[zh_CN]=Juk 音乐播放器
Comment[zh_TW]=Juk 音樂播放器 Comment[zh_TW]=Juk 音樂播放器
Name=JuK Name=JuK
Name[ast]=JuK Name[ast]=JuK
...@@ -96,6 +97,7 @@ Name[tr]=JuK ...@@ -96,6 +97,7 @@ Name[tr]=JuK
Name[ug]=JuK Name[ug]=JuK
Name[uk]=JuK Name[uk]=JuK
Name[x-test]=xxJuKxx Name[x-test]=xxJuKxx
Name[zh_CN]=JuK
Name[zh_TW]=音樂播放_JuK Name[zh_TW]=音樂播放_JuK
[Event/coverDownloaded] [Event/coverDownloaded]
...@@ -146,6 +148,7 @@ Name[tr]=Kapak Başarılı Şekilde İndirildi ...@@ -146,6 +148,7 @@ Name[tr]=Kapak Başarılı Şekilde İndirildi
Name[ug]=مۇقاۋا مۇۋەپپەقىيەتلىك چۈشۈرۈلدى Name[ug]=مۇقاۋا مۇۋەپپەقىيەتلىك چۈشۈرۈلدى
Name[uk]=Обкладинку успішно отримано Name[uk]=Обкладинку успішно отримано
Name[x-test]=xxCover Successfully Downloadedxx Name[x-test]=xxCover Successfully Downloadedxx
Name[zh_CN]=下载封面成功
Name[zh_TW]=已成功下載封面 Name[zh_TW]=已成功下載封面
Comment=A requested cover has been downloaded Comment=A requested cover has been downloaded
Comment[bg]=Поисканата обложка е изтеглена Comment[bg]=Поисканата обложка е изтеглена
...@@ -194,6 +197,7 @@ Comment[tr]=İstenilen kapak indirildi ...@@ -194,6 +197,7 @@ Comment[tr]=İstenilen kapak indirildi
Comment[ug]=ئىلتىماس قىلىنغان مۇقاۋا چۈشۈرۈلدى Comment[ug]=ئىلتىماس قىلىنغان مۇقاۋا چۈشۈرۈلدى
Comment[uk]=Потрібну обкладинку було отримано Comment[uk]=Потрібну обкладинку було отримано
Comment[x-test]=xxA requested cover has been downloadedxx Comment[x-test]=xxA requested cover has been downloadedxx
Comment[zh_CN]=已下载请求的封面
Comment[zh_TW]=要求的封面已下載 Comment[zh_TW]=要求的封面已下載
Action=Popup Action=Popup
...@@ -245,6 +249,7 @@ Name[tr]=Kapak İndirilemedi ...@@ -245,6 +249,7 @@ Name[tr]=Kapak İndirilemedi
Name[ug]=مۇقاۋىنى چۈشۈرەلمىدى Name[ug]=مۇقاۋىنى چۈشۈرەلمىدى
Name[uk]=Невдала спроба отримання обкладинки Name[uk]=Невдала спроба отримання обкладинки
Name[x-test]=xxCover Failed to Downloadxx Name[x-test]=xxCover Failed to Downloadxx
Name[zh_CN]=下载封面失败
Name[zh_TW]=下載封面失敗 Name[zh_TW]=下載封面失敗
Comment=A requested cover has failed to download Comment=A requested cover has failed to download
Comment[bg]=Грешка при изтегляне на поисканата обложка Comment[bg]=Грешка при изтегляне на поисканата обложка
...@@ -293,6 +298,7 @@ Comment[tr]=İstenilen kapak indirilemedi ...@@ -293,6 +298,7 @@ Comment[tr]=İstenilen kapak indirilemedi
Comment[ug]=ئىلتىماس قىلىنغان مۇقاۋىنى چۈشۈرەلمىدى Comment[ug]=ئىلتىماس قىلىنغان مۇقاۋىنى چۈشۈرەلمىدى
Comment[uk]=Потрібну обкладинку не вдалося отримати Comment[uk]=Потрібну обкладинку не вдалося отримати
Comment[x-test]=xxA requested cover has failed to downloadxx Comment[x-test]=xxA requested cover has failed to downloadxx
Comment[zh_CN]=请求的封面下载失败
Comment[zh_TW]=要求的封面無法成功下載 Comment[zh_TW]=要求的封面無法成功下載
Action=Popup Action=Popup
......
...@@ -51,6 +51,7 @@ Name[tr]=JuK Koleksiyonuna Ekle ...@@ -51,6 +51,7 @@ Name[tr]=JuK Koleksiyonuna Ekle
Name[ug]=JuK توپلىمىغا قوش Name[ug]=JuK توپلىمىغا قوش
Name[uk]=Додати до збірки JuK Name[uk]=Додати до збірки JuK
Name[x-test]=xxAdd to JuK Collectionxx Name[x-test]=xxAdd to JuK Collectionxx
Name[zh_CN]=添加到 Juk 收藏
Name[zh_TW]=新增到 JuK 收藏清單 Name[zh_TW]=新增到 JuK 收藏清單
Icon=juk Icon=juk
Exec=qdbus org.kde.juk /Collection org.kde.juk.collection.openFile %f Exec=qdbus org.kde.juk /Collection org.kde.juk.collection.openFile %f
...@@ -55,6 +55,7 @@ Name[tr]=JuK ...@@ -55,6 +55,7 @@ Name[tr]=JuK
Name[ug]=JuK Name[ug]=JuK
Name[uk]=JuK Name[uk]=JuK
Name[x-test]=xxJuKxx Name[x-test]=xxJuKxx
Name[zh_CN]=JuK
Name[zh_TW]=音樂播放_JuK Name[zh_TW]=音樂播放_JuK
GenericName=Music Player GenericName=Music Player
GenericName[bg]=Слушане на музика GenericName[bg]=Слушане на музика
...@@ -103,5 +104,6 @@ GenericName[tr]=Müzik Çalar ...@@ -103,5 +104,6 @@ GenericName[tr]=Müzik Çalar
GenericName[ug]=نەغمە قويغۇ GenericName[ug]=نەغمە قويغۇ
GenericName[uk]=Програвач музики GenericName[uk]=Програвач музики
GenericName[x-test]=xxMusic Playerxx GenericName[x-test]=xxMusic Playerxx
GenericName[zh_CN]=音乐播放器
GenericName[zh_TW]=音樂播放器 GenericName[zh_TW]=音樂播放器
Categories=Qt;KDE;AudioVideo;Player; 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