Commit 8a55c09d authored by Script Kiddy's avatar Script Kiddy
Browse files

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 fee630de
......@@ -55,7 +55,6 @@ Name[sr@latin]=Dobavljanje iz CDDB‑a
Name[sv]=Hämta från CDDB
Name[tr]=CDDB Erişimi
Name[uk]=Отримання з CDDB
Name[x-test]=xxCDDB Retrievalxx
Name[zh_CN]=CDDB 获取
Name[zh_TW]=CDDB 取得資訊
......@@ -106,7 +105,6 @@ GenericName[sv]=CDDB-inställning
GenericName[tr]=CDDB Yapılandırması
GenericName[ug]=CDDB سەپلىمىسى
GenericName[uk]=Налаштування CDDB
GenericName[x-test]=xxCDDB Configurationxx
GenericName[zh_CN]=CDDB 配置
GenericName[zh_TW]=CDDB 設定
......@@ -155,7 +153,6 @@ Comment[sr@latin]=Podesite dobavljanje iz CDDB‑a
Comment[sv]=Anpassa hämtning från CDDB
Comment[tr]=CDDB Erişimini Yapılandır
Comment[uk]=Налаштування отримання з CDDB
Comment[x-test]=xxConfigure the CDDB Retrievalxx
Comment[zh_CN]=配置 CDDB 获取
Comment[zh_TW]=CDDB 取得資訊設定
......@@ -202,7 +199,6 @@ Keywords[sv]=cddb;
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