From 6cf0b77f1295e9b5686b28e92608eea9b4fa012b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 17 Nov 2019 05:14:42 +0100 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" --- agents/unifiedmailboxagent/unifiedmailboxagent.desktop | 2 ++ .../org.kde.kmail-refresh-settings.desktop | 3 +++ ktnef/src/org.kde.ktnef.desktop | 2 +- src/data/kmail2.notifyrc | 5 ++++- src/data/kmail_config_security.desktop | 2 +- src/data/org.kde.kmail2.desktop | 3 ++- src/kontactplugin/kmail/kcmkmailsummary.desktop | 2 +- src/kontactplugin/kmail/kmailplugin.desktop | 2 +- 8 files changed, 15 insertions(+), 6 deletions(-) diff --git a/agents/unifiedmailboxagent/unifiedmailboxagent.desktop b/agents/unifiedmailboxagent/unifiedmailboxagent.desktop index 131158a9d..42e437546 100644 --- a/agents/unifiedmailboxagent/unifiedmailboxagent.desktop +++ b/agents/unifiedmailboxagent/unifiedmailboxagent.desktop @@ -6,6 +6,7 @@ Name[cs]=Agent sjednocené schránky Name[de]=Agent für einheitliches Postfach Name[en_GB]=Unified Mailbox Agent Name[es]=Agente de bandeja de correo unificada +Name[et]=Ühendpostkasti agent Name[fi]=Yhdistetty postiagentti Name[fr]=Agent de boîte aux lettres unifiée Name[gl]=Axente de caixa de correo unificada @@ -28,6 +29,7 @@ Comment[cs]=Agent sjednocené schránky Comment[de]=Agent für einheitliches Postfach Comment[en_GB]=Unified Mailbox Agent Comment[es]=Agente de bandeja de correo unificada +Comment[et]=Ühendpostkasti agent Comment[fi]=Yhdistetty postiagentti Comment[fr]=Agent de boîte aux lettres unifiée Comment[gl]=Axente de caixa de correo unificada diff --git a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop index 28f4c201e..e92cf79aa 100755 --- a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop +++ b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop @@ -5,6 +5,7 @@ Name[cs]=Obnovení nastavení KMailu Name[de]=Erneuerung der Einstellungen für KMail Name[en_GB]=KMail Refresh Settings Name[es]=Preferencias de refresco de KMail +Name[et]=KMaili värskendamise seadistused Name[fi]=KMailin asetusten virkistys Name[fr]=Rafraîchissement des paramètres de KMail Name[gl]=Configuración de actualización de KMail @@ -27,6 +28,7 @@ GenericName[cs]=Obnovení nastavení KMailu GenericName[de]=Erneuerung der Einstellungen für KMail GenericName[en_GB]=KMail refresh settings GenericName[es]=Preferencias de refresco de KMail +GenericName[et]=KMaili värskendamise seadistused GenericName[fi]=KMailin asetusten virkistys GenericName[fr]=Rafraîchissement des paramètres de KMail GenericName[gl]=Configuración de actualización de KMail @@ -45,6 +47,7 @@ Comment[cs]=Obnovit nastavení KMailu Comment[de]=Erneuerung der Einstellungen für KMail Comment[en_GB]=Refresh KMail settings Comment[es]=Refrescar preferencias de KMail +Comment[et]=KMaili seadistuste värskendamine Comment[fi]=Virkistä KMail-asetukset Comment[fr]=Rafraîchir les paramètres de KMail Comment[gl]=Configuración de actualización de KMail diff --git a/ktnef/src/org.kde.ktnef.desktop b/ktnef/src/org.kde.ktnef.desktop index 7b53a40d3..42676bb7c 100755 --- a/ktnef/src/org.kde.ktnef.desktop +++ b/ktnef/src/org.kde.ktnef.desktop @@ -104,7 +104,7 @@ Comment[af]='n Leeser en data onttrekker vir TNEF lêers Comment[ar]=عارض/مستخرج لملفّات TNEF Comment[bg]=Програма за преглед и извличане на файлове TNEF Comment[bs]=Pregledač/izdvajač iz TNEF datoteka -Comment[ca]=Un visor/extractor pels fitxers TNEF +Comment[ca]=Un visor/extractor per als fitxers TNEF Comment[ca@valencia]=Un visor/extractor pels fitxers TNEF Comment[cy]=Gwelydd/echdynnydd i ffeiliau TNEF Comment[da]=En fremviser/udpakker til TNEF-filer diff --git a/src/data/kmail2.notifyrc b/src/data/kmail2.notifyrc index 48c2f3380..371ca5517 100644 --- a/src/data/kmail2.notifyrc +++ b/src/data/kmail2.notifyrc @@ -351,6 +351,7 @@ Name[cs]=E-mail nelze odeslat Name[de]=Nachrichten kann nicht versendet werden Name[en_GB]=Impossible to send email Name[es]=No es posible enviar correo +Name[et]=Kirja ei ole võimalik saata Name[fi]=Sähköpostin lähettäminen on mahdotonta Name[fr]=Impossible d'envoyer le courrier électronique Name[gl]=Non se pode enviar a mensaxe @@ -371,6 +372,7 @@ Comment[cs]=Během odesílání e-mailu nastaly problémy Comment[de]=Probleme beim Versenden der E-Mail Comment[en_GB]=Problem during send mail Comment[es]=Problema al enviar correo +Comment[et]=Probleem kirja saatmisel Comment[fi]=Ongelma lähetettäessä sähköpostia Comment[fr]=Problème lors de l'envoi du courrier électronique Comment[gl]=Problema ao enviar o correo @@ -471,10 +473,11 @@ Action=Popup [Event/undosend] Name=An email can be undo send -Name[ca]=Un correu electrònic es pot desfer l'enviament +Name[ca]=Es pot desfer l'enviament d'un correu electrònic Name[cs]=Odeslaný e-mail lze vrátit Name[en_GB]=An email can be undo send Name[es]=Se puede deshacer el envío de un correo electrónico +Name[et]=Kirja saatmise tagasivõtmine Name[gl]=O envío dun correo electrónico pode desfacerse Name[nl]=Verzenden van een e-mailbericht kan ongedaan gemaakt worden Name[pl]=Wysłanie wiadomości można wycofać diff --git a/src/data/kmail_config_security.desktop b/src/data/kmail_config_security.desktop index 0c2f36a65..f530f0907 100644 --- a/src/data/kmail_config_security.desktop +++ b/src/data/kmail_config_security.desktop @@ -92,7 +92,7 @@ Comment[be]=Настаўленні бяспекі і прыватнасці Comment[bg]=Настройки на сигурността Comment[br]=Kefluniadur surentez ar buhez prevez Comment[bs]=Postavke sigurnosti i privatnosti -Comment[ca]=Arranjament de seguretat i privadesa +Comment[ca]=Arranjament de la seguretat i privadesa Comment[ca@valencia]=Arranjament de seguretat i privadesa Comment[cs]=Nastavení soukromí a zabezpečení Comment[da]=Sikkerheds- & Privathedsindstillinger diff --git a/src/data/org.kde.kmail2.desktop b/src/data/org.kde.kmail2.desktop index bcf21bb53..ddb2623f7 100755 --- a/src/data/org.kde.kmail2.desktop +++ b/src/data/org.kde.kmail2.desktop @@ -154,7 +154,7 @@ GenericName[zh_CN]=邮件客户端 GenericName[zh_TW]=收發信軟體 Comment=Send, receive and manage your mail with KMail Comment[ar]=أرسل البريد واستلمه وأدره عبر «بريدك» -Comment[ca]=Envia, rep i administra el vostre correu amb el KMail +Comment[ca]=Envia, rep i gestiona el vostre correu amb el KMail Comment[ca@valencia]=Envia, rep i administra el vostre correu amb el KMail Comment[da]=Send, modtag og håndtér din e-mail med KMail Comment[de]=Senden, empfangen und verwalten Ihrer E-Mails mit KMail @@ -204,6 +204,7 @@ Name[cs]=Nová zpráva... Name[de]=Neue Nachricht ... Name[en_GB]=New Message... Name[es]=Nuevo mensaje... +Name[et]=Uus kiri ... Name[fi]=Uusi viesti… Name[fr]=Nouveau message... Name[gl]=Nova mensaxe… diff --git a/src/kontactplugin/kmail/kcmkmailsummary.desktop b/src/kontactplugin/kmail/kcmkmailsummary.desktop index ed1702627..287be1085 100644 --- a/src/kontactplugin/kmail/kcmkmailsummary.desktop +++ b/src/kontactplugin/kmail/kcmkmailsummary.desktop @@ -71,7 +71,7 @@ Comment[af]=Pos opsomming opstelling Comment[ar]=إعداد ملخّص البريد Comment[bg]=Настройки на обобщението на писмата Comment[bs]=Postavke kratkog sadržaja elektronske pošte -Comment[ca]=Configuració del resum pel correu +Comment[ca]=Configuració del resum per al correu Comment[ca@valencia]=Configuració del resum pel correu Comment[cs]=Nastavení souhrnu pošty Comment[da]=Opsætning af postoversigt diff --git a/src/kontactplugin/kmail/kmailplugin.desktop b/src/kontactplugin/kmail/kmailplugin.desktop index 59563566c..987a65a40 100644 --- a/src/kontactplugin/kmail/kmailplugin.desktop +++ b/src/kontactplugin/kmail/kmailplugin.desktop @@ -23,7 +23,7 @@ Comment[be]=Утулка Kontact KMail Comment[bg]=Приставка връзка между пощата и адресника Comment[br]=Lugent Kontact KMail Comment[bs]=Kontakt KMail Dodatak -Comment[ca]=Connector del KMail pel Kontact +Comment[ca]=Connector del KMail per al Kontact Comment[ca@valencia]=Connector del KMail pel Kontact Comment[cs]=Modul KMailu pro aplikaci Kontact Comment[cy]=Ategyn KMail Kontact