Commit 1b6ef71b 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 b438a87c
......@@ -41,6 +41,7 @@ Name[sr@ijekavian]=Поставке ЛДАП сервера
Name[sr@ijekavianlatin]=Postavke LDAP servera
Name[sr@latin]=Postavke LDAP servera
Name[sv]=LDAP-serverinställningar
Name[tr]=LDAP Sunucu Ayarları
Name[uk]=Параметри серверів LDAP
Name[x-test]=xxLDAP Server Settingsxx
Name[zh_CN]=LDAP 服务器设置
......@@ -75,6 +76,7 @@ Comment[sr@ijekavian]=Подешавање доступних ЛДАП серв
Comment[sr@ijekavianlatin]=Podešavanje dostupnih LDAP servera
Comment[sr@latin]=Podešavanje dostupnih LDAP servera
Comment[sv]=Anpassa tillgängliga LDAP-servrar
Comment[tr]=Kullanılabilir LDAP sunucularını yapılandır
Comment[uk]=Налаштовування доступних серверів LDAP
Comment[x-test]=xxConfigure the available LDAP serversxx
Comment[zh_CN]=配置可用的 LDAP 服务器
......@@ -105,6 +107,7 @@ X-KDE-Keywords[sr@ijekavian]=kaddressbook,configure,settings,LDAP,К‑адре
X-KDE-Keywords[sr@ijekavianlatin]=kaddressbook,configure,settings,LDAP,K‑adresar,podešavanje,podesiti,postavke,LDAP
X-KDE-Keywords[sr@latin]=kaddressbook,configure,settings,LDAP,K‑adresar,podešavanje,podesiti,postavke,LDAP
X-KDE-Keywords[sv]=adressbok, anpassa, inställningar, LDAP
X-KDE-Keywords[tr]=kaddressbook, yapılandırma, ayarlar, LDAP, adresdefteri
X-KDE-Keywords[uk]=kaddressbook,налаштувати,адресна,книга,параметри,лдап,configure,settings,LDAP
X-KDE-Keywords[x-test]=xxkaddressbookxx,xx configurexx,xx settingsxx,xx LDAPxx
X-KDE-Keywords[zh_CN]=kaddressbook, configure, settings, LDAP, 配置, 设置
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