Commit 258dd773 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 aeab696c
Pipeline #23009 passed with stage
in 17 minutes and 2 seconds
......@@ -7,6 +7,7 @@ Name[en_GB]=Information
Name[es]=Información
Name[et]=Teave
Name[eu]=Informazioa
Name[fi]=Tiedot
Name[fr]=Informations
Name[gl]=Información
Name[ia]=Information
......@@ -33,6 +34,7 @@ Comment[en_GB]=Software Versions
Comment[es]=Versiones de software
Comment[et]=Tarkvaraversioonid
Comment[eu]=Softwarearen bertsioak
Comment[fi]=Ohjelmaversiot
Comment[fr]=Versions des logiciels
Comment[gl]=Versións de software
Comment[it]=Versioni software
......@@ -63,6 +65,7 @@ X-KDE-Keywords[en_GB]=info, distro, system
X-KDE-Keywords[es]=información, distro, sistema
X-KDE-Keywords[et]=teave, info, süsteem
X-KDE-Keywords[eu]=informazioa, banaketa, sistema
X-KDE-Keywords[fi]=tietoa, jakelu, järjestelmä
X-KDE-Keywords[fr]=info, distrib, système
X-KDE-Keywords[gl]=info, información, distro, distribución, sistema
X-KDE-Keywords[it]=informazioni, distribuzione, sistema
......
......@@ -7,6 +7,7 @@ Name[en_GB]=Information
Name[es]=Información
Name[et]=Teave
Name[eu]=Informazioa
Name[fi]=Tiedot
Name[fr]=Informations
Name[gl]=Información
Name[ia]=Information
......@@ -33,6 +34,7 @@ Comment[en_GB]=Software versions
Comment[es]=Versiones de software
Comment[et]=Tarkvaraversioonid
Comment[eu]=Softwarearen bertsioak
Comment[fi]=Ohjelmaversiot
Comment[fr]=Versions des logiciels
Comment[gl]=Versións de software
Comment[it]=Versioni software
......
......@@ -36,6 +36,7 @@ Comment[en_GB]=Touchscreen friendly settings UI for Plasma Mobile
Comment[es]=Interfaz de preferencias amigables de la pantalla táctil para Plasma Mobile
Comment[et]=Plasma Mobile puutesõbraliku seadistamise kasutajaliides
Comment[eu]=Ukipen-pantailekiko lagunkoiak diren erabiltzaile-interfazeen ezarpenak Plasma Mugikorrerako
Comment[fi]=Plasma Mobilen kosketusnäyttöystävällinen asetuskäyttöliittymä
Comment[fr]=Interface de configuration conviviale avec écran tactile pour Plasma Mobile
Comment[it]=Interfaccia per le impostazioni adatta a schermi tattili per Plasma Mobile
Comment[ko]=Plasma 모바일용 터치 스크린 친화적 설정 UI
......
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