Commit c333c4e6 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 a3b46d46
Pipeline #22586 passed with stage
in 15 minutes and 55 seconds
......@@ -19,6 +19,7 @@ Name[pl]=Informacje
Name[pt]=Informação
Name[pt_BR]=Informações
Name[sk]=Informácie
Name[sl]=Informacije
Name[sv]=Information
Name[uk]=Інформація
Name[x-test]=xxInformationxx
......@@ -42,6 +43,7 @@ Comment[pl]=Wersje oprogramowania
Comment[pt]=Versões do 'Software'
Comment[pt_BR]=Versões do software
Comment[sk]=Verzie softvéru
Comment[sl]=Verzije programja
Comment[sv]=Programvaruversioner
Comment[uk]=Версії програмного забезпечення
Comment[x-test]=xxSoftware Versionsxx
......@@ -71,6 +73,7 @@ X-KDE-Keywords[pt]=informação, distribuição, sistema
X-KDE-Keywords[pt_BR]=informação, info, distro, distribuição, sistema
X-KDE-Keywords[ru]=info,distro,system,информация,дистрибутив,сведения,система
X-KDE-Keywords[sk]=info, distro, systém
X-KDE-Keywords[sl]=info, distro, system,sistem
X-KDE-Keywords[sv]=information, distribution, system
X-KDE-Keywords[uk]=info, distro, system, інфо, відомості, дистрибутив, система
X-KDE-Keywords[x-test]=xxinfoxx,xx distroxx,xx systemxx
......
......@@ -19,6 +19,7 @@ Name[pl]=Informacje
Name[pt]=Informação
Name[pt_BR]=Informações
Name[sk]=Informácie
Name[sl]=Informacije
Name[sv]=Information
Name[uk]=Інформація
Name[x-test]=xxInformationxx
......@@ -42,6 +43,7 @@ Comment[pl]=Wersje oprogramowania
Comment[pt]=Versões do 'software'
Comment[pt_BR]=Versões do software
Comment[sk]=Verzie softvéru
Comment[sl]=Verzije programja
Comment[sv]=Programvaruversioner
Comment[uk]=Версії програмного забезпечення
Comment[x-test]=xxSoftware versionsxx
......
......@@ -43,6 +43,7 @@ Comment[nl]=Aanraakschermvriendelijke instellingen van UI voor Plasma Mobile
Comment[nn]=Trykkskjermvennleg innstillingsprogram for Plasma Mobile
Comment[pt]=UI de configuração do Plasma Mobile amigável para ecrãs tácteis
Comment[pt_BR]=Interface de configuração do Plasma Mobile amigável para telas sensíveis ao toque
Comment[sl]=Dotikom prijazen uporabniški vmesnik nastavitev za Plasma Mobile
Comment[sv]=Pekskärmsvänliga inställningar av användargränssnitt för Plasma mobil
Comment[uk]=Інтерфейс параметрів сенсорного доступу для мобільної Плазми
Comment[x-test]=xxTouchscreen friendly settings UI for Plasma Mobilexx
......
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