Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 1344176d 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 f418bcec
......@@ -213,7 +213,7 @@ Name[et]=Kaanepildi allalaadimine nurjus
Name[fi]=Kansikuvan lataus epäonnistui
Name[fr]=Impossible de télécharger la jaquette
Name[ga]=Theip ar Íosluchtú Clúdaigh
Name[gl]=Produciuse un erro ao descargar a portada do disco
Name[gl]=Non se puido descargar a portada do disco
Name[hu]=A borító letöltése sikertelen
Name[ia]=Il falleva discargar copertura
Name[is]=Niðurhal umslags mistókst
......@@ -261,7 +261,7 @@ Comment[et]=Soovitud kaanepildi allalaadimine nurjus
Comment[fi]=Pyydetyn kansikuvan lataus epäonnistui
Comment[fr]=Une jaquette demandée n'a pas pu être téléchargée
Comment[ga]=Níorbh fhéidir clúdach iarrtha a íosluchtú
Comment[gl]=Produciuse un erro ao descargar a portada de disco solicitada
Comment[gl]=Non se puido descargar a portada de disco solicitada
Comment[hu]=Nem sikerült letölteni a kért borítót
Comment[ia]=Il falleva discargar un copertura requirite
Comment[is]=Ekki tókst að ná í umslagið sem beðið var um
......
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