Commit a5efb6e1 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 532e592f
Pipeline #23005 passed with stage
in 10 minutes and 10 seconds
......@@ -24,6 +24,7 @@ Name[nl]=Terugkoppeling van gebruiker
Name[pt]=Reacções do Utilizador
Name[pt_BR]=Comentários do usuário
Name[ru]=Обратная связь
Name[sl]=Uporabnikov odziv
Name[uk]=Відгуки користувача
Name[x-test]=xxUser Feedbackxx
......@@ -42,6 +43,7 @@ X-KDE-Keywords[nl]=kaddressbook, instellen, instellingen, terugkoppeling van geb
X-KDE-Keywords[pt]=kaddressbook, configurar, configuração, reacções, utilizadores
X-KDE-Keywords[pt_BR]=akregator, configurar, configurações, comentários do usuário
X-KDE-Keywords[ru]=kaddressbook, configure, settings, plugins, userfeedback, адресная книга, настройка, параметры, настроить, модули, обратная связь
X-KDE-Keywords[sl]=kaddressbook,nastavi,nastavitve,vstavki,uporabnikov odziv
X-KDE-Keywords[sv]=adressbok, anpassa, inställningar, användaråterkoppling
X-KDE-Keywords[x-test]=xxkaddressbookxx,xx configurexx,xx settingsxx,xx userfeedbackxx
......@@ -10,6 +10,7 @@ Name[it]=Vista di KAddressbook
Name[pt]=Área do KAddressBook
Name[pt_BR]=Visualização do KAddressBook
Name[sl]=Pogled KAddressBook
Name[uk]=Перегляд KAddressBook
Name[x-test]=xxKAddressBook Viewxx
......@@ -24,6 +25,7 @@ Comment[it]=Mostra il contatto indicato dall'URL
Comment[nl]=Contactpersoon gespecificeerd door URL tonen
Comment[pt]=Mostra o contacto indicado pelo URL
Comment[pt_BR]=Exibir o contato especificado pela URL
Comment[sl]=Stik določen s spletno stranjo
Comment[sv]=Visa kontakt angiven av webbadress
Comment[uk]=Показати контакт, який вказано за допомогою адреси
Comment[x-test]=xxDisplay contact specified by URLxx
......@@ -19,6 +19,7 @@ Name[pl]=Wygląd książki adresowej
Name[pt]=Tema do KAddressBook
Name[pt_BR]=Tema do KAddressbook
Name[ru]=Оформление адресной книги
Name[sl]=Tema KAddressBook
Name[uk]=Тема KAddressbook
Name[x-test]=xxKAddressbook Themexx
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