From cc0669a7454306728a838258bd36c02387246c2d Mon Sep 17 00:00:00 2001
From: Michael Vogel Error fetching token. Please try again. Fout tijdens token fetching. Probeer het nogmaals. Error fetching user profile. Please clear the configuration and try "
+"again. Fout tijdens het ophalen van gebruikersprofiel. Leeg de configuratie en probeer het opnieuw. You have two ways to connect to App.net. Er zijn twee manieren om met App.net te verbinden. First way: Register an application at https://account.app.net/developer/apps/"
+" and enter Client ID and Client Secret. "
+msgstr ""
+
+#: appnet.php:167
+#, php-format
+msgid "Use '%s' as Redirect URI "
+msgstr ""
+
+#: appnet.php:169
+msgid "Client ID"
+msgstr ""
+
+#: appnet.php:173
+msgid "Client Secret"
+msgstr ""
+
+#: appnet.php:177
+msgid ""
+" Second way: fetch a token at http://dev-lite.jonathonduerig.com/. "
+msgstr ""
+
+#: appnet.php:178
+msgid ""
+"Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', "
+"'Messages'. Error fetching token. Please try again. Fout tijdens token fetching. Probeer het nogmaals. Error fetching user profile. Please clear the configuration and try again. Fout tijdens het ophalen van gebruikersprofiel. Leeg de configuratie en probeer het opnieuw. You have two ways to connect to App.net. Er zijn twee manieren om met App.net te verbinden. First way: Register an application at https://account.app.net/developer/apps/ and enter Client ID and Client Secret. "] = "";
+$a->strings["Use '%s' as Redirect URI "] = "";
+$a->strings["Client ID"] = "";
+$a->strings["Client Secret"] = "";
+$a->strings[" Second way: fetch a token at http://dev-lite.jonathonduerig.com/. "] = "";
+$a->strings["Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', 'Messages'. Error fetching token. Please try again. Error fetching user profile. Please clear the configuration and try again. You have two ways to connect to App.net. Você possui duas formas de conectar ao App.net First way: Register an application at https://account.app.net/developer/apps/ and enter Client ID and Client Secret. "] = " 1º Método: Registre uma aplicação em https://account.app.net/developer/apps/ e entre o Client ID e Client Secret";
@@ -24,6 +24,6 @@ $a->strings["Client Secret"] = "Client Secret";
$a->strings[" Second way: fetch a token at http://dev-lite.jonathonduerig.com/. "] = " 2º Método: obtenha um token em http://dev-lite.jonathonduerig.com/. ";
$a->strings["Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', 'Messages'.
\n"),$text)));
+
+ $sql_extra = ((intval($_REQUEST['test'])) ? sprintf(" AND `email` = '%s' ", get_config('system','admin_email')) : '');
+
+
+ $recips = q("SELECT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra");
+
+ if(! $recips) {
+ notice( t('No recipients found.') . EOL);
+ return;
+ }
+
+ foreach($recips as $recip) {
+
+
+ Emailer::send(array(
+ 'fromName' => $sender_name,
+ 'fromEmail' => $sender_email,
+ 'replyTo' => $sender_email,
+ 'toEmail' => $recip['email'],
+ 'messageSubject' => $subject,
+ 'htmlVersion' => $htmlversion,
+ 'textVersion' => $textversion
+ ));
+ }
+
+ notice( t('Emails sent'));
+ goaway('admin');
+}
+
+function notifyall_content(&$a) {
+ if(! is_site_admin())
+ return;
+
+ $title = t('Send email to all members of this Friendica instance.');
+
+ $o = replace_macros(get_markup_template('notifyall_form.tpl','addon/notifyall/'),array(
+ '$title' => $title,
+ '$text' => htmlspecialchars($_REQUEST['text']),
+ '$subject' => array('subject',t('Message subject'),$_REQUEST['subject'],''),
+ '$test' => array('test',t('Test mode (only send to administrator)'), 0,''),
+ '$submit' => t('Submit')
+ ));
+
+ return $o;
+
+}
diff --git a/notifyall/templates/notifyall_form.tpl b/notifyall/templates/notifyall_form.tpl
new file mode 100644
index 000000000..05c4101c3
--- /dev/null
+++ b/notifyall/templates/notifyall_form.tpl
@@ -0,0 +1,12 @@
+
+{{$title}}
+
+
From 46ef0be93127ed04430ffa051592b9ca0ed12697 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff
The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr "O complemento Libravatar também está instalado. Desabilite o Libravatar ou este complemento, o Gravatar.
Se não encontrar nada, o Libravatar remeterá ao Gravatar."
+
+#: gravatar.php:95
+msgid "Submit"
+msgstr "Enviar"
+
+#: gravatar.php:96
+msgid "Default avatar image"
+msgstr "Avatar padrão"
+
+#: gravatar.php:96
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr "Selecione a imagem de avatar padrão que será usada se nenhuma for encontrada no Gravatar. Veja README."
+
+#: gravatar.php:97
+msgid "Rating of images"
+msgstr "Classificação de imagens"
+
+#: gravatar.php:97
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr "Selecione a classificação apropriada para os avatares que serão mostrados no seu site. Veja README."
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "As configurações do Gravatar foram atualizadas."
diff --git a/gravatar/lang/pt-br/strings.php b/gravatar/lang/pt-br/strings.php
index cf64e6fbe..c7b3754fd 100644
--- a/gravatar/lang/pt-br/strings.php
+++ b/gravatar/lang/pt-br/strings.php
@@ -1,15 +1,20 @@
-strings["generic profile image"] = "Imagem genérica de perfil";
-$a->strings["random geometric pattern"] = "Padrão geométrico randômico";
-$a->strings["monster face"] = "cara de monstro";
-$a->strings["computer generated face"] = "face gerada por computador";
-$a->strings["retro arcade style face"] = "estilo de face arcade retrô";
-$a->strings["Information"] = "";
-$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
-$a->strings["Submit"] = "Enviar";
-$a->strings["Default avatar image"] = "Imagem padrão do Avatar ";
-$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Selecione a imagem padrão do Avatar se nenhuma for encontrada no Gravatar. Veja o Leiame";
-$a->strings["Rating of images"] = "Avaliação de imagens";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
-$a->strings["Gravatar settings updated."] = "Configurações do Avatar atualizadas";
+ 1);;
+}}
+;
+$a->strings["generic profile image"] = "imagem de perfil genérica";
+$a->strings["random geometric pattern"] = "estampa geométrica aleatória";
+$a->strings["monster face"] = "careta";
+$a->strings["computer generated face"] = "rosto gerado por computador";
+$a->strings["retro arcade style face"] = "rosto de personagem de fliperama";
+$a->strings["Information"] = "Informação";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "O complemento Libravatar também está instalado. Desabilite o Libravatar ou este complemento, o Gravatar.
Se não encontrar nada, o Libravatar remeterá ao Gravatar.";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Default avatar image"] = "Avatar padrão";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Selecione a imagem de avatar padrão que será usada se nenhuma for encontrada no Gravatar. Veja README.";
+$a->strings["Rating of images"] = "Classificação de imagens";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Selecione a classificação apropriada para os avatares que serão mostrados no seu site. Veja README.";
+$a->strings["Gravatar settings updated."] = "As configurações do Gravatar foram atualizadas.";
diff --git a/infiniteimprobabilitydrive/lang/pt-br/messages.po b/infiniteimprobabilitydrive/lang/pt-br/messages.po
new file mode 100644
index 000000000..1055ecc52
--- /dev/null
+++ b/infiniteimprobabilitydrive/lang/pt-br/messages.po
@@ -0,0 +1,24 @@
+# ADDON infiniteimprobabilitydrive
+# Copyright (C)
+# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
+#
+#
+# Translators:
+# Beatriz Vital
"; - $o .= "\nDatabase:\n"; + $o .= "\nDatabase Read:\n"; foreach ($a->callstack["database"] AS $func => $time) { $time = round($time, 3); if ($time > 0) $o .= $func.": ".$time."\n"; } + $o .= "\nDatabase Write:\n"; + foreach ($a->callstack["database_write"] AS $func => $time) { + $time = round($time, 3); + if ($time > 0) + $o .= $func.": ".$time."\n"; + } $o .= "\nNetwork:\n"; foreach ($a->callstack["network"] AS $func => $time) { From b59f2fab4958fed93a3e875058b0e0400ef64035 Mon Sep 17 00:00:00 2001 From: Tobias DiekershoffDate: Tue, 6 Sep 2016 13:37:26 +0200 Subject: [PATCH 14/25] if a sender_email for the system is set, use this, else use noreply@... --- notifyall/notifyall.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index e33c91812..cfd2c928e 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -43,7 +43,10 @@ function notifyall_post(&$a) { else $sender_name = sprintf(t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename); - $sender_email = 'sys@' . $a->get_hostname(); + if (! x($a->config['sender_email'])) + $sender_email = 'noreply@' . $a->get_hostname(); + else + $sender_email = $a->config['sender_email']; $subject = $_REQUEST['subject']; From 08546e30f997360e08e0c7d8730842eede6cbf48 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 6 Sep 2016 15:00:07 +0200 Subject: [PATCH 15/25] send mail to admin(s) in test more --- notifyall/notifyall.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index cfd2c928e..2f47838f7 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -42,20 +42,26 @@ function notifyall_post(&$a) { $sender_name = sprintf(t('%s Administrator'), $sitename); else $sender_name = sprintf(t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename); + + if (! x($a->config['sender_email'])) + $sender_email = 'noreply@' . $a->get_hostname(); + else + $sender_email = $a->config['sender_email']; - if (! x($a->config['sender_email'])) - $sender_email = 'noreply@' . $a->get_hostname(); - else - $sender_email = $a->config['sender_email']; $subject = $_REQUEST['subject']; $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"),array( "", "\n"), $text))),ENT_QUOTES,'UTF-8')); $htmlversion = bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","
\n"),$text))); - - $sql_extra = ((intval($_REQUEST['test'])) ? sprintf(" AND `email` = '%s' ", get_config('system','admin_email')) : ''); - + + // if this is a test, send it only to the admin(s) + // admin_email might be a comma separated list, but we need "a@b','c@d','e@f + if ( intval($_REQUEST['test'])) { + $email = $a->config['admin_email']; + $email = "'" . str_replace(array(" ",","), array("","','"), $email) . "'"; + } + $sql_extra = ((intval($_REQUEST['test'])) ? sprintf(" AND `email` in ( %s )", $email) : ''); $recips = q("SELECT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra"); From 9f845beffd0e3d54d3c0846d879c99f4a271b791 Mon Sep 17 00:00:00 2001 From: Tobias DiekershoffDate: Fri, 9 Sep 2016 11:01:37 +0200 Subject: [PATCH 16/25] when more then one users have the same email, only send the notification once --- notifyall/notifyall.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index 2f47838f7..3f2cdc890 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -63,7 +63,7 @@ function notifyall_post(&$a) { } $sql_extra = ((intval($_REQUEST['test'])) ? sprintf(" AND `email` in ( %s )", $email) : ''); - $recips = q("SELECT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra"); + $recips = q("SELECT DISTINCT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra"); if(! $recips) { notice( t('No recipients found.') . EOL); From 9c3ea9d9f575c2e6642953d88f7d367f8b42b7f8 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 9 Sep 2016 12:01:59 +0200 Subject: [PATCH 17/25] only show address information when set --- forumdirectory/templates/forumdirectory_item.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forumdirectory/templates/forumdirectory_item.tpl b/forumdirectory/templates/forumdirectory_item.tpl index ee38c28a0..5b6a946a1 100644 --- a/forumdirectory/templates/forumdirectory_item.tpl +++ b/forumdirectory/templates/forumdirectory_item.tpl @@ -18,9 +18,9 @@ {{if $profile.address}} From 184e9b56cef0509ea7263c9a46b9352e8abf3aff Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff{{$profile.address}}{{/if}} - {{$profile.locality}}{{if $profile.locality}}, {{/if}} - {{$profile.region}} - {{$profile.postal-code}} + {{if $profile.locality}}{{$profile.locality}}, {{/if}} + {{if $profile.region}}{{$profile.region}}{{/if}} + {{if $profile.postal-code}}{{$profile.postal-code}}{{/if}} {{if $profile.country-name}}{{$profile.country-name}}{{/if}}Date: Fri, 9 Sep 2016 17:54:48 +0200 Subject: [PATCH 18/25] smarty3 variables with a dash need other notation --- forumdirectory/templates/forumdirectory_item.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forumdirectory/templates/forumdirectory_item.tpl b/forumdirectory/templates/forumdirectory_item.tpl index 5b6a946a1..61b165d71 100644 --- a/forumdirectory/templates/forumdirectory_item.tpl +++ b/forumdirectory/templates/forumdirectory_item.tpl @@ -20,9 +20,9 @@ {{if $profile.locality}}{{$profile.locality}}, {{/if}} {{if $profile.region}}{{$profile.region}}{{/if}} - {{if $profile.postal-code}}{{$profile.postal-code}}{{/if}} + {{if $profile['postal-code']}}{{$profile['postal-code']}}{{/if}} - {{if $profile.country-name}}{{$profile.country-name}}{{/if}} + {{if $profile['country-name']}}{{$profile['country-name']}}{{/if}} {{/if}} From 545e10bef52c5810e641fbce7f56ac54031f0289 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 13 Sep 2016 15:45:18 +0200 Subject: [PATCH 19/25] FR translation of the openstreetmap addon, THX Damien Goutte-Gattat --- openstreetmap/lang/fr/messages.po | 11 ++++++----- openstreetmap/lang/fr/strings.php | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/openstreetmap/lang/fr/messages.po b/openstreetmap/lang/fr/messages.po index bbad3039d..24781497a 100644 --- a/openstreetmap/lang/fr/messages.po +++ b/openstreetmap/lang/fr/messages.po @@ -4,6 +4,7 @@ # # # Translators: +# Damien Goutte-Gattat , 2016 # Nicola Spanti , 2015 # StefOfficiel , 2015 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-02-27 05:01-0500\n" -"PO-Revision-Date: 2015-08-30 17:24+0000\n" -"Last-Translator: Nicola Spanti \n" +"PO-Revision-Date: 2016-09-12 15:41+0000\n" +"Last-Translator: Damien Goutte-Gattat \n" "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,13 +27,13 @@ msgstr "Envoyer" #: openstreetmap.php:95 msgid "Tile Server URL" -msgstr "" +msgstr "URL du serveur de tuiles" #: openstreetmap.php:95 msgid "" "A list of public tile servers" -msgstr "" +msgstr "Une liste de serveurs de tuiles publics" #: openstreetmap.php:96 msgid "Default zoom" @@ -40,7 +41,7 @@ msgstr "Zoom par défaut" #: openstreetmap.php:96 msgid "The default zoom level. (1:world, 18:highest)" -msgstr "" +msgstr "Le niveau de zoom affiché par défaut. (1: monde entier, 18: détail maximum)" #: openstreetmap.php:104 msgid "Settings updated." diff --git a/openstreetmap/lang/fr/strings.php b/openstreetmap/lang/fr/strings.php index 24902b3a2..cdd98efc3 100644 --- a/openstreetmap/lang/fr/strings.php +++ b/openstreetmap/lang/fr/strings.php @@ -6,8 +6,8 @@ function string_plural_select_fr($n){ }} ; $a->strings["Submit"] = "Envoyer"; -$a->strings["Tile Server URL"] = ""; -$a->strings["A list of public tile servers"] = ""; +$a->strings["Tile Server URL"] = "URL du serveur de tuiles"; +$a->strings["A list of public tile servers"] = "Une liste de serveurs de tuiles publics"; $a->strings["Default zoom"] = "Zoom par défaut"; -$a->strings["The default zoom level. (1:world, 18:highest)"] = ""; +$a->strings["The default zoom level. (1:world, 18:highest)"] = "Le niveau de zoom affiché par défaut. (1: monde entier, 18: détail maximum)"; $a->strings["Settings updated."] = "Paramètres mis à jour."; From afc875627e527cf26de26cd3c4812afba86924ca Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 21 Sep 2016 11:52:03 +0200 Subject: [PATCH 20/25] PT BR translation for curweather addon --- curweather/lang/pt-br/messages.po | 9 +++++---- curweather/lang/pt-br/strings.php | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/curweather/lang/pt-br/messages.po b/curweather/lang/pt-br/messages.po index 16f9e2b11..810875d87 100644 --- a/curweather/lang/pt-br/messages.po +++ b/curweather/lang/pt-br/messages.po @@ -4,14 +4,15 @@ # # # Translators: +# André Alves , 2016 # Beatriz Vital , 2016 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-12 08:10+0100\n" -"PO-Revision-Date: 2016-08-16 12:28+0000\n" -"Last-Translator: Beatriz Vital \n" +"PO-Revision-Date: 2016-09-18 20:49+0000\n" +"Last-Translator: André Alves \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/Friendica/friendica/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "Houve um erro na obtenção de dados do clima\\nErro:" #: curweather.php:111 curweather.php:172 msgid "Current Weather" -msgstr "" +msgstr "Clima atual" #: curweather.php:118 msgid "Relative Humidity" @@ -61,7 +62,7 @@ msgstr "em OpenWeatherMap" #: curweather.php:146 msgid "Current Weather settings updated." -msgstr "" +msgstr "Atualização das Configurações de clima." #: curweather.php:161 msgid "No APPID found, please contact your admin to optain one." diff --git a/curweather/lang/pt-br/strings.php b/curweather/lang/pt-br/strings.php index d25df2a94..f50bc4a04 100644 --- a/curweather/lang/pt-br/strings.php +++ b/curweather/lang/pt-br/strings.php @@ -6,7 +6,7 @@ function string_plural_select_pt_br($n){ }} ; $a->strings["Error fetching weather data.\\nError was: "] = "Houve um erro na obtenção de dados do clima\\nErro:"; -$a->strings["Current Weather"] = ""; +$a->strings["Current Weather"] = "Clima atual"; $a->strings["Relative Humidity"] = "Umidade relativa"; $a->strings["Pressure"] = "Pressão"; $a->strings["Wind"] = "Vento"; @@ -15,7 +15,7 @@ $a->strings["Data by"] = "Dados de"; $a->strings["Show on map"] = "Mostrar no mapa"; $a->strings["There was a problem accessing the weather data. But have a look"] = "Houve um problema no acesso aos dados do clima. Mas dê uma olhada"; $a->strings["at OpenWeatherMap"] = "em OpenWeatherMap"; -$a->strings["Current Weather settings updated."] = ""; +$a->strings["Current Weather settings updated."] = "Atualização das Configurações de clima."; $a->strings["No APPID found, please contact your admin to optain one."] = "Não foi encontrado nenhum AppID; fale com seu administrador para receber um."; $a->strings["Save Settings"] = "Salvar Configurações"; $a->strings["Settings"] = "Configurações"; From 17f29ae08c46067a40716ce5433ac80fbddd3e34 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 24 Sep 2016 08:03:51 +0200 Subject: [PATCH 21/25] correction of typos --- curweather/curweather.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/curweather/curweather.php b/curweather/curweather.php index e416ba67f..71d95e464 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -158,7 +158,7 @@ function curweather_plugin_settings(&$a,&$s) { $curweather_units = get_pconfig(local_user(), 'curweather', 'curweather_units'); $appid = get_config('curweather','appid'); if ($appid=="") { - $noappidtext = t('No APPID found, please contact your admin to optain one.'); + $noappidtext = t('No APPID found, please contact your admin to obtain one.'); } else { $noappidtext = ''; } @@ -173,7 +173,7 @@ function curweather_plugin_settings(&$a,&$s) { '$noappidtext' => $noappidtext, '$info' => t('Enter either the name of your location or the zip code.'), '$curweather_loc' => array( 'curweather_loc', t('Your Location'), $curweather_loc, t('Identifier of your location (name or zip code), e.g. Berlin,DE or 14476,DE.') ), - '$curweather_units' => array( 'curweather_units', t('Units'), $curweather_units, t('select if the temperatur should be displayed in °C or °F'), array('metric'=>'°C', 'imperial'=>'°F')), + '$curweather_units' => array( 'curweather_units', t('Units'), $curweather_units, t('select if the temperature should be displayed in °C or °F'), array('metric'=>'°C', 'imperial'=>'°F')), '$enabled' => array( 'curweather_enable', t('Show weather data'), $enable, '') )); return; From 9030e4c1a6a067ec7ea01cccd9264b86db22b6b7 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 24 Sep 2016 08:42:19 +0200 Subject: [PATCH 22/25] FR update to the translation THX Hypolite Petovan --- appnet/lang/fr/messages.po | 107 ++++++++++++++++++++++++++---- appnet/lang/fr/strings.php | 25 +++++-- blackout/lang/fr/messages.po | 9 +-- blackout/lang/fr/strings.php | 2 +- buffer/lang/fr/messages.po | 29 ++++---- buffer/lang/fr/strings.php | 22 +++--- communityhome/lang/fr/messages.po | 75 +++++++++++++++++++++ communityhome/lang/fr/strings.php | 34 ++++++---- curweather/lang/fr/messages.po | 87 ++++++++++++------------ curweather/lang/fr/strings.php | 24 +++---- 10 files changed, 297 insertions(+), 117 deletions(-) create mode 100644 communityhome/lang/fr/messages.po diff --git a/appnet/lang/fr/messages.po b/appnet/lang/fr/messages.po index 73e0dc2f0..6f5f2997d 100644 --- a/appnet/lang/fr/messages.po +++ b/appnet/lang/fr/messages.po @@ -1,17 +1,18 @@ -# ADDON appnetpost +# ADDON appnet # Copyright (C) -# This file is distributed under the same license as the Friendica appnetpost addon package. +# This file is distributed under the same license as the Friendica appnet addon package. # # # Translators: -# Nicola Spanti , 2015 +# Hypolite Petovan , 2016 +# Jak , 2014 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-22 11:47+0200\n" -"PO-Revision-Date: 2015-08-30 17:06+0000\n" -"Last-Translator: Nicola Spanti \n" +"PO-Revision-Date: 2016-09-24 02:12+0000\n" +"Last-Translator: Hypolite Petovan \n" "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,22 +20,100 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: appnetpost.php:37 +#: appnet.php:39 +msgid "Permission denied." +msgstr "Autorisation refusée" + +#: appnet.php:73 +msgid "You are now authenticated to app.net. " +msgstr "Vous êtes maintenant authentifié sur app.net" + +#: appnet.php:77 +msgid " Error fetching token. Please try again.
" +msgstr "Impossible d'obtenir le jeton, merci de réessayer.
" + +#: appnet.php:80 +msgid "return to the connector page" +msgstr "revenir à la page du connecteur" + +#: appnet.php:94 msgid "Post to app.net" -msgstr "" +msgstr "Publier sur app.net" -#: appnetpost.php:59 appnetpost.php:63 +#: appnet.php:125 appnet.php:129 msgid "App.net Export" -msgstr "" +msgstr "Export App.net" -#: appnetpost.php:67 +#: appnet.php:142 +msgid "Currently connected to: " +msgstr "Actuellement connecté à :" + +#: appnet.php:144 msgid "Enable App.net Post Plugin" -msgstr "" +msgstr "Activer le plugin de publication app.net" -#: appnetpost.php:72 +#: appnet.php:149 msgid "Post to App.net by default" -msgstr "" +msgstr "Publier sur App.net par défaut" -#: appnetpost.php:78 +#: appnet.php:153 +msgid "Import the remote timeline" +msgstr "Importer la timeline distante" + +#: appnet.php:159 +msgid "" +"Error fetching user profile. Please clear the configuration and try " +"again.
" +msgstr "Impossible d'obtenir le profil utilisateur. Merci de réinitialiser la configuration et de réessayer.
" + +#: appnet.php:164 +msgid "You have two ways to connect to App.net.
" +msgstr "Vous avez deux possibilités pour vous connecter à App.net.
" + +#: appnet.php:166 +msgid "" +"First way: Register an application at https://account.app.net/developer/apps/" +" and enter Client ID and Client Secret. " +msgstr "
Première méthode: Enregistrer une application sur App.net [en] et entrez l'ID Client et le Secret Client. " + +#: appnet.php:167 +#, php-format +msgid "Use '%s' as Redirect URI
" +msgstr "Utilisez '%s' pour l'URI de Redirection" + +#: appnet.php:169 +msgid "Client ID" +msgstr "ID Client" + +#: appnet.php:173 +msgid "Client Secret" +msgstr "Secret Client" + +#: appnet.php:177 +msgid "" +"
Second way: fetch a token at http://dev-lite.jonathonduerig.com/. " +msgstr "
Deuxième méthode: obtenez un jeton ur http://dev-lite.jonathonduerig.com/ [en]. " + +#: appnet.php:178 +msgid "" +"Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', " +"'Messages'.
" +msgstr "Cochez les \"scopes\" suivant: \"Basic\", \"Stream\", \"Write Post\", \"Public Messages\", \"Messages\"." + +#: appnet.php:180 +msgid "Token" +msgstr "Jeton" + +#: appnet.php:192 +msgid "Sign in using App.net" +msgstr "Se connecter avec App.net" + +#: appnet.php:197 +msgid "Clear OAuth configuration" +msgstr "Effacer la configuration OAuth" + +#: appnet.php:204 msgid "Save Settings" msgstr "Sauvegarder les paramètres" diff --git a/appnet/lang/fr/strings.php b/appnet/lang/fr/strings.php index b714f03d4..ef9fc9e24 100644 --- a/appnet/lang/fr/strings.php +++ b/appnet/lang/fr/strings.php @@ -5,8 +5,25 @@ function string_plural_select_fr($n){ return ($n > 1);; }} ; -$a->strings["Post to app.net"] = ""; -$a->strings["App.net Export"] = ""; -$a->strings["Enable App.net Post Plugin"] = ""; -$a->strings["Post to App.net by default"] = ""; +$a->strings["Permission denied."] = "Autorisation refusée"; +$a->strings["You are now authenticated to app.net. "] = "Vous êtes maintenant authentifié sur app.net"; +$a->strings["Error fetching token. Please try again.
"] = "Impossible d'obtenir le jeton, merci de réessayer.
"; +$a->strings["return to the connector page"] = "revenir à la page du connecteur"; +$a->strings["Post to app.net"] = "Publier sur app.net"; +$a->strings["App.net Export"] = "Export App.net"; +$a->strings["Currently connected to: "] = "Actuellement connecté à :"; +$a->strings["Enable App.net Post Plugin"] = "Activer le plugin de publication app.net"; +$a->strings["Post to App.net by default"] = "Publier sur App.net par défaut"; +$a->strings["Import the remote timeline"] = "Importer la timeline distante"; +$a->strings["Error fetching user profile. Please clear the configuration and try again.
"] = "Impossible d'obtenir le profil utilisateur. Merci de réinitialiser la configuration et de réessayer.
"; +$a->strings["You have two ways to connect to App.net.
"] = "Vous avez deux possibilités pour vous connecter à App.net.
"; +$a->strings["First way: Register an application at https://account.app.net/developer/apps/ and enter Client ID and Client Secret. "] = "
Première méthode: Enregistrer une application sur App.net [en] et entrez l'ID Client et le Secret Client. "; +$a->strings["Use '%s' as Redirect URI
"] = "Utilisez '%s' pour l'URI de Redirection"; +$a->strings["Client ID"] = "ID Client"; +$a->strings["Client Secret"] = "Secret Client"; +$a->strings["
Second way: fetch a token at http://dev-lite.jonathonduerig.com/. "] = "
Deuxième méthode: obtenez un jeton ur http://dev-lite.jonathonduerig.com/ [en]. "; +$a->strings["Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', 'Messages'.
"] = "Cochez les \"scopes\" suivant: \"Basic\", \"Stream\", \"Write Post\", \"Public Messages\", \"Messages\"."; +$a->strings["Token"] = "Jeton"; +$a->strings["Sign in using App.net"] = "Se connecter avec App.net"; +$a->strings["Clear OAuth configuration"] = "Effacer la configuration OAuth"; $a->strings["Save Settings"] = "Sauvegarder les paramètres"; diff --git a/blackout/lang/fr/messages.po b/blackout/lang/fr/messages.po index 0a1aa499b..b52d3809d 100644 --- a/blackout/lang/fr/messages.po +++ b/blackout/lang/fr/messages.po @@ -5,14 +5,15 @@ # # Translators: # Damien Goutte-Gattat, 2015 +# Hypolite Petovan , 2016 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-22 13:18+0200\n" -"PO-Revision-Date: 2015-02-06 00:24+0000\n" -"Last-Translator: Damien Goutte-Gattat \n" -"Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n" +"PO-Revision-Date: 2016-09-24 02:13+0000\n" +"Last-Translator: Hypolite Petovan \n" +"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,7 +40,7 @@ msgstr "Début du blackout" msgid "" "format is YYYY year, MM month, DD day, " "hh hour and mm minute" -msgstr "" +msgstr "Le format est YYYY année, MM mois, DD jour, hh heure and mm minute" #: blackout.php:102 msgid "End of the Blackout" diff --git a/blackout/lang/fr/strings.php b/blackout/lang/fr/strings.php index 705a6a777..ce1840381 100644 --- a/blackout/lang/fr/strings.php +++ b/blackout/lang/fr/strings.php @@ -9,6 +9,6 @@ $a->strings["Save Settings"] = "Sauvegarder les paramètres"; $a->strings["Redirect URL"] = "Adresse de redirection"; $a->strings["all your visitors from the web will be redirected to this URL"] = "Tous vos visiteurs venant du web seront redirigés vers cette URL."; $a->strings["Begin of the Blackout"] = "Début du blackout"; -$a->strings["format is YYYY year, MM month, DD day, hh hour and mm minute"] = ""; +$a->strings["format is YYYY year, MM month, DD day, hh hour and mm minute"] = "Le format est YYYY année, MM mois, DD jour, hh heure and mm minute"; $a->strings["End of the Blackout"] = "Fin du blackout"; $a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "La date de fin est antérieure à la date de début. Veuillez corriger cela."; diff --git a/buffer/lang/fr/messages.po b/buffer/lang/fr/messages.po index de1acc4e0..bc1593411 100644 --- a/buffer/lang/fr/messages.po +++ b/buffer/lang/fr/messages.po @@ -4,6 +4,7 @@ # # # Translators: +# Hypolite Petovan , 2016 # Nicola Spanti , 2015 # StefOfficiel , 2015 msgid "" @@ -11,9 +12,9 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-22 13:18+0200\n" -"PO-Revision-Date: 2015-07-27 18:12+0000\n" -"Last-Translator: Nicola Spanti \n" -"Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n" +"PO-Revision-Date: 2016-09-24 03:03+0000\n" +"Last-Translator: Hypolite Petovan \n" +"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -34,44 +35,44 @@ msgstr "Identifiant client" #: buffer.php:60 msgid "Client Secret" -msgstr "" +msgstr "Secret Client" #: buffer.php:67 msgid "Error when registering buffer connection:" -msgstr "" +msgstr "Une erreur est survenue lors de la connexion à Buffer :" #: buffer.php:86 msgid "You are now authenticated to buffer. " -msgstr "" +msgstr "Vous êtes maintenant authentifié sur Buffer." #: buffer.php:87 msgid "return to the connector page" -msgstr "" +msgstr "revenir à la page du connecteur" #: buffer.php:103 msgid "Post to Buffer" -msgstr "" +msgstr "Publier sur Buffer" #: buffer.php:128 buffer.php:132 msgid "Buffer Export" -msgstr "" +msgstr "Export Buffer" #: buffer.php:142 msgid "Authenticate your Buffer connection" -msgstr "" +msgstr "Authentifier votre connexion à Buffer" #: buffer.php:146 msgid "Enable Buffer Post Plugin" -msgstr "" +msgstr "Activer le connecteur Buffer" #: buffer.php:151 msgid "Post to Buffer by default" -msgstr "" +msgstr "Publier sur Buffer par défaut" #: buffer.php:156 msgid "Check to delete this preset" -msgstr "" +msgstr "Cocher pour supprimer ce préréglage" #: buffer.php:165 msgid "Posts are going to all accounts that are enabled by default:" -msgstr "" +msgstr "Les posts sont envoyés à tous les comptes activés par défault:" diff --git a/buffer/lang/fr/strings.php b/buffer/lang/fr/strings.php index 7d7d5911d..07460f472 100644 --- a/buffer/lang/fr/strings.php +++ b/buffer/lang/fr/strings.php @@ -8,14 +8,14 @@ function string_plural_select_fr($n){ $a->strings["Permission denied."] = "Permission refusée."; $a->strings["Save Settings"] = "Enregistrer les Paramètres"; $a->strings["Client ID"] = "Identifiant client"; -$a->strings["Client Secret"] = ""; -$a->strings["Error when registering buffer connection:"] = ""; -$a->strings["You are now authenticated to buffer. "] = ""; -$a->strings["return to the connector page"] = ""; -$a->strings["Post to Buffer"] = ""; -$a->strings["Buffer Export"] = ""; -$a->strings["Authenticate your Buffer connection"] = ""; -$a->strings["Enable Buffer Post Plugin"] = ""; -$a->strings["Post to Buffer by default"] = ""; -$a->strings["Check to delete this preset"] = ""; -$a->strings["Posts are going to all accounts that are enabled by default:"] = ""; +$a->strings["Client Secret"] = "Secret Client"; +$a->strings["Error when registering buffer connection:"] = "Une erreur est survenue lors de la connexion à Buffer :"; +$a->strings["You are now authenticated to buffer. "] = "Vous êtes maintenant authentifié sur Buffer."; +$a->strings["return to the connector page"] = "revenir à la page du connecteur"; +$a->strings["Post to Buffer"] = "Publier sur Buffer"; +$a->strings["Buffer Export"] = "Export Buffer"; +$a->strings["Authenticate your Buffer connection"] = "Authentifier votre connexion à Buffer"; +$a->strings["Enable Buffer Post Plugin"] = "Activer le connecteur Buffer"; +$a->strings["Post to Buffer by default"] = "Publier sur Buffer par défaut"; +$a->strings["Check to delete this preset"] = "Cocher pour supprimer ce préréglage"; +$a->strings["Posts are going to all accounts that are enabled by default:"] = "Les posts sont envoyés à tous les comptes activés par défault:"; diff --git a/communityhome/lang/fr/messages.po b/communityhome/lang/fr/messages.po new file mode 100644 index 000000000..0d54a9c6c --- /dev/null +++ b/communityhome/lang/fr/messages.po @@ -0,0 +1,75 @@ +# ADDON communityhome +# Copyright (C) +# This file is distributed under the same license as the Friendica communityhome addon package. +# +# +# Translators: +# Hypolite Petovan , 2016 +# StefOfficiel , 2015 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: 2016-09-24 03:05+0000\n" +"Last-Translator: Hypolite Petovan \n" +"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: communityhome.php:28 communityhome.php:34 +msgid "Login" +msgstr "Identifiant" + +#: communityhome.php:29 +msgid "OpenID" +msgstr "OpenID" + +#: communityhome.php:39 +msgid "Latest users" +msgstr "Derniers utilisateurs" + +#: communityhome.php:84 +msgid "Most active users" +msgstr "Utilisateurs les plus actifs" + +#: communityhome.php:102 +msgid "Latest photos" +msgstr "Dernières photos" + +#: communityhome.php:115 +msgid "Contact Photos" +msgstr "Photos du contact" + +#: communityhome.php:116 +msgid "Profile Photos" +msgstr "Photos de profil" + +#: communityhome.php:141 +msgid "Latest likes" +msgstr "Derniers likes" + +#: communityhome.php:163 +msgid "event" +msgstr "événement" + +#: communityhome.php:166 communityhome.php:175 +msgid "status" +msgstr "statut" + +#: communityhome.php:171 +msgid "photo" +msgstr "photo" + +#: communityhome.php:180 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "%1$s aime %3$s de %2$s" + +#: communityhome.php:189 +#, php-format +msgid "Welcome to %s" +msgstr "Bienvenue sur %s" diff --git a/communityhome/lang/fr/strings.php b/communityhome/lang/fr/strings.php index 88381caab..42a98c840 100644 --- a/communityhome/lang/fr/strings.php +++ b/communityhome/lang/fr/strings.php @@ -1,14 +1,20 @@ -strings["Login"] = "Connexion"; -$a->strings["OpenID"] = "OpenID"; -$a->strings["Latest users"] = "Derniers utilisateurs"; -$a->strings["Most active users"] = "Utilisateurs les plus actifs"; -$a->strings["Latest photos"] = "Dernières photos"; -$a->strings["Contact Photos"] = "Photos du contact"; -$a->strings["Profile Photos"] = "Photos du profil"; -$a->strings["Latest likes"] = "Dernières approbations"; -$a->strings["event"] = "évènement"; -$a->strings["status"] = "le statut"; -$a->strings["photo"] = "photo"; -$a->strings["Welcome to %s"] = "Bienvenue sur %s"; + 1);; +}} +; +$a->strings["Login"] = "Identifiant"; +$a->strings["OpenID"] = "OpenID"; +$a->strings["Latest users"] = "Derniers utilisateurs"; +$a->strings["Most active users"] = "Utilisateurs les plus actifs"; +$a->strings["Latest photos"] = "Dernières photos"; +$a->strings["Contact Photos"] = "Photos du contact"; +$a->strings["Profile Photos"] = "Photos de profil"; +$a->strings["Latest likes"] = "Derniers likes"; +$a->strings["event"] = "événement"; +$a->strings["status"] = "statut"; +$a->strings["photo"] = "photo"; +$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s aime %3\$s de %2\$s"; +$a->strings["Welcome to %s"] = "Bienvenue sur %s"; diff --git a/curweather/lang/fr/messages.po b/curweather/lang/fr/messages.po index 9e0d01680..c23300055 100644 --- a/curweather/lang/fr/messages.po +++ b/curweather/lang/fr/messages.po @@ -4,15 +4,16 @@ # # # Translators: +# Hypolite Petovan , 2016 # Nicola Spanti , 2015 # StefOfficiel , 2015 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-13 18:46+0200\n" -"PO-Revision-Date: 2015-08-30 17:11+0000\n" -"Last-Translator: Nicola Spanti \n" +"POT-Creation-Date: 2016-03-12 08:10+0100\n" +"PO-Revision-Date: 2016-09-24 03:15+0000\n" +"Last-Translator: Hypolite Petovan \n" "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,114 +21,114 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: curweather.php:30 +#: curweather.php:31 msgid "Error fetching weather data.\\nError was: " msgstr "Erreur durant la récupération de la météo.\\nL'erreur était : " -#: curweather.php:103 curweather.php:163 +#: curweather.php:111 curweather.php:172 msgid "Current Weather" msgstr "Météo actuelle" -#: curweather.php:109 +#: curweather.php:118 msgid "Relative Humidity" -msgstr "" +msgstr "Humidité relative" -#: curweather.php:110 +#: curweather.php:119 msgid "Pressure" -msgstr "" +msgstr "Pression" -#: curweather.php:111 +#: curweather.php:120 msgid "Wind" msgstr "Vent" -#: curweather.php:112 +#: curweather.php:121 msgid "Last Updated" msgstr "Dernière mise-à-jour" -#: curweather.php:113 +#: curweather.php:122 msgid "Data by" msgstr "Données de" -#: curweather.php:114 +#: curweather.php:123 msgid "Show on map" msgstr "Montrer sur la carte" -#: curweather.php:119 +#: curweather.php:128 msgid "There was a problem accessing the weather data. But have a look" -msgstr "" +msgstr "Une erreur est survenue lors de l'accès aux données météo. Vous pouvez quand même jeter un oeil" -#: curweather.php:121 +#: curweather.php:130 msgid "at OpenWeatherMap" -msgstr "" +msgstr "à OpenWeatherMap" -#: curweather.php:137 +#: curweather.php:146 msgid "Current Weather settings updated." -msgstr "" +msgstr "Paramètres de la Météo Actuelle mis à jour." -#: curweather.php:152 +#: curweather.php:161 msgid "No APPID found, please contact your admin to optain one." -msgstr "" +msgstr "APPID introuvable, veuillez contacter votre administrateur pour en obtenir un." -#: curweather.php:162 curweather.php:191 +#: curweather.php:171 curweather.php:200 msgid "Save Settings" msgstr "Sauvegarder les paramètres" -#: curweather.php:163 +#: curweather.php:172 msgid "Settings" msgstr "Paramètres" -#: curweather.php:165 +#: curweather.php:174 msgid "Enter either the name of your location or the zip code." -msgstr "" +msgstr "Entrez le nom de votre emplacement ou votre code postal." -#: curweather.php:166 +#: curweather.php:175 msgid "Your Location" msgstr "Votre position" -#: curweather.php:166 +#: curweather.php:175 msgid "" "Identifier of your location (name or zip code), e.g. Berlin,DE or " "14476,DE." -msgstr "" +msgstr "Identifiant de votre emplacement (nom ou code postal), par exemple Paris 08, Fr ou 75008, FR." -#: curweather.php:167 +#: curweather.php:176 msgid "Units" msgstr "Unités" -#: curweather.php:167 -msgid "select if the temperatur should be displayed in °C or °F" -msgstr "" +#: curweather.php:176 +msgid "select if the temperatur should be displayed in °C or °F" +msgstr "choisissez si la température doit être affichée en °C ou °F" -#: curweather.php:168 +#: curweather.php:177 msgid "Show weather data" msgstr "Montrer les données météos" -#: curweather.php:181 +#: curweather.php:190 msgid "Curweather settings saved." -msgstr "" +msgstr "Paramètres Curweather sauvés." -#: curweather.php:192 +#: curweather.php:201 msgid "Caching Interval" -msgstr "" +msgstr "Intervalle de mise en cache." -#: curweather.php:192 +#: curweather.php:201 msgid "" "For how long should the weather data be cached? Choose according your " "OpenWeatherMap account type." -msgstr "" +msgstr "Pendant combien de temps les données météo doivent-elles être mises en cache? Choisissez en fonction du type de compte OpenWeatherMap." -#: curweather.php:192 +#: curweather.php:201 msgid "no cache" msgstr "pas de cache" -#: curweather.php:192 +#: curweather.php:201 msgid "minutes" msgstr "minutes" -#: curweather.php:193 +#: curweather.php:202 msgid "Your APPID" msgstr "Votre APPID" -#: curweather.php:193 +#: curweather.php:202 msgid "Your API key provided by OpenWeatherMap" msgstr "Votre clé pour l'API de OpenWeatherMap" diff --git a/curweather/lang/fr/strings.php b/curweather/lang/fr/strings.php index b735ef8cd..466a05086 100644 --- a/curweather/lang/fr/strings.php +++ b/curweather/lang/fr/strings.php @@ -7,27 +7,27 @@ function string_plural_select_fr($n){ ; $a->strings["Error fetching weather data.\\nError was: "] = "Erreur durant la récupération de la météo.\\nL'erreur était : "; $a->strings["Current Weather"] = "Météo actuelle"; -$a->strings["Relative Humidity"] = ""; -$a->strings["Pressure"] = ""; +$a->strings["Relative Humidity"] = "Humidité relative"; +$a->strings["Pressure"] = "Pression"; $a->strings["Wind"] = "Vent"; $a->strings["Last Updated"] = "Dernière mise-à-jour"; $a->strings["Data by"] = "Données de"; $a->strings["Show on map"] = "Montrer sur la carte"; -$a->strings["There was a problem accessing the weather data. But have a look"] = ""; -$a->strings["at OpenWeatherMap"] = ""; -$a->strings["Current Weather settings updated."] = ""; -$a->strings["No APPID found, please contact your admin to optain one."] = ""; +$a->strings["There was a problem accessing the weather data. But have a look"] = "Une erreur est survenue lors de l'accès aux données météo. Vous pouvez quand même jeter un oeil"; +$a->strings["at OpenWeatherMap"] = "à OpenWeatherMap"; +$a->strings["Current Weather settings updated."] = "Paramètres de la Météo Actuelle mis à jour."; +$a->strings["No APPID found, please contact your admin to optain one."] = "APPID introuvable, veuillez contacter votre administrateur pour en obtenir un."; $a->strings["Save Settings"] = "Sauvegarder les paramètres"; $a->strings["Settings"] = "Paramètres"; -$a->strings["Enter either the name of your location or the zip code."] = ""; +$a->strings["Enter either the name of your location or the zip code."] = "Entrez le nom de votre emplacement ou votre code postal."; $a->strings["Your Location"] = "Votre position"; -$a->strings["Identifier of your location (name or zip code), e.g. Berlin,DE or 14476,DE."] = ""; +$a->strings["Identifier of your location (name or zip code), e.g. Berlin,DE or 14476,DE."] = "Identifiant de votre emplacement (nom ou code postal), par exemple Paris 08, Fr ou 75008, FR."; $a->strings["Units"] = "Unités"; -$a->strings["select if the temperatur should be displayed in °C or °F"] = ""; +$a->strings["select if the temperatur should be displayed in °C or °F"] = "choisissez si la température doit être affichée en °C ou °F"; $a->strings["Show weather data"] = "Montrer les données météos"; -$a->strings["Curweather settings saved."] = ""; -$a->strings["Caching Interval"] = ""; -$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = ""; +$a->strings["Curweather settings saved."] = "Paramètres Curweather sauvés."; +$a->strings["Caching Interval"] = "Intervalle de mise en cache."; +$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "Pendant combien de temps les données météo doivent-elles être mises en cache? Choisissez en fonction du type de compte OpenWeatherMap."; $a->strings["no cache"] = "pas de cache"; $a->strings["minutes"] = "minutes"; $a->strings["Your APPID"] = "Votre APPID"; From 6fdd8c2ab44fddb28979dfe745fc2733ae43d191 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 25 Sep 2016 17:18:55 +0200 Subject: [PATCH 23/25] update to the curweather messages.po file for translation --- curweather/lang/C/messages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/curweather/lang/C/messages.po b/curweather/lang/C/messages.po index cee9c3439..048c327a9 100644 --- a/curweather/lang/C/messages.po +++ b/curweather/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-12 08:10+0100\n" +"POT-Creation-Date: 2016-09-25 17:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -62,7 +62,7 @@ msgid "Current Weather settings updated." msgstr "" #: curweather.php:161 -msgid "No APPID found, please contact your admin to optain one." +msgid "No APPID found, please contact your admin to obtain one." msgstr "" #: curweather.php:171 curweather.php:200 @@ -92,7 +92,7 @@ msgid "Units" msgstr "" #: curweather.php:176 -msgid "select if the temperatur should be displayed in °C or °F" +msgid "select if the temperature should be displayed in °C or °F" msgstr "" #: curweather.php:177 From 40949204f1136e14160bb57d4d203ce101e1b4e3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 26 Sep 2016 12:20:24 +0200 Subject: [PATCH 24/25] DE translation for curweather --- curweather/lang/de/messages.po | 13 +++++++------ curweather/lang/de/strings.php | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/curweather/lang/de/messages.po b/curweather/lang/de/messages.po index d8650b799..0f76e2cb0 100644 --- a/curweather/lang/de/messages.po +++ b/curweather/lang/de/messages.po @@ -6,14 +6,15 @@ # Translators: # Andreas H., 2014 # Oliver , 2016 -# bavatar , 2014-2015 +# Tobias Diekershoff , 2014-2015 +# Tobias Diekershoff , 2016 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-12 08:10+0100\n" -"PO-Revision-Date: 2016-03-17 21:22+0000\n" -"Last-Translator: Oliver \n" +"POT-Creation-Date: 2016-09-25 17:17+0200\n" +"PO-Revision-Date: 2016-09-26 10:17+0000\n" +"Last-Translator: Tobias Diekershoff \n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +67,7 @@ msgid "Current Weather settings updated." msgstr "Einstellungen des Aktuellen Wetter Addons aktualisiert." #: curweather.php:161 -msgid "No APPID found, please contact your admin to optain one." +msgid "No APPID found, please contact your admin to obtain one." msgstr "Keine APPID gefunden, bitte kontaktiere deinen Admin damit eine eingerichtet wird." #: curweather.php:171 curweather.php:200 @@ -96,7 +97,7 @@ msgid "Units" msgstr "Einheiten" #: curweather.php:176 -msgid "select if the temperatur should be displayed in °C or °F" +msgid "select if the temperature should be displayed in °C or °F" msgstr "wähle ob die Temperatur in °C oder °F angezeigt werden soll" #: curweather.php:177 diff --git a/curweather/lang/de/strings.php b/curweather/lang/de/strings.php index 24d930568..2f1f0e3d5 100644 --- a/curweather/lang/de/strings.php +++ b/curweather/lang/de/strings.php @@ -16,14 +16,14 @@ $a->strings["Show on map"] = "Karte anzeigen"; $a->strings["There was a problem accessing the weather data. But have a look"] = "Es gab ein Problem beim Abrufen der Wetterdaten. Aber werf doch mal einen Blick"; $a->strings["at OpenWeatherMap"] = "auf OpenWeatherMap"; $a->strings["Current Weather settings updated."] = "Einstellungen des Aktuellen Wetter Addons aktualisiert."; -$a->strings["No APPID found, please contact your admin to optain one."] = "Keine APPID gefunden, bitte kontaktiere deinen Admin damit eine eingerichtet wird."; +$a->strings["No APPID found, please contact your admin to obtain one."] = "Keine APPID gefunden, bitte kontaktiere deinen Admin damit eine eingerichtet wird."; $a->strings["Save Settings"] = "Einstellungen speichern"; $a->strings["Settings"] = "Einstellungen"; $a->strings["Enter either the name of your location or the zip code."] = "Gib entweder den Namen oder die PLZ deines Ortes ein."; $a->strings["Your Location"] = "Deinen Standort festlegen"; $a->strings["Identifier of your location (name or zip code), e.g. Berlin,DE or 14476,DE."] = "Identifikator deines Standorts (Name oder Postleitzahl), z.B. Berlin,DE oder 14476,DE."; $a->strings["Units"] = "Einheiten"; -$a->strings["select if the temperatur should be displayed in °C or °F"] = "wähle ob die Temperatur in °C oder °F angezeigt werden soll"; +$a->strings["select if the temperature should be displayed in °C or °F"] = "wähle ob die Temperatur in °C oder °F angezeigt werden soll"; $a->strings["Show weather data"] = "Zeige Wetter Daten"; $a->strings["Curweather settings saved."] = "Curweather Einstellungen gespeichert."; $a->strings["Caching Interval"] = "Cache Intervall"; From ed1caffe044be3b499d3adea89a2ee3f73cb9d74 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Sat, 1 Oct 2016 18:15:32 +0200 Subject: [PATCH 25/25] Add minimum post body length setting to language filter --- langfilter/langfilter.php | 13 +++++++++++++ langfilter/templates/settings.tpl | 1 + 2 files changed, 14 insertions(+) diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index b29084c82..d4fe942d0 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -36,6 +36,7 @@ function langfilter_addon_settings(&$a,&$s) { $enable_checked = (intval(get_pconfig(local_user(),'langfilter','disable')) ? '' : ' checked="checked" '); $languages = get_pconfig(local_user(),'langfilter','languages'); $minconfidence = get_pconfig(local_user(),'langfilter','minconfidence')*100; + $minlength = get_pconfig(local_user(),'langfilter','minlength'); if(! $languages) $languages = 'en,de,fr,it,es'; @@ -46,6 +47,7 @@ function langfilter_addon_settings(&$a,&$s) { '$enabled' => array('langfilter_enable', t('Use the language filter'), $enable_checked, ''), '$languages' => array('langfilter_languages', t('I speak'), $languages, t('List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".') ), '$minconfidence' => array('langfilter_minconfidence', t('Minimum confidence in language detection'), $minconfidence, t('Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.') ), + '$minlength' => array('langfilter_minlength', t('Minimum length of message body'), $minlength, t('Minimum length of message body for language filter to be used. Posts shorter than this number of characters will not be filtered.') ), '$submit' => t('Save Settings'), )); @@ -70,6 +72,12 @@ function langfilter_addon_settings_post(&$a,&$b) { else if ( $minconfidence < 0 ) $minconfidence = 0; else if ( $minconfidence > 100 ) $minconfidence = 100; set_pconfig(local_user(),'langfilter','minconfidence', $minconfidence/100.0); + + $minlength = 0+$_POST['langfilter_minlength']; + if ( ! $minlength ) $minlength = 32; + else if ( $minlength < 0 ) $minlength = 32; + set_pconfig(local_user(),'langfilter','minlength', $minlength); + info( t('Language Filter Settings saved.') . EOL); } } @@ -94,6 +102,11 @@ function langfilter_prepare_body(&$a,&$b) { # Don't filter if language filter is disabled if( get_pconfig($logged_user,'langfilter','disable') ) return; + # Don't filter if body lenght is below minimum + $minlen = get_pconfig(local_user(),'langfilter','minlength'); + if ( ! $minlen ) $minlen = 32; + if ( strlen($b['item']['body']) < $minlen ) return; + $spoken_config = get_pconfig(local_user(),'langfilter','languages'); $minconfidence = get_pconfig(local_user(),'langfilter','minconfidence'); diff --git a/langfilter/templates/settings.tpl b/langfilter/templates/settings.tpl index 5d1fb25f4..8e62ef49e 100644 --- a/langfilter/templates/settings.tpl +++ b/langfilter/templates/settings.tpl @@ -11,6 +11,7 @@ {{include file="field_checkbox.tpl" field=$enabled}} {{include file="field_input.tpl" field=$languages}} {{include file="field_input.tpl" field=$minconfidence}} + {{include file="field_input.tpl" field=$minlength}}