Commit 520b1462 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 277c531a
Pipeline #28089 skipped
......@@ -19,6 +19,7 @@ Name[es]=Comentarios del usuario
Name[et]=Kasutaja tagasiside
Name[fr]=Retours des utilisateurs
Name[ia]=Responsa del usator
Name[ko]=사용자 피드백
Name[nl]=Terugkoppeling van gebruiker
Name[pt]=Reacções do Utilizador
......@@ -38,6 +39,7 @@ X-KDE-Keywords[es]=kaddressbook, configurar, preferencias, comentarios del usuar
X-KDE-Keywords[et]=kde aadressiraamat, seadistamine, seadistused, kasutaja tagasiside
X-KDE-Keywords[fi]=kaddressbook, asetukset, käyttäjäpalaute
X-KDE-Keywords[fr]=KAddressBook, configuration, paramètres, retours des utilisateurs
X-KDE-Keywords[ia]=kaddressbook, configure, settings, userfeedback
X-KDE-Keywords[ko]=kaddressbook, configure, settings, userfeedback, 설정, 플러그인, 주소록, 사용자 피드백
X-KDE-Keywords[nl]=kaddressbook, instellen, instellingen, terugkoppeling van gebruiker
X-KDE-Keywords[pt]=kaddressbook, configurar, configuração, reacções, utilizadores
......@@ -8,6 +8,7 @@ Name[es]=Vista de KAddressBook
Name[et]=KDE aadressiraamatu vaade
Name[fr]=Affichage de KAddressBook
Name[ia]=Vista de KAddressBook
Name[it]=Vista di KAddressbook
Name[ko]=KAddressBook 보기
......@@ -25,6 +26,7 @@ Comment[es]=Mostrar el contacto indicado por URL
Comment[et]=URL-iga määratud kontskti näitamine
Comment[fi]=Näytä verkko-osoitteen määrittämä yhteystieto
Comment[fr]=Afficher le contact spécifié par l'URL
Comment[ia]=Monstra contacto specificate per URL
Comment[it]=Mostra il contatto indicato dall'URL
Comment[ko]=URL로 지정한 연락처 표시
Comment[nl]=Contactpersoon gespecificeerd door URL tonen
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