From ff2dc4a862bfd5e8b25e5737240d8d7c3c34b5e7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 16 Oct 2017 05:07:20 +0200 Subject: [PATCH] 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" --- Modules/about-distro/src/about-distro.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/about-distro/src/about-distro.desktop b/Modules/about-distro/src/about-distro.desktop index 77526af..1e12a04 100644 --- a/Modules/about-distro/src/about-distro.desktop +++ b/Modules/about-distro/src/about-distro.desktop @@ -22,7 +22,7 @@ X-KDE-Keywords[et]=teave,distributsioon,distro,süsteem,kernel,qt,kde X-KDE-Keywords[eu]=informazioa,banaketa,distribuzioa,distro,sistema,muina,kernela,qt,kde X-KDE-Keywords[fi]=tietoja,tietoa,tiedot,info,jakelu,distribuutio,distro,järjestelmä,ydin,käyttöjärjestelmäydin,qt,kde,information,distribution,system,kernel X-KDE-Keywords[fr]=information,distribution,distro,system,kernel,qt,kde -X-KDE-Keywords[gl]=información,distribución,sistema,information,distribution,distro,system,kernel,qt,kde +X-KDE-Keywords[gl]=información,distribución,sistema,information,distribution,distro,system,kernel,qt,kde X-KDE-Keywords[he]=information,distribution,distro,system,kernel,qt,kde,מידע,הפצה,מערכת,ליבה,פלזמה X-KDE-Keywords[hu]=információk,disztribúció,disztró,rendszer,kernel,qt,kde X-KDE-Keywords[it]=informazioni,distribuzione,distro,sistema,kernel,qt,kde -- GitLab