diff --git a/.tx/config b/.tx/config index 50b8ef45b..599edaee8 100644 --- a/.tx/config +++ b/.tx/config @@ -1,12 +1,6 @@ [main] host = https://www.transifex.com -[friendica.addon_appnet_messagespo] -file_filter = appnet/lang//messages.po -source_file = appnet/lang/C/messages.po -source_lang = en -type = PO - [friendica.addon_blackout_messagespo] file_filter = blackout/lang//messages.po source_file = blackout/lang/C/messages.po @@ -37,12 +31,6 @@ source_file = buglink/lang/C/messages.po source_lang = en type = PO -[friendica.addon_cal_messagespo] -file_filter = cal/lang//messages.po -source_file = cal/lang/C/messages.po -source_lang = en -type = PO - [friendica.addon_communityhome_messagespo] file_filter = communityhome/lang//messages.po source_file = communityhome/lang/C/messages.po @@ -73,24 +61,12 @@ source_file = dwpost/lang/C/messages.po source_lang = en type = PO -[friendica.addon_editplain_messagespo] -file_filter = editplain/lang//messages.po -source_file = editplain/lang/C/messages.po -source_lang = en -type = PO - [friendica.addon_forumdirectory_messagespo] file_filter = forumdirectory/lang//messages.po source_file = forumdirectory/lang/C/messages.po source_lang = en type = PO -[friendica.addon_forumlist_messagespo] -file_filter = forumlist/lang//messages.po -source_file = forumlist/lang/C/messages.po -source_lang = en -type = PO - [friendica.addon_fromapp_messagespo] file_filter = fromapp/lang//messages.po source_file = fromapp/lang/C/messages.po @@ -115,12 +91,6 @@ source_file = gnot/lang/C/messages.po source_lang = en type = PO -[friendica.addon_gpluspost_messagespo] -file_filter = gpluspost/lang//messages.po -source_file = gpluspost/lang/C/messages.po -source_lang = en -type = PO - [friendica.addon_gravatar_messagespo] file_filter = gravatar/lang//messages.po source_file = gravatar/lang/C/messages.po @@ -301,6 +271,12 @@ source_file = rendertime/lang/C/messages.po source_lang = en type = PO +[friendica.addon_securemail_messagespo] +file_filter = securemail/lang//messages.po +source_file = securemail/lang/C/messages.po +source_lang = en +type = PO + [friendica.addon_showmore_messagespo] file_filter = showmore/lang//messages.po source_file = showmore/lang/C/messages.po @@ -313,12 +289,6 @@ source_file = smileybutton/lang/C/messages.po source_lang = en type = PO -[friendica.addon_snautofollow_messagespo] -file_filter = snautofollow/lang//messages.po -source_file = snautofollow/lang/C/messages.po -source_lang = en -type = PO - [friendica.addon_startpage_messagespo] file_filter = startpage/lang//messages.po source_file = startpage/lang/C/messages.po @@ -361,9 +331,9 @@ source_file = twitter/lang/C/messages.po source_lang = en type = PO -[friendica.addon_uhremotestorage_messagespo] -file_filter = uhremotestorage/lang//messages.po -source_file = uhremotestorage/lang/C/messages.po +[friendica.addon_viewsrc_messagespo] +file_filter = viewsrc/lang//messages.po +source_file = viewsrc/lang/C/messages.po source_lang = en type = PO @@ -385,6 +355,12 @@ source_file = wppost/lang/C/messages.po source_lang = en type = PO +[friendica.addon_xmpp_messagespo] +file_filter = xmpp/lang//messages.po +source_file = xmpp/lang/C/messages.po +source_lang = en +type = PO + [friendica.addon_yourls_messagespo] file_filter = yourls/lang//messages.po source_file = yourls/lang/C/messages.po diff --git a/INSTALL.txt b/INSTALL.txt index 8b248bd01..5ea0c9a2e 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -5,7 +5,7 @@ To install all addons using git, cd into your top level Friendica directory and git clone https://github.com/friendica/friendica-addons.git addon - util/composer.phar install -d addon + bin/composer.phar install -d addon This will clone the entire repository in a directory called addon. They can now be activated in the addons section of your admin panel. diff --git a/blackout/lang/it/messages.po b/blackout/lang/it/messages.po index b9b5ec308..1b0c6f628 100644 --- a/blackout/lang/it/messages.po +++ b/blackout/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014 +# fabrixxm , 2014,2018 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: 2014-09-10 10:22+0000\n" +"PO-Revision-Date: 2018-03-19 19:50+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/blockem/lang/en-gb/messages.po b/blockem/lang/en-gb/messages.po index b2fb55e8c..6bcc7b9bf 100644 --- a/blockem/lang/en-gb/messages.po +++ b/blockem/lang/en-gb/messages.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-09 13:00+0100\n" -"PO-Revision-Date: 2018-02-17 11:24+0000\n" +"PO-Revision-Date: 2018-03-15 14:10+0000\n" "Last-Translator: Andy H3 \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -44,7 +44,7 @@ msgstr "Blockem settings saved." #: blockem.php:140 #, php-format msgid "Hidden content by %s - Click to open/close" -msgstr "Hidden content by %s - Show/hide" +msgstr "Hidden content by %s - Reveal/hide" #: blockem.php:193 msgid "Unblock Author" diff --git a/blockem/lang/en-gb/strings.php b/blockem/lang/en-gb/strings.php index 3ad8da0da..d31cebe79 100644 --- a/blockem/lang/en-gb/strings.php +++ b/blockem/lang/en-gb/strings.php @@ -10,7 +10,7 @@ $a->strings["Hides user's content by collapsing posts. Also replaces their avata $a->strings["Comma separated profile URLS:"] = "Comma separated profile URLs:"; $a->strings["Save Settings"] = "Save settings"; $a->strings["BLOCKEM Settings saved."] = "Blockem settings saved."; -$a->strings["Hidden content by %s - Click to open/close"] = "Hidden content by %s - Show/hide"; +$a->strings["Hidden content by %s - Click to open/close"] = "Hidden content by %s - Reveal/hide"; $a->strings["Unblock Author"] = "Unblock author"; $a->strings["Block Author"] = "Block author"; $a->strings["blockem settings updated"] = "Blockem settings updated"; diff --git a/blockem/lang/en-us/messages.po b/blockem/lang/en-us/messages.po new file mode 100644 index 000000000..362c48916 --- /dev/null +++ b/blockem/lang/en-us/messages.po @@ -0,0 +1,59 @@ +# ADDON blockem +# Copyright (C) +# This file is distributed under the same license as the Friendica blockem addon package. +# +# +# Translators: +# Andy H3 , 2018 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-09 13:00+0100\n" +"PO-Revision-Date: 2018-03-15 14:14+0000\n" +"Last-Translator: Andy H3 \n" +"Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_US\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: blockem.php:51 blockem.php:55 +msgid "\"Blockem\"" +msgstr "\"Blockem\"" + +#: blockem.php:59 +msgid "" +"Hides user's content by collapsing posts. Also replaces their avatar with " +"generic image." +msgstr "Hides user's content by collapsing posts. Also replaces their avatar with generic image." + +#: blockem.php:60 +msgid "Comma separated profile URLS:" +msgstr "Comma separated profile URLs:" + +#: blockem.php:64 +msgid "Save Settings" +msgstr "Save settings" + +#: blockem.php:77 +msgid "BLOCKEM Settings saved." +msgstr "Blockem settings saved." + +#: blockem.php:140 +#, php-format +msgid "Hidden content by %s - Click to open/close" +msgstr "Hidden content by %s - Reveal/hide" + +#: blockem.php:193 +msgid "Unblock Author" +msgstr "Unblock author" + +#: blockem.php:195 +msgid "Block Author" +msgstr "Block author" + +#: blockem.php:227 +msgid "blockem settings updated" +msgstr "Blockem settings updated" diff --git a/blockem/lang/en-us/strings.php b/blockem/lang/en-us/strings.php new file mode 100644 index 000000000..ad88b5460 --- /dev/null +++ b/blockem/lang/en-us/strings.php @@ -0,0 +1,16 @@ +strings["\"Blockem\""] = "\"Blockem\""; +$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Hides user's content by collapsing posts. Also replaces their avatar with generic image."; +$a->strings["Comma separated profile URLS:"] = "Comma separated profile URLs:"; +$a->strings["Save Settings"] = "Save settings"; +$a->strings["BLOCKEM Settings saved."] = "Blockem settings saved."; +$a->strings["Hidden content by %s - Click to open/close"] = "Hidden content by %s - Reveal/hide"; +$a->strings["Unblock Author"] = "Unblock author"; +$a->strings["Block Author"] = "Block author"; +$a->strings["blockem settings updated"] = "Blockem settings updated"; diff --git a/blockem/lang/it/messages.po b/blockem/lang/it/messages.po index 5e619da5b..ea72109e5 100644 --- a/blockem/lang/it/messages.po +++ b/blockem/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014 +# fabrixxm , 2014,2018 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: 2014-09-10 10:23+0000\n" +"POT-Creation-Date: 2018-02-09 13:00+0100\n" +"PO-Revision-Date: 2018-03-19 13:14+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -19,35 +19,41 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: blockem.php:53 blockem.php:57 +#: blockem.php:51 blockem.php:55 msgid "\"Blockem\"" msgstr "\"Blockem\"" -#: blockem.php:61 -msgid "Comma separated profile URLS to block" -msgstr "Lista, separata da virgola, di indirizzi da bloccare" +#: blockem.php:59 +msgid "" +"Hides user's content by collapsing posts. Also replaces their avatar with " +"generic image." +msgstr "Nascondi il contenuto degli utenti collassando i messaggi. Sostituisce anche gli avatar con un'immagine generica." -#: blockem.php:65 +#: blockem.php:60 +msgid "Comma separated profile URLS:" +msgstr "URL profili separati da virgola:" + +#: blockem.php:64 msgid "Save Settings" msgstr "Salva Impostazioni" -#: blockem.php:78 +#: blockem.php:77 msgid "BLOCKEM Settings saved." msgstr "Impostazioni BLOCKEM salvate." -#: blockem.php:142 +#: blockem.php:140 #, php-format -msgid "Blocked %s - Click to open/close" -msgstr "%s bloccato - Clicca per aprire/chiudere" +msgid "Hidden content by %s - Click to open/close" +msgstr "Contenuto di %s nascosto - Clicca per aprire/chiudere" -#: blockem.php:197 +#: blockem.php:193 msgid "Unblock Author" msgstr "Sblocca autore" -#: blockem.php:199 +#: blockem.php:195 msgid "Block Author" msgstr "Blocca autore" -#: blockem.php:231 +#: blockem.php:227 msgid "blockem settings updated" msgstr "Impostazioni 'blockem' aggiornate." diff --git a/blockem/lang/it/strings.php b/blockem/lang/it/strings.php index 85f8a0ac5..f3997eda8 100644 --- a/blockem/lang/it/strings.php +++ b/blockem/lang/it/strings.php @@ -6,10 +6,11 @@ function string_plural_select_it($n){ }} ; $a->strings["\"Blockem\""] = "\"Blockem\""; -$a->strings["Comma separated profile URLS to block"] = "Lista, separata da virgola, di indirizzi da bloccare"; +$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Nascondi il contenuto degli utenti collassando i messaggi. Sostituisce anche gli avatar con un'immagine generica."; +$a->strings["Comma separated profile URLS:"] = "URL profili separati da virgola:"; $a->strings["Save Settings"] = "Salva Impostazioni"; $a->strings["BLOCKEM Settings saved."] = "Impostazioni BLOCKEM salvate."; -$a->strings["Blocked %s - Click to open/close"] = "%s bloccato - Clicca per aprire/chiudere"; +$a->strings["Hidden content by %s - Click to open/close"] = "Contenuto di %s nascosto - Clicca per aprire/chiudere"; $a->strings["Unblock Author"] = "Sblocca autore"; $a->strings["Block Author"] = "Blocca autore"; $a->strings["blockem settings updated"] = "Impostazioni 'blockem' aggiornate."; diff --git a/blogger/lang/it/messages.po b/blogger/lang/it/messages.po index ed0b95d7e..9ee69d62d 100644 --- a/blogger/lang/it/messages.po +++ b/blogger/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014 +# fabrixxm , 2014,2018 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: 2014-09-10 10:24+0000\n" +"PO-Revision-Date: 2018-03-19 13:21+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgstr "Esporta Blogger" #: blogger.php:82 msgid "Enable Blogger Post Addon" -msgstr "Abilita il addon di invio a Blogger" +msgstr "Abilita il componente aggiuntivo di invio a Blogger" #: blogger.php:87 msgid "Blogger username" diff --git a/blogger/lang/it/strings.php b/blogger/lang/it/strings.php index 953fbc0a0..80b7b5fae 100644 --- a/blogger/lang/it/strings.php +++ b/blogger/lang/it/strings.php @@ -7,7 +7,7 @@ function string_plural_select_it($n){ ; $a->strings["Post to blogger"] = "Invia a Blogger"; $a->strings["Blogger Export"] = "Esporta Blogger"; -$a->strings["Enable Blogger Post Addon"] = "Abilita il addon di invio a Blogger"; +$a->strings["Enable Blogger Post Addon"] = "Abilita il componente aggiuntivo di invio a Blogger"; $a->strings["Blogger username"] = "Nome utente Blogger"; $a->strings["Blogger password"] = "Password Blogger"; $a->strings["Blogger API URL"] = "Indirizzo API Blogger"; diff --git a/buffer/lang/it/messages.po b/buffer/lang/it/messages.po index f74d2cfa0..6f4c94c2a 100644 --- a/buffer/lang/it/messages.po +++ b/buffer/lang/it/messages.po @@ -4,15 +4,15 @@ # # # Translators: -# fabrixxm , 2014 +# fabrixxm , 2014,2018 # Sandro Santilli , 2015 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-11-01 11:05+0000\n" -"Last-Translator: Sandro Santilli \n" +"PO-Revision-Date: 2018-03-19 13:21+0000\n" +"Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +62,7 @@ msgstr "Autentica la tua connessione a Buffer" #: buffer.php:146 msgid "Enable Buffer Post Addon" -msgstr "Abilita il addon di invio a Buffer" +msgstr "Abilita il componente aggiuntivo di invio a Buffer" #: buffer.php:151 msgid "Post to Buffer by default" diff --git a/buffer/lang/it/strings.php b/buffer/lang/it/strings.php index d0c017709..02fa328b6 100644 --- a/buffer/lang/it/strings.php +++ b/buffer/lang/it/strings.php @@ -15,7 +15,7 @@ $a->strings["return to the connector page"] = "ritorna alla pagina del connettor $a->strings["Post to Buffer"] = "Invia a Buffer"; $a->strings["Buffer Export"] = "Esporta Buffer"; $a->strings["Authenticate your Buffer connection"] = "Autentica la tua connessione a Buffer"; -$a->strings["Enable Buffer Post Addon"] = "Abilita il addon di invio a Buffer"; +$a->strings["Enable Buffer Post Addon"] = "Abilita il componente aggiuntivo di invio a Buffer"; $a->strings["Post to Buffer by default"] = "Invia sempre a Buffer"; $a->strings["Check to delete this preset"] = "Seleziona per eliminare questo preset"; $a->strings["Posts are going to all accounts that are enabled by default:"] = "I messaggi andranno a tutti gli account che sono abilitati:"; diff --git a/buglink/lang/it/messages.po b/buglink/lang/it/messages.po index 63e643ea9..de10cb94a 100644 --- a/buglink/lang/it/messages.po +++ b/buglink/lang/it/messages.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-22 13:18+0200\n" -"PO-Revision-Date: 2014-09-10 10:27+0000\n" +"PO-Revision-Date: 2017-09-20 06:07+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/communityhome/README.md b/communityhome/README.md index 91838d9f1..61bbc99a8 100644 --- a/communityhome/README.md +++ b/communityhome/README.md @@ -1,34 +1,17 @@ Community Home -------------- -This addon overwrites the default home page shown to not logged users. -On sidebar there are the login form, last ten users (if they have -choosed to be in site directory), last ten public photos and last ten -"likes" sent by a site user or about a site user's item +This addon overwrites the default home page shown to anonymous users. +On the sidebar there are the login form, last ten users (if they chose +to be in the site directory), last ten public photos and last ten +"likes" sent by a site user or about a site user's item. -In main content is shown the community stream. This addon doesn't -honour your community page visibility site setting: the community +In the main content is shown the community stream. This addon doesn't +honor your community page visibility site setting: the community stream is shown also if you have choose to not show the community page. -If 'home.html' is found in your friendica root, its content is inserted +If 'home.html' is found in your friendica root, its content is inserted before community stream -Each elements can be show or not. At the moment, there is no admin page -for settings, so this settings must be added to yout .htconfig.php - - - $a->config['communityhome']['showcommunitystream'] = true; - $a->config['communityhome']['showlastlike'] = true; - $a->config['communityhome']['showlastphotos'] = true; - $a->config['communityhome']['showactiveusers'] = true; - $a->config['communityhome']['showlastusers'] = true; - -If you don't want to show something, set it to false. - -Note: ------ - -- Default is "false". With no settings in .htconfig.php, nothing is -shown, except login form and content of 'home.html' - -- Active users query can be heavy for db, and on some system don't work +By default no features are enabled, you can edit this addon's settings +through the admin panel. \ No newline at end of file diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php index 78d9fe8a9..dc0a6bafa 100644 --- a/communityhome/communityhome.php +++ b/communityhome/communityhome.php @@ -1,40 +1,45 @@ + * Status: Unsupported */ + +use Friendica\App; use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Module\Login; -require_once('mod/community.php'); +require_once 'mod/community.php'; - -function communityhome_install() { +function communityhome_install() +{ Addon::registerHook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home'); logger("installed communityhome"); } -function communityhome_uninstall() { +function communityhome_uninstall() +{ Addon::unregisterHook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home'); logger("removed communityhome"); } -function communityhome_getopts() { +function communityhome_getopts() +{ return [ - 'hidelogin'=>L10n::t('Hide login form'), - 'showlastusers'=>L10n::t('Show last new users'), - 'showactiveusers'=>L10n::t('Show last active users'), - 'showlastphotos'=>L10n::t('Show last photos'), - 'showlastlike'=>L10n::t('Show last liked items'), - 'showcommunitystream'=>L10n::t('Show community stream') + 'hidelogin' => L10n::t('Hide login form'), + 'showlastusers' => L10n::t('Show last new users'), + 'showlastphotos' => L10n::t('Show last photos'), + 'showlastlike' => L10n::t('Show last liked items'), + 'showcommunitystream' => L10n::t('Show community stream') ]; } -function communityhome_addon_admin(&$a, &$o) +function communityhome_addon_admin(App $a, &$o) { $tpl = get_markup_template('settings.tpl', 'addon/communityhome/'); @@ -45,37 +50,37 @@ function communityhome_addon_admin(&$a, &$o) ]; foreach ($opts as $k => $v) { - $ctx['fields'][] = ['communityhome_'.$k, $v, Config::get('communityhome', $k)]; + $ctx['fields'][] = ['communityhome_' . $k, $v, Config::get('communityhome', $k)]; } $o = replace_macros($tpl, $ctx); } -function communityhome_addon_admin_post(&$a, &$b) +function communityhome_addon_admin_post(App $a) { if (x($_POST, 'communityhome-submit')) { $opts = communityhome_getopts(); foreach ($opts as $k => $v) { - Config::set('communityhome', $k, x($_POST, 'communityhome_'.$k)); + Config::set('communityhome', $k, x($_POST, 'communityhome_' . $k)); } } } - -function communityhome_home(&$a, &$o){ +function communityhome_home(App $a, &$o) +{ // custom css - $a->page['htmlhead'] .= ''; + $a->page['htmlhead'] .= ''; - if (!Config::get('communityhome','hidelogin')){ + if (!Config::get('communityhome', 'hidelogin')) { $aside = [ '$tab_1' => L10n::t('Login'), '$tab_2' => L10n::t('OpenID'), - '$noOid' => Config::get('system','no_openid'), + '$noOid' => Config::get('system', 'no_openid'), ]; // login form - $aside['$login_title'] = L10n::t('Login'); + $aside['$login_title'] = L10n::t('Login'); $aside['$login_form'] = Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? false : true); - } else { + } else { $aside = [ //'$tab_1' => L10n::t('Login'), //'$tab_2' => L10n::t('OpenID'), @@ -84,26 +89,26 @@ function communityhome_home(&$a, &$o){ } // last 12 users - if (Config::get('communityhome','showlastusers')){ + if (Config::get('communityhome', 'showlastusers')) { $aside['$lastusers_title'] = L10n::t('Latest users'); $aside['$lastusers_items'] = []; $sql_extra = ""; - $publish = (Config::get('system','publish_all') ? '' : " AND `publish` = 1 " ); + $publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 " ); $order = " ORDER BY `register_date` DESC "; $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", + WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d, %d ", 0, 12 ); - # $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl'); - $tpl = get_markup_template( 'directory_item.tpl', 'addon/communityhome/' ); - if(count($r)) { + # $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl'); + $tpl = get_markup_template('directory_item.tpl', 'addon/communityhome/'); + if (count($r)) { $photo = 'thumb'; - foreach($r as $rr) { + foreach ($r as $rr) { $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,[ + $entry = replace_macros($tpl, [ '$id' => $rr['id'], '$profile_link' => $profile_link, '$photo' => $rr[$photo], @@ -113,41 +118,9 @@ function communityhome_home(&$a, &$o){ } } } - // 12 most active users (by posts and contacts) - // this query don't work on some mysql versions - if (Config::get('communityhome','showactiveusers')){ - $r = q("SELECT `uni`.`contacts`,`uni`.`items`, `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM - (SELECT COUNT(*) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`, - (SELECT COUNT(*) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`, - ( - SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` - UNION ALL - SELECT `contacts`,`items`,`con`.`uid` FROM `con` LEFT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` - ) AS `uni`, `user`, `profile` - WHERE `uni`.`uid`=`user`.`uid` - AND `uni`.`uid`=`profile`.`uid` AND `profile`.`publish`=1 - GROUP BY `uid` - ORDER BY `items` DESC,`contacts` DESC - LIMIT 0,10"); - if($r && count($r)) { - $aside['$activeusers_title'] = L10n::t('Most active users'); - $aside['$activeusers_items'] = []; - $photo = 'thumb'; - foreach($r as $rr) { - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,[ - '$id' => $rr['id'], - '$profile_link' => $profile_link, - '$photo' => $rr[$photo], - '$photo_user' => sprintf("%s (%s posts, %s contacts)",$rr['name'], ($rr['items']?$rr['items']:'0'), ($rr['contacts']?$rr['contacts']:'0')) - ]); - $aside['$activeusers_items'][] = $entry; - } - } - } // last 12 photos - if (Config::get('communityhome','showlastphotos')){ + if (Config::get('communityhome', 'showlastphotos')) { $aside['$photos_title'] = L10n::t('Latest photos'); $aside['$photos_items'] = []; $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM @@ -161,19 +134,19 @@ function communityhome_home(&$a, &$o){ AND `user`.`hidewall` = 0 ORDER BY `photo`.`edited` DESC LIMIT 0, 12", - dbesc(L10n::t('Contact Photos')), - dbesc(L10n::t('Profile Photos')) - ); + dbesc(L10n::t('Contact Photos')), + dbesc(L10n::t('Profile Photos')) + ); - if(count($r)) { - # $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl'); - $tpl = get_markup_template( 'directory_item.tpl', 'addon/communityhome/' ); - foreach($r as $rr) { + if (count($r)) { + # $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl'); + $tpl = get_markup_template('directory_item.tpl', 'addon/communityhome/'); + foreach ($r as $rr) { $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; - $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; + $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg'; - $entry = replace_macros($tpl,[ + $entry = replace_macros($tpl, [ '$id' => $rr['id'], '$profile_link' => $photo_page, '$photo' => $photo_url, @@ -187,7 +160,7 @@ function communityhome_home(&$a, &$o){ } // last 10 liked items - if (Config::get('communityhome','showlastlike')){ + if (Config::get('communityhome', 'showlastlike')) { $aside['$like_title'] = L10n::t('Latest likes'); $aside['$like_items'] = []; $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM @@ -198,17 +171,18 @@ function communityhome_home(&$a, &$o){ GROUP BY `uri` ORDER BY `T1`.`created` DESC LIMIT 0,10", - $a->get_baseurl(),$a->get_baseurl() - ); + $a->get_baseurl(), + $a->get_baseurl() + ); foreach ($r as $rr) { - $author = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; + $author = '' . $rr['liker'] . ''; + $objauthor = '' . $rr['author-name'] . ''; //var_dump($rr['verb'],$rr['object-type']); killme(); - switch($rr['verb']){ + switch ($rr['verb']) { case 'http://activitystrea.ms/schema/1.0/post': - switch ($rr['object-type']){ + switch ($rr['object-type']) { case 'http://activitystrea.ms/schema/1.0/event': $post_type = L10n::t('event'); break; @@ -217,9 +191,10 @@ function communityhome_home(&$a, &$o){ } break; default: - if ($rr['resource-id']){ + if ($rr['resource-id']) { $post_type = L10n::t('photo'); - $m=[]; preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); + $m = []; + preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); $rr['plink'] = $m[1]; } else { $post_type = L10n::t('status'); @@ -228,7 +203,6 @@ function communityhome_home(&$a, &$o){ $plink = '' . $post_type . ''; $aside['$like_items'][] = L10n::t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink); - } } @@ -236,19 +210,16 @@ function communityhome_home(&$a, &$o){ $tpl = get_markup_template('communityhome.tpl', 'addon/communityhome/'); $a->page['aside'] = replace_macros($tpl, $aside); - $o = '

' . ((x($a->config,'sitename')) ? L10n::t("Welcome to %s", $a->config['sitename']) : "" ) . '

'; + $o = '

' . ((x($a->config, 'sitename')) ? L10n::t("Welcome to %s", $a->config['sitename']) : "" ) . '

'; - if(file_exists('home.html')) - $o = file_get_contents('home.html'); + if (file_exists('home.html')) $o = file_get_contents('home.html'); - if (Config::get('communityhome','showcommunitystream')){ - $oldset = Config::get('system','community_page_style'); - if ($oldset == CP_NO_COMMUNITY_PAGE) - Config::set('system','community_page_style', CP_USERS_ON_SERVER); + if (Config::get('communityhome', 'showcommunitystream')) { + $oldset = Config::get('system', 'community_page_style'); + if ($oldset == CP_NO_COMMUNITY_PAGE) Config::set('system', 'community_page_style', CP_USERS_ON_SERVER); - $o .= community_content($a,1); + $o .= community_content($a, 1); - if ($oldset == CP_NO_COMMUNITY_PAGE) - Config::set('system','community_page_style', $oldset); + if ($oldset == CP_NO_COMMUNITY_PAGE) Config::set('system', 'community_page_style', $oldset); } } diff --git a/communityhome/lang/it/messages.po b/communityhome/lang/it/messages.po index 639615130..808cc6324 100644 --- a/communityhome/lang/it/messages.po +++ b/communityhome/lang/it/messages.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-02-27 05:01-0500\n" -"PO-Revision-Date: 2014-09-10 10:30+0000\n" +"PO-Revision-Date: 2017-09-20 06:07+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/communityhome/templates/communityhome.tpl b/communityhome/templates/communityhome.tpl index b8f80381f..c2e458be4 100644 --- a/communityhome/templates/communityhome.tpl +++ b/communityhome/templates/communityhome.tpl @@ -15,9 +15,9 @@ $("#tab_1").removeClass("active"); e.preventDefault(); return false; - + }); - + }); {{if $noOid}} @@ -41,15 +41,6 @@ {{/if}} -{{if $activeusers_title}} -

{{$activeusers_title}}

-
-{{foreach $activeusers_items as $i}} - {{$i}} -{{/foreach}} -
-{{/if}} - {{if $photos_title}}

{{$photos_title}}

diff --git a/curweather/lang/it/messages.po b/curweather/lang/it/messages.po index 9bfb4b85e..fe0f0770c 100644 --- a/curweather/lang/it/messages.po +++ b/curweather/lang/it/messages.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-25 17:17+0200\n" -"PO-Revision-Date: 2016-11-22 06:43+0000\n" +"PO-Revision-Date: 2017-09-20 06:07+0000\n" "Last-Translator: Tobias Diekershoff \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/dav/lang/it/messages.po b/dav/lang/it/messages.po index b1911a708..1470b8c03 100644 --- a/dav/lang/it/messages.po +++ b/dav/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014 +# fabrixxm , 2014,2018 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: 2015-12-14 11:10+0000\n" +"PO-Revision-Date: 2018-03-19 13:21+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -188,7 +188,7 @@ msgid "" "The current version of this addon has not been set up correctly. Please " "contact the system administrator of your installation of friendica to fix " "this." -msgstr "La versione corrente di questo addon non è stata configurata correttamente. Contatta l'amministratore." +msgstr "La versione corrente di questo componente aggiuntivo non è stata configurata correttamente. Contatta l'amministratore." #: friendica/main.php:239 common/wdcal_edit.inc.php:146 msgid "Calendar" diff --git a/dav/lang/it/strings.php b/dav/lang/it/strings.php index ce1f78a89..712e2040d 100644 --- a/dav/lang/it/strings.php +++ b/dav/lang/it/strings.php @@ -45,7 +45,7 @@ $a->strings["Warning"] = "Attenzione"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sincronizzazione (iPhone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Sincronizzare questo calendario con l'iPhone"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronizzare i tuoi contatti di Friendica con l'iPhone"; -$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La versione corrente di questo addon non è stata configurata correttamente. Contatta l'amministratore."; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La versione corrente di questo componente aggiuntivo non è stata configurata correttamente. Contatta l'amministratore."; $a->strings["Calendar"] = "Calendario"; $a->strings["Extended calendar with CalDAV-support"] = "Calendario esteso con supporto CalDAV"; $a->strings["noreply"] = "nonrispondere"; diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 49a9cfc47..04d3c7eca 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -9,6 +9,7 @@ require_once 'addon/diaspora/Diaspora_Connection.php'; +use Friendica\Content\Text\BBCode; use Friendica\Core\Addon; use Friendica\Core\L10n; use Friendica\Core\PConfig; @@ -303,10 +304,8 @@ function diaspora_send(&$a,&$b) { $aspect = PConfig::get($b['uid'],'diaspora','aspect'); if ($handle && $password) { - logger('diaspora_send: all values seem to be okay', LOGGER_DEBUG); - require_once('include/bb2diaspora.php'); $tag_arr = []; $tags = ''; $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER); @@ -338,7 +337,7 @@ function diaspora_send(&$a,&$b) { } while ($oldbody != $body); // convert to markdown - $body = bb2diaspora($body); + $body = BBCode::toMarkdown($body); // Adding the title if(strlen($title)) diff --git a/diaspora/lang/it/messages.po b/diaspora/lang/it/messages.po index 1468e5235..8c3265dc9 100644 --- a/diaspora/lang/it/messages.po +++ b/diaspora/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014 +# fabrixxm , 2014,2018 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: 2014-09-10 11:57+0000\n" +"PO-Revision-Date: 2018-03-19 13:21+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgstr "Esporta Diaspora" #: diaspora.php:163 msgid "Enable Diaspora Post Addon" -msgstr "Abilita il addon di invio a Diaspora" +msgstr "Abilita il componente aggiuntivo di invio a Diaspora" #: diaspora.php:168 msgid "Diaspora username" diff --git a/diaspora/lang/it/strings.php b/diaspora/lang/it/strings.php index 4c1673e18..a7778c946 100644 --- a/diaspora/lang/it/strings.php +++ b/diaspora/lang/it/strings.php @@ -8,7 +8,7 @@ function string_plural_select_it($n){ $a->strings["Post to Diaspora"] = "Invia a Diaspora"; $a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Non riesco ad autenticarmi con il tuo account Diaspora. Controlla il nome utente e la password e assicurati di aver usato l'indirizzo completo (compreso \"http\" o \"https\")"; $a->strings["Diaspora Export"] = "Esporta Diaspora"; -$a->strings["Enable Diaspora Post Addon"] = "Abilita il addon di invio a Diaspora"; +$a->strings["Enable Diaspora Post Addon"] = "Abilita il componente aggiuntivo di invio a Diaspora"; $a->strings["Diaspora username"] = "Nome utente Diaspora"; $a->strings["Diaspora password"] = "Password Diaspora"; $a->strings["Diaspora site URL"] = "Indirizzo sito Diaspora"; diff --git a/dwpost/lang/it/messages.po b/dwpost/lang/it/messages.po index 8b19c2997..9ce05fe24 100644 --- a/dwpost/lang/it/messages.po +++ b/dwpost/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014 +# fabrixxm , 2014,2018 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: 2014-10-22 07:54+0000\n" +"PO-Revision-Date: 2018-03-19 13:21+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -21,15 +21,15 @@ msgstr "" #: dwpost.php:39 msgid "Post to Dreamwidth" -msgstr "Posta su Dreamwidth" +msgstr "Invia a Dreamwidth" #: dwpost.php:70 msgid "Dreamwidth Post Settings" -msgstr "Impostazioni di invio a Dreamwidth" +msgstr "Impostazioni Invio a Dreeamwidth" #: dwpost.php:72 msgid "Enable dreamwidth Post Addon" -msgstr "Abilita il addon di invio a Dreamwidth" +msgstr "Abilita il componente aggiuntivo di invio a Dreamwidth" #: dwpost.php:77 msgid "dreamwidth username" @@ -45,4 +45,4 @@ msgstr "Invia sempre a Dreamwidth" #: dwpost.php:93 msgid "Submit" -msgstr "Invia" +msgstr "Salva" diff --git a/dwpost/lang/it/strings.php b/dwpost/lang/it/strings.php index df904d620..0f40abc65 100644 --- a/dwpost/lang/it/strings.php +++ b/dwpost/lang/it/strings.php @@ -5,10 +5,10 @@ function string_plural_select_it($n){ return ($n != 1);; }} ; -$a->strings["Post to Dreamwidth"] = "Posta su Dreamwidth"; -$a->strings["Dreamwidth Post Settings"] = "Impostazioni di invio a Dreamwidth"; -$a->strings["Enable dreamwidth Post Addon"] = "Abilita il addon di invio a Dreamwidth"; +$a->strings["Post to Dreamwidth"] = "Invia a Dreamwidth"; +$a->strings["Dreamwidth Post Settings"] = "Impostazioni Invio a Dreeamwidth"; +$a->strings["Enable dreamwidth Post Addon"] = "Abilita il componente aggiuntivo di invio a Dreamwidth"; $a->strings["dreamwidth username"] = "Nome utente Dreamwidth"; $a->strings["dreamwidth password"] = "password Dreamwidth"; $a->strings["Post to dreamwidth by default"] = "Invia sempre a Dreamwidth"; -$a->strings["Submit"] = "Invia"; +$a->strings["Submit"] = "Salva"; diff --git a/forumdirectory/lang/it/messages.po b/forumdirectory/lang/it/messages.po index ca53442c3..99fbee132 100644 --- a/forumdirectory/lang/it/messages.po +++ b/forumdirectory/lang/it/messages.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-02-27 05:01-0500\n" -"PO-Revision-Date: 2014-09-10 12:04+0000\n" +"PO-Revision-Date: 2017-09-20 06:07+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/fromapp/lang/it/messages.po b/fromapp/lang/it/messages.po index 4d4914461..983eb6f99 100644 --- a/fromapp/lang/it/messages.po +++ b/fromapp/lang/it/messages.po @@ -10,7 +10,7 @@ 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-31 10:11+0000\n" +"PO-Revision-Date: 2017-09-20 06:07+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/fromgplus/lang/it/messages.po b/fromgplus/lang/it/messages.po index d47e5cb64..e064622a6 100644 --- a/fromgplus/lang/it/messages.po +++ b/fromgplus/lang/it/messages.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-12 16:52+0000\n" -"PO-Revision-Date: 2017-01-18 10:38+0000\n" +"PO-Revision-Date: 2017-09-20 06:07+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/geonames/lang/it/messages.po b/geonames/lang/it/messages.po index 94f4c2693..f186dd42e 100644 --- a/geonames/lang/it/messages.po +++ b/geonames/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014-2015 +# fabrixxm , 2014-2015,2018 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: 2015-08-31 10:12+0000\n" +"PO-Revision-Date: 2018-03-19 13:22+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgstr "Impostazioni Geonames" #: geonames.php:181 msgid "Enable Geonames Addon" -msgstr "Abilita addon Geonames" +msgstr "Abilita componente aggiuntivo Geonames" #: geonames.php:187 msgid "Submit" diff --git a/geonames/lang/it/strings.php b/geonames/lang/it/strings.php index c50e83455..33148f6ba 100644 --- a/geonames/lang/it/strings.php +++ b/geonames/lang/it/strings.php @@ -7,5 +7,5 @@ function string_plural_select_it($n){ ; $a->strings["Geonames settings updated."] = "Impostazioni di Geonames aggiornate."; $a->strings["Geonames Settings"] = "Impostazioni Geonames"; -$a->strings["Enable Geonames Addon"] = "Abilita addon Geonames"; +$a->strings["Enable Geonames Addon"] = "Abilita componente aggiuntivo Geonames"; $a->strings["Submit"] = "Invia"; diff --git a/gnot/lang/it/messages.po b/gnot/lang/it/messages.po index e8ea90055..4c200ede1 100644 --- a/gnot/lang/it/messages.po +++ b/gnot/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014-2015 +# fabrixxm , 2014-2015,2018 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: 2015-08-31 10:12+0000\n" +"PO-Revision-Date: 2018-03-19 13:22+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgstr "Permetti di raggruppare le notifiche dei commenti in thread su Gmail e a #: gnot.php:82 msgid "Enable this addon?" -msgstr "Abilita questo addon?" +msgstr "Abilita questo componente aggiuntivo?" #: gnot.php:88 msgid "Submit" diff --git a/gnot/lang/it/strings.php b/gnot/lang/it/strings.php index 78c368cac..c38bac29b 100644 --- a/gnot/lang/it/strings.php +++ b/gnot/lang/it/strings.php @@ -8,6 +8,6 @@ function string_plural_select_it($n){ $a->strings["Gnot settings updated."] = "Impostazioni di \"Gnot\" aggiornate."; $a->strings["Gnot Settings"] = "Impostazioni Gnot"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permetti di raggruppare le notifiche dei commenti in thread su Gmail e anonimizza l'oggetto"; -$a->strings["Enable this addon?"] = "Abilita questo addon?"; +$a->strings["Enable this addon?"] = "Abilita questo componente aggiuntivo?"; $a->strings["Submit"] = "Invia"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notifica] Commento alla conversazione n° %d"; diff --git a/gravatar/lang/it/messages.po b/gravatar/lang/it/messages.po index 589b0e4ac..d1a867a64 100644 --- a/gravatar/lang/it/messages.po +++ b/gravatar/lang/it/messages.po @@ -10,7 +10,7 @@ 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-31 10:12+0000\n" +"PO-Revision-Date: 2017-09-20 06:08+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/group_text/lang/it/messages.po b/group_text/lang/it/messages.po index 9f42598f1..908715593 100644 --- a/group_text/lang/it/messages.po +++ b/group_text/lang/it/messages.po @@ -10,7 +10,7 @@ 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-31 10:12+0000\n" +"PO-Revision-Date: 2017-09-20 06:08+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/ijpost/lang/it/messages.po b/ijpost/lang/it/messages.po index 79578b34b..a98a2be32 100644 --- a/ijpost/lang/it/messages.po +++ b/ijpost/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014-2015 +# fabrixxm , 2014-2015,2018 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: 2015-08-31 10:15+0000\n" +"PO-Revision-Date: 2018-03-19 13:22+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgstr "Impostazioni post InsaneJournal" #: ijpost.php:72 msgid "Enable InsaneJournal Post Addon" -msgstr "Abilita iladdondi invio a InsaneJournal" +msgstr "Abilita il componente aggiuntivo di invio a InsaneJournal" #: ijpost.php:77 msgid "InsaneJournal username" diff --git a/ijpost/lang/it/strings.php b/ijpost/lang/it/strings.php index 2f26bb932..d8bd49e98 100644 --- a/ijpost/lang/it/strings.php +++ b/ijpost/lang/it/strings.php @@ -7,7 +7,7 @@ function string_plural_select_it($n){ ; $a->strings["Post to Insanejournal"] = "Invia a InsaneJournal"; $a->strings["InsaneJournal Post Settings"] = "Impostazioni post InsaneJournal"; -$a->strings["Enable InsaneJournal Post Addon"] = "Abilita il addon di invio a InsaneJournal"; +$a->strings["Enable InsaneJournal Post Addon"] = "Abilita il componente aggiuntivo di invio a InsaneJournal"; $a->strings["InsaneJournal username"] = "Nome utente InsaneJournal"; $a->strings["InsaneJournal password"] = "Password InsaneJournal"; $a->strings["Post to InsaneJournal by default"] = "Invia sempre a InsaneJournal"; diff --git a/impressum/lang/it/messages.po b/impressum/lang/it/messages.po index 5fafbbcaa..60f25ac58 100644 --- a/impressum/lang/it/messages.po +++ b/impressum/lang/it/messages.po @@ -10,7 +10,7 @@ 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-31 10:15+0000\n" +"PO-Revision-Date: 2017-09-20 06:08+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -40,7 +40,7 @@ msgid "" "The impressum addon needs to be configured!
Please add at least the " "owner variable to your config file. For other variables please " "refer to the README file of the addon." -msgstr "IladdonColophon deve essere configurato!
Aggiungi almeno il Proprietario del sito." +msgstr "Il plugin Colophon deve essere configurato!
Aggiungi almeno il Proprietario del sito." #: impressum.php:78 msgid "Settings updated." diff --git a/impressum/lang/it/strings.php b/impressum/lang/it/strings.php index ce51610f9..25f3b1bea 100644 --- a/impressum/lang/it/strings.php +++ b/impressum/lang/it/strings.php @@ -9,7 +9,7 @@ $a->strings["Impressum"] = "Colophon"; $a->strings["Site Owner"] = "Proprietario del sito"; $a->strings["Email Address"] = "Indirizzo email"; $a->strings["Postal Address"] = "Indirizzo"; -$a->strings["The impressum addon needs to be configured!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "Il addon Colophon deve essere configurato!
Aggiungi almeno il Proprietario del sito."; +$a->strings["The impressum addon needs to be configured!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "Il plugin Colophon deve essere configurato!
Aggiungi almeno il Proprietario del sito."; $a->strings["Settings updated."] = "Impostazioni aggiornate."; $a->strings["Submit"] = "Invia"; $a->strings["The page operators name."] = "Nome del gestore della pagina."; diff --git a/infiniteimprobabilitydrive/lang/it/messages.po b/infiniteimprobabilitydrive/lang/it/messages.po index 2b68b0123..be86c98b2 100644 --- a/infiniteimprobabilitydrive/lang/it/messages.po +++ b/infiniteimprobabilitydrive/lang/it/messages.po @@ -9,8 +9,8 @@ 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: 2014-09-10 12:23+0000\n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: 2017-09-20 06:08+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/irc/lang/it/messages.po b/irc/lang/it/messages.po index 1967c3f89..69d28e894 100644 --- a/irc/lang/it/messages.po +++ b/irc/lang/it/messages.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-08 13:17+0200\n" -"PO-Revision-Date: 2015-08-31 10:17+0000\n" +"PO-Revision-Date: 2017-09-20 06:08+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/jappixmini/lang/it/messages.po b/jappixmini/lang/it/messages.po index 5633930f2..620e1db8f 100644 --- a/jappixmini/lang/it/messages.po +++ b/jappixmini/lang/it/messages.po @@ -10,7 +10,7 @@ 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-31 10:18+0000\n" +"PO-Revision-Date: 2017-09-20 06:08+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" #: jappixmini.php:266 msgid "Jappix Mini addon settings" -msgstr "ImpostazioniaddonJappix Mini" +msgstr "Impostazioni plugin Jappix Mini" #: jappixmini.php:268 msgid "Activate addon" -msgstr "Abilita addon" +msgstr "Abilita plugin" #: jappixmini.php:271 msgid "" diff --git a/jappixmini/lang/it/strings.php b/jappixmini/lang/it/strings.php index 892e1c724..51f6b7949 100644 --- a/jappixmini/lang/it/strings.php +++ b/jappixmini/lang/it/strings.php @@ -5,8 +5,8 @@ function string_plural_select_it($n){ return ($n != 1);; }} ; -$a->strings["Jappix Mini addon settings"] = "Impostazioni addon Jappix Mini"; -$a->strings["Activate addon"] = "Abilita addon"; +$a->strings["Jappix Mini addon settings"] = "Impostazioni plugin Jappix Mini"; +$a->strings["Activate addon"] = "Abilita plugin"; $a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "Non inserire Jappixmini nell'intrerfaccia web"; $a->strings["Jabber username"] = "Nome utente Jabber"; $a->strings["Jabber server"] = "Server Jabber"; diff --git a/js_upload/lang/it/messages.po b/js_upload/lang/it/messages.po index 5d8fe6875..e529fb543 100644 --- a/js_upload/lang/it/messages.po +++ b/js_upload/lang/it/messages.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-02-27 05:01-0500\n" -"PO-Revision-Date: 2014-09-10 12:26+0000\n" +"PO-Revision-Date: 2017-09-20 06:08+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/krynn/lang/it/messages.po b/krynn/lang/it/messages.po index 4d70b47bf..37eacb547 100644 --- a/krynn/lang/it/messages.po +++ b/krynn/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2015 +# fabrixxm , 2015,2018 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: 2015-08-31 11:55+0000\n" +"PO-Revision-Date: 2018-03-19 13:22+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "Impostazioni Krynn" #: krynn.php:152 msgid "Enable Krynn Addon" -msgstr "AbilitaaddonKrynn" +msgstr "Abilita componente aggiuntivo Krynn" #: krynn.php:158 msgid "Submit" diff --git a/krynn/lang/it/strings.php b/krynn/lang/it/strings.php index 753fe7a7f..9c6f59bed 100644 --- a/krynn/lang/it/strings.php +++ b/krynn/lang/it/strings.php @@ -6,5 +6,5 @@ function string_plural_select_it($n){ }} ; $a->strings["Krynn Settings"] = "Impostazioni Krynn"; -$a->strings["Enable Krynn Addon"] = "Abilita addon Krynn"; +$a->strings["Enable Krynn Addon"] = "Abilita componente aggiuntivo Krynn"; $a->strings["Submit"] = "Invia"; diff --git a/langfilter/lang/it/messages.po b/langfilter/lang/it/messages.po index e446717ad..452632dce 100644 --- a/langfilter/lang/it/messages.po +++ b/langfilter/lang/it/messages.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-22 15:18+0200\n" -"PO-Revision-Date: 2015-12-14 10:47+0000\n" +"PO-Revision-Date: 2017-09-22 12:16+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgid "" "match any language spoken by you (see below) the posting will be collapsed. " "Remember detecting the language is not perfect, especially with short " "postings." -msgstr "Questo addon prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti." +msgstr "Questo plugin prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti." #: langfilter.php:46 msgid "Use the language filter" diff --git a/langfilter/lang/it/strings.php b/langfilter/lang/it/strings.php index b94ab8125..ecb7b8d31 100644 --- a/langfilter/lang/it/strings.php +++ b/langfilter/lang/it/strings.php @@ -6,7 +6,7 @@ function string_plural_select_it($n){ }} ; $a->strings["Language Filter"] = "Filtro Lingua"; -$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Questo addon prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti."; +$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Questo plugin prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti."; $a->strings["Use the language filter"] = "Usa il filtro lingua"; $a->strings["I speak"] = "Parlo"; $a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lista di abbreviazioni (codici iso2) per le lingue che parli, separate da virgola. Per esempio \"it,de\""; diff --git a/langfilter/lang/nl/messages.po b/langfilter/lang/nl/messages.po new file mode 100644 index 000000000..28f7c8d63 --- /dev/null +++ b/langfilter/lang/nl/messages.po @@ -0,0 +1,70 @@ +# ADDON langfilter +# Copyright (C) +# This file is distributed under the same license as the Friendica langfilter addon package. +# +# +# Translators: +# Karel Vandecandelaere , 2018 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-09-22 15:18+0200\n" +"PO-Revision-Date: 2018-03-20 13:46+0000\n" +"Last-Translator: Karel Vandecandelaere \n" +"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: langfilter.php:44 +msgid "Language Filter" +msgstr "Taalfilter" + +#: langfilter.php:45 +msgid "" +"This addon tries to identify the language of a postings. If it does not " +"match any language spoken by you (see below) the posting will be collapsed. " +"Remember detecting the language is not perfect, especially with short " +"postings." +msgstr "Deze addon probeert de taal van berichten automatisch te bepalen. Als het niet overeenkomt met een taal die jij spreekt (zie verder) zal het bericht worden verborgen. Onthoudt hierbij wel dat taaldetectie niet perfect is, vooral bij korte berichten." + +#: langfilter.php:46 +msgid "Use the language filter" +msgstr "Gebruik de taalfilter" + +#: langfilter.php:47 +msgid "I speak" +msgstr "Ik spreek" + +#: langfilter.php:47 +msgid "" +"List of abbreviations (iso2 codes) for languages you speak, comma separated." +" For example \"de,it\"." +msgstr "Lijst van afkortingen (ISO2 codes) voor talen die jij spreekt, door komma's gescheiden. Bijvoorbeeld \"de,it\"." + +#: langfilter.php:48 +msgid "Minimum confidence in language detection" +msgstr "" + +#: langfilter.php:48 +msgid "" +"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." +msgstr "" + +#: langfilter.php:49 +msgid "Save Settings" +msgstr "Instellingen opslaan" + +#: langfilter.php:73 +msgid "Language Filter Settings saved." +msgstr "Taalfilter-instellingen bijgewerkt." + +#: langfilter.php:123 +#, php-format +msgid "unspoken language %s - Click to open/close" +msgstr "niet gesproken taal %s - Klik om open/dicht te klappen" diff --git a/langfilter/lang/nl/strings.php b/langfilter/lang/nl/strings.php new file mode 100644 index 000000000..17bb8d22b --- /dev/null +++ b/langfilter/lang/nl/strings.php @@ -0,0 +1,17 @@ +strings["Language Filter"] = "Taalfilter"; +$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Deze addon probeert de taal van berichten automatisch te bepalen. Als het niet overeenkomt met een taal die jij spreekt (zie verder) zal het bericht worden verborgen. Onthoudt hierbij wel dat taaldetectie niet perfect is, vooral bij korte berichten."; +$a->strings["Use the language filter"] = "Gebruik de taalfilter"; +$a->strings["I speak"] = "Ik spreek"; +$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lijst van afkortingen (ISO2 codes) voor talen die jij spreekt, door komma's gescheiden. Bijvoorbeeld \"de,it\"."; +$a->strings["Minimum confidence in language detection"] = ""; +$a->strings["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."] = ""; +$a->strings["Save Settings"] = "Instellingen opslaan"; +$a->strings["Language Filter Settings saved."] = "Taalfilter-instellingen bijgewerkt."; +$a->strings["unspoken language %s - Click to open/close"] = "niet gesproken taal %s - Klik om open/dicht te klappen"; diff --git a/libertree/lang/it/messages.po b/libertree/lang/it/messages.po index 358956883..a13219a6c 100644 --- a/libertree/lang/it/messages.po +++ b/libertree/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014-2015 +# fabrixxm , 2014-2015,2018 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: 2015-08-31 10:18+0000\n" +"PO-Revision-Date: 2018-03-19 13:22+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgstr "Impostazioni di invio a Libertree" #: libertree.php:69 msgid "Enable Libertree Post Addon" -msgstr "Abilita iladdondi invio a Libertree" +msgstr "Abilita il componente aggiuntivo di invio a Libertree" #: libertree.php:74 msgid "Libertree API token" diff --git a/libertree/lang/it/strings.php b/libertree/lang/it/strings.php index ca0b50fac..91984f9d5 100644 --- a/libertree/lang/it/strings.php +++ b/libertree/lang/it/strings.php @@ -7,7 +7,7 @@ function string_plural_select_it($n){ ; $a->strings["Post to libertree"] = "Invia a Libertree"; $a->strings["libertree Post Settings"] = "Impostazioni di invio a Libertree"; -$a->strings["Enable Libertree Post Addon"] = "Abilita il addon di invio a Libertree"; +$a->strings["Enable Libertree Post Addon"] = "Abilita il componente aggiuntivo di invio a Libertree"; $a->strings["Libertree API token"] = "Token API Libertree"; $a->strings["Libertree site URL"] = "Indirizzo sito Libertree"; $a->strings["Post to Libertree by default"] = "Invia sempre a Libertree"; diff --git a/libertree/libertree.php b/libertree/libertree.php index 068512384..4d159bf08 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -5,6 +5,8 @@ * Version: 1.0 * Author: Tony Baldwin */ + +use Friendica\Content\Text\BBCode; use Friendica\Core\Addon; use Friendica\Core\L10n; use Friendica\Core\PConfig; @@ -184,8 +186,6 @@ function libertree_send(&$a,&$b) { $ltree_source .= " (".$b['app'].")"; if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) { - - require_once('include/bb2diaspora.php'); $tag_arr = []; $tags = ''; $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER); @@ -217,7 +217,7 @@ function libertree_send(&$a,&$b) { } while ($oldbody != $body); // convert to markdown - $body = bb2diaspora($body, false); + $body = BBCode::toMarkdown($body, false); // Adding the title if(strlen($title)) diff --git a/libravatar/lang/it/messages.po b/libravatar/lang/it/messages.po index 645a500b6..6fd10f304 100644 --- a/libravatar/lang/it/messages.po +++ b/libravatar/lang/it/messages.po @@ -10,7 +10,7 @@ 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-31 10:19+0000\n" +"PO-Revision-Date: 2017-09-20 06:08+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/ljpost/lang/it/messages.po b/ljpost/lang/it/messages.po index fb6f3493f..b7e70700f 100644 --- a/ljpost/lang/it/messages.po +++ b/ljpost/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014-2015 +# fabrixxm , 2014-2015,2018 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: 2015-08-31 10:19+0000\n" +"PO-Revision-Date: 2018-03-19 13:23+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgstr "Impostazioni invio a LiveJournal" #: ljpost.php:72 msgid "Enable LiveJournal Post Addon" -msgstr "Abilita il addon di invio a LiveJournal" +msgstr "Abilita il componente aggiuntivo di invio a LiveJournal" #: ljpost.php:77 msgid "LiveJournal username" diff --git a/ljpost/lang/it/strings.php b/ljpost/lang/it/strings.php index 041d4077d..54f5fac58 100644 --- a/ljpost/lang/it/strings.php +++ b/ljpost/lang/it/strings.php @@ -7,7 +7,7 @@ function string_plural_select_it($n){ ; $a->strings["Post to LiveJournal"] = "Invia a LiveJournal"; $a->strings["LiveJournal Post Settings"] = "Impostazioni invio a LiveJournal"; -$a->strings["Enable LiveJournal Post Addon"] = "Abilita il addon di invio a LiveJournal"; +$a->strings["Enable LiveJournal Post Addon"] = "Abilita il componente aggiuntivo di invio a LiveJournal"; $a->strings["LiveJournal username"] = "Nome utente LiveJournal"; $a->strings["LiveJournal password"] = "Password LiveJournal"; $a->strings["Post to LiveJournal by default"] = "Invia sempre a LiveJournal"; diff --git a/mailstream/lang/C/messages.po b/mailstream/lang/C/messages.po index ac528cc60..80344780c 100644 --- a/mailstream/lang/C/messages.po +++ b/mailstream/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 14:45+0200\n" +"POT-Creation-Date: 2018-03-11 19:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,62 +17,80 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: mailstream.php:55 +#: mailstream.php:77 msgid "From Address" msgstr "" -#: mailstream.php:57 +#: mailstream.php:79 msgid "Email address that stream items will appear to be from." msgstr "" -#: mailstream.php:60 mailstream.php:282 +#: mailstream.php:82 mailstream.php:380 msgid "Save Settings" msgstr "" -#: mailstream.php:165 +#: mailstream.php:223 msgid "Re:" msgstr "" -#: mailstream.php:173 +#: mailstream.php:231 msgid "Friendica post" msgstr "" -#: mailstream.php:176 +#: mailstream.php:234 msgid "Diaspora post" msgstr "" -#: mailstream.php:183 +#: mailstream.php:244 msgid "Feed item" msgstr "" -#: mailstream.php:186 +#: mailstream.php:247 msgid "Email" msgstr "" -#: mailstream.php:188 +#: mailstream.php:249 msgid "Friendica Item" msgstr "" -#: mailstream.php:229 +#: mailstream.php:293 msgid "Upstream" msgstr "" -#: mailstream.php:230 +#: mailstream.php:294 msgid "Local" msgstr "" -#: mailstream.php:274 -msgid "Email Address" -msgstr "" - -#: mailstream.php:276 -msgid "Leave blank to use your account email address" -msgstr "" - -#: mailstream.php:279 +#: mailstream.php:362 msgid "Enabled" msgstr "" -#: mailstream.php:281 +#: mailstream.php:366 +msgid "Email Address" +msgstr "" + +#: mailstream.php:368 +msgid "Leave blank to use your account email address" +msgstr "" + +#: mailstream.php:371 +msgid "Exclude Likes" +msgstr "" + +#: mailstream.php:373 +msgid "Check this to omit mailing \"Like\" notifications" +msgstr "" + +#: mailstream.php:376 +msgid "Attach Images" +msgstr "" + +#: mailstream.php:378 +msgid "" +"Download images in posts and attach them to the email. Useful for reading " +"email while offline." +msgstr "" + +#: mailstream.php:379 msgid "Mail Stream Settings" msgstr "" diff --git a/mailstream/lang/de/messages.po b/mailstream/lang/de/messages.po index f23ff1069..bf170ba28 100644 --- a/mailstream/lang/de/messages.po +++ b/mailstream/lang/de/messages.po @@ -4,77 +4,96 @@ # # # Translators: -# Abrax , 2014 +# Andreas H., 2014 +# Tobias Diekershoff , 2018 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 14:45+0200\n" -"PO-Revision-Date: 2014-10-14 09:25+0000\n" -"Last-Translator: Abrax \n" -"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" +"POT-Creation-Date: 2018-03-11 19:13+0100\n" +"PO-Revision-Date: 2018-03-16 07:45+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" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mailstream.php:55 +#: mailstream.php:77 msgid "From Address" msgstr "Absender" -#: mailstream.php:57 +#: mailstream.php:79 msgid "Email address that stream items will appear to be from." msgstr "E-Mail-Adresse, die in hochgeladenen Artikeln erscheint." -#: mailstream.php:60 mailstream.php:282 +#: mailstream.php:82 mailstream.php:380 msgid "Save Settings" msgstr "Einstellungen speichern" -#: mailstream.php:165 +#: mailstream.php:223 msgid "Re:" msgstr "Re:" -#: mailstream.php:173 +#: mailstream.php:231 msgid "Friendica post" msgstr "Friendica Veröffentlichung" -#: mailstream.php:176 +#: mailstream.php:234 msgid "Diaspora post" msgstr "Diaspora Veröffentlichung" -#: mailstream.php:183 +#: mailstream.php:244 msgid "Feed item" msgstr "Artikel-Feed" -#: mailstream.php:186 +#: mailstream.php:247 msgid "Email" msgstr "E-Mail" -#: mailstream.php:188 +#: mailstream.php:249 msgid "Friendica Item" msgstr "Friendica Artikel" -#: mailstream.php:229 +#: mailstream.php:293 msgid "Upstream" msgstr "Upstream" -#: mailstream.php:230 +#: mailstream.php:294 msgid "Local" msgstr "Lokal" -#: mailstream.php:274 -msgid "Email Address" -msgstr "E-Mail-Adresse" - -#: mailstream.php:276 -msgid "Leave blank to use your account email address" -msgstr "Leer lassen für Deine Konto-E-Mail-Addresse" - -#: mailstream.php:279 +#: mailstream.php:362 msgid "Enabled" msgstr "eingeschaltet" -#: mailstream.php:281 +#: mailstream.php:366 +msgid "Email Address" +msgstr "E-Mail-Adresse" + +#: mailstream.php:368 +msgid "Leave blank to use your account email address" +msgstr "Leer lassen für Deine Konto-E-Mail-Addresse" + +#: mailstream.php:371 +msgid "Exclude Likes" +msgstr "Likes ignorieren" + +#: mailstream.php:373 +msgid "Check this to omit mailing \"Like\" notifications" +msgstr "Diese Option verhindert das versenden von \"Like\"-Benachrichtigungen per E-Mail." + +#: mailstream.php:376 +msgid "Attach Images" +msgstr "Bolder anhängen" + +#: mailstream.php:378 +msgid "" +"Download images in posts and attach them to the email. Useful for reading " +"email while offline." +msgstr "Sollen Bilder die im Beitrag eingebettet sind als Dateianhang in den E-Mails mit verschickt werden?" + +#: mailstream.php:379 msgid "Mail Stream Settings" msgstr "Mail-Nachrichten Einstellungen" diff --git a/mailstream/lang/de/strings.php b/mailstream/lang/de/strings.php index d838f4dc3..90e9210d9 100644 --- a/mailstream/lang/de/strings.php +++ b/mailstream/lang/de/strings.php @@ -16,7 +16,11 @@ $a->strings["Email"] = "E-Mail"; $a->strings["Friendica Item"] = "Friendica Artikel"; $a->strings["Upstream"] = "Upstream"; $a->strings["Local"] = "Lokal"; +$a->strings["Enabled"] = "eingeschaltet"; $a->strings["Email Address"] = "E-Mail-Adresse"; $a->strings["Leave blank to use your account email address"] = "Leer lassen für Deine Konto-E-Mail-Addresse"; -$a->strings["Enabled"] = "eingeschaltet"; +$a->strings["Exclude Likes"] = "Likes ignorieren"; +$a->strings["Check this to omit mailing \"Like\" notifications"] = "Diese Option verhindert das versenden von \"Like\"-Benachrichtigungen per E-Mail."; +$a->strings["Attach Images"] = "Bolder anhängen"; +$a->strings["Download images in posts and attach them to the email. Useful for reading email while offline."] = "Sollen Bilder die im Beitrag eingebettet sind als Dateianhang in den E-Mails mit verschickt werden?"; $a->strings["Mail Stream Settings"] = "Mail-Nachrichten Einstellungen"; diff --git a/mailstream/lang/it/messages.po b/mailstream/lang/it/messages.po index 6ee63621c..2d05f1201 100644 --- a/mailstream/lang/it/messages.po +++ b/mailstream/lang/it/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# fabrixxm , 2014 +# fabrixxm , 2014,2018 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 14:45+0200\n" -"PO-Revision-Date: 2014-09-10 13:02+0000\n" +"POT-Creation-Date: 2018-03-11 19:13+0100\n" +"PO-Revision-Date: 2018-03-19 13:12+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -19,62 +19,80 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mailstream.php:55 +#: mailstream.php:77 msgid "From Address" msgstr "Indirizzo di invio" -#: mailstream.php:57 +#: mailstream.php:79 msgid "Email address that stream items will appear to be from." msgstr "Indirizzo email da cui i messaggi appariranno inviati" -#: mailstream.php:60 mailstream.php:282 +#: mailstream.php:82 mailstream.php:380 msgid "Save Settings" msgstr "Salva Impostazioni" -#: mailstream.php:165 +#: mailstream.php:223 msgid "Re:" msgstr "R:" -#: mailstream.php:173 +#: mailstream.php:231 msgid "Friendica post" msgstr "Messaggio Friendica" -#: mailstream.php:176 +#: mailstream.php:234 msgid "Diaspora post" msgstr "Messaggio Diaspora" -#: mailstream.php:183 +#: mailstream.php:244 msgid "Feed item" msgstr "Elemento da feed" -#: mailstream.php:186 +#: mailstream.php:247 msgid "Email" msgstr "Email" -#: mailstream.php:188 +#: mailstream.php:249 msgid "Friendica Item" msgstr "Elemento da Friendica" -#: mailstream.php:229 +#: mailstream.php:293 msgid "Upstream" msgstr "Upstream" -#: mailstream.php:230 +#: mailstream.php:294 msgid "Local" msgstr "Locale" -#: mailstream.php:274 -msgid "Email Address" -msgstr "Indirizzo Email" - -#: mailstream.php:276 -msgid "Leave blank to use your account email address" -msgstr "Lascia in bianco per usare l'indirizzo email del tuo account" - -#: mailstream.php:279 +#: mailstream.php:362 msgid "Enabled" msgstr "Abilitato" -#: mailstream.php:281 +#: mailstream.php:366 +msgid "Email Address" +msgstr "Indirizzo Email" + +#: mailstream.php:368 +msgid "Leave blank to use your account email address" +msgstr "Lascia in bianco per usare l'indirizzo email del tuo account" + +#: mailstream.php:371 +msgid "Exclude Likes" +msgstr "Escludi \"Mi Piace\"" + +#: mailstream.php:373 +msgid "Check this to omit mailing \"Like\" notifications" +msgstr "Seleziona per evitare di inviare notifiche per \"Mi Piace\"" + +#: mailstream.php:376 +msgid "Attach Images" +msgstr "Allega Immagini" + +#: mailstream.php:378 +msgid "" +"Download images in posts and attach them to the email. Useful for reading " +"email while offline." +msgstr "Scarica le immagini nei messaggi e le allega alle email. Utile per leggere le email mentre si è offline." + +#: mailstream.php:379 msgid "Mail Stream Settings" msgstr "Impostazioni Mail Stream" diff --git a/mailstream/lang/it/strings.php b/mailstream/lang/it/strings.php index 7c8402bbf..a6a482876 100644 --- a/mailstream/lang/it/strings.php +++ b/mailstream/lang/it/strings.php @@ -16,7 +16,11 @@ $a->strings["Email"] = "Email"; $a->strings["Friendica Item"] = "Elemento da Friendica"; $a->strings["Upstream"] = "Upstream"; $a->strings["Local"] = "Locale"; +$a->strings["Enabled"] = "Abilitato"; $a->strings["Email Address"] = "Indirizzo Email"; $a->strings["Leave blank to use your account email address"] = "Lascia in bianco per usare l'indirizzo email del tuo account"; -$a->strings["Enabled"] = "Abilitato"; +$a->strings["Exclude Likes"] = "Escludi \"Mi Piace\""; +$a->strings["Check this to omit mailing \"Like\" notifications"] = "Seleziona per evitare di inviare notifiche per \"Mi Piace\""; +$a->strings["Attach Images"] = "Allega Immagini"; +$a->strings["Download images in posts and attach them to the email. Useful for reading email while offline."] = "Scarica le immagini nei messaggi e le allega alle email. Utile per leggere le email mentre si è offline."; $a->strings["Mail Stream Settings"] = "Impostazioni Mail Stream"; diff --git a/mailstream/templates/settings.tpl b/mailstream/templates/settings.tpl index 376108285..599837bab 100644 --- a/mailstream/templates/settings.tpl +++ b/mailstream/templates/settings.tpl @@ -1,5 +1,10 @@ -
-

{{$title}}

+ +

{{$title}}

+
+