Merge remote-tracking branch 'upstream/master' into 1601-gcontact

pull/335/head
Michael Vogel 2016-01-08 13:20:04 +01:00
commit e59e019fa1
11 changed files with 101 additions and 33 deletions

View File

@ -0,0 +1,40 @@
# ADDON appnetpost
# Copyright (C)
# This file is distributed under the same license as the Friendica appnetpost addon package.
#
#
# Translators:
# André Alves <and2099@riseup.net>, 2016
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: 2016-01-03 06:26+0000\n"
"Last-Translator: André Alves <and2099@riseup.net>\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"
"Content-Transfer-Encoding: 8bit\n"
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: appnetpost.php:37
msgid "Post to app.net"
msgstr ""
#: appnetpost.php:59 appnetpost.php:63
msgid "App.net Export"
msgstr "Exportar de App.net"
#: appnetpost.php:67
msgid "Enable App.net Post Plugin"
msgstr "Habilitar Plugin de publicação App.net"
#: appnetpost.php:72
msgid "Post to App.net by default"
msgstr "Postar em App.net por padrão"
#: appnetpost.php:78
msgid "Save Settings"
msgstr "Salvar Configurações"

View File

@ -0,0 +1,12 @@
<?php
if(! function_exists("string_plural_select_pt_br")) {
function string_plural_select_pt_br($n){
return ($n > 1);;
}}
;
$a->strings["Post to app.net"] = "";
$a->strings["App.net Export"] = "Exportar de App.net";
$a->strings["Enable App.net Post Plugin"] = "Habilitar Plugin de publicação App.net";
$a->strings["Post to App.net by default"] = "Postar em App.net por padrão";
$a->strings["Save Settings"] = "Salvar Configurações";

View File

@ -4,15 +4,16 @@
# #
# #
# Translators: # Translators:
# André Alves <and2099@riseup.net>, 2016
# Rui Andrada <shingonoide@gmail.com>, 2015 # Rui Andrada <shingonoide@gmail.com>, 2015
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-06-22 13:18+0200\n" "POT-Creation-Date: 2014-06-22 13:18+0200\n"
"PO-Revision-Date: 2015-04-13 13:18+0000\n" "PO-Revision-Date: 2016-01-03 06:19+0000\n"
"Last-Translator: Rui Andrada <shingonoide@gmail.com>\n" "Last-Translator: André Alves <and2099@riseup.net>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/friendica/language/pt_BR/)\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/Friendica/friendica/language/pt_BR/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
@ -37,7 +38,7 @@ msgstr ""
#: buffer.php:67 #: buffer.php:67
msgid "Error when registering buffer connection:" msgid "Error when registering buffer connection:"
msgstr "" msgstr "Erro ao registrar conexão de buffer:"
#: buffer.php:86 #: buffer.php:86
msgid "You are now authenticated to buffer. " msgid "You are now authenticated to buffer. "
@ -57,7 +58,7 @@ msgstr "Exportar Buffer"
#: buffer.php:142 #: buffer.php:142
msgid "Authenticate your Buffer connection" msgid "Authenticate your Buffer connection"
msgstr "" msgstr "Autenticar sua conexão de Buffer"
#: buffer.php:146 #: buffer.php:146
msgid "Enable Buffer Post Plugin" msgid "Enable Buffer Post Plugin"

View File

@ -9,12 +9,12 @@ $a->strings["Permission denied."] = "Permissão negada.";
$a->strings["Save Settings"] = "Salvar configurações"; $a->strings["Save Settings"] = "Salvar configurações";
$a->strings["Client ID"] = ""; $a->strings["Client ID"] = "";
$a->strings["Client Secret"] = ""; $a->strings["Client Secret"] = "";
$a->strings["Error when registering buffer connection:"] = ""; $a->strings["Error when registering buffer connection:"] = "Erro ao registrar conexão de buffer:";
$a->strings["You are now authenticated to buffer. "] = "Você está autenticado no buffer."; $a->strings["You are now authenticated to buffer. "] = "Você está autenticado no buffer.";
$a->strings["return to the connector page"] = "Volte a página de conectores."; $a->strings["return to the connector page"] = "Volte a página de conectores.";
$a->strings["Post to Buffer"] = "Publicar no Buffer"; $a->strings["Post to Buffer"] = "Publicar no Buffer";
$a->strings["Buffer Export"] = "Exportar Buffer"; $a->strings["Buffer Export"] = "Exportar Buffer";
$a->strings["Authenticate your Buffer connection"] = ""; $a->strings["Authenticate your Buffer connection"] = "Autenticar sua conexão de Buffer";
$a->strings["Enable Buffer Post Plugin"] = "Habilita plugin para publicar no Buffer"; $a->strings["Enable Buffer Post Plugin"] = "Habilita plugin para publicar no Buffer";
$a->strings["Post to Buffer by default"] = "Publica no Buffer por padrão"; $a->strings["Post to Buffer by default"] = "Publica no Buffer por padrão";
$a->strings["Check to delete this preset"] = "Marque para excluir este perfil"; $a->strings["Check to delete this preset"] = "Marque para excluir este perfil";

View File

@ -10,9 +10,9 @@ msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-27 05:01-0500\n" "POT-Creation-Date: 2013-02-27 05:01-0500\n"
"PO-Revision-Date: 2014-09-10 11:55+0000\n" "PO-Revision-Date: 2015-12-14 11:10+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n" "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

View File

@ -10,9 +10,9 @@ msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-27 05:01-0500\n" "POT-Creation-Date: 2013-02-27 05:01-0500\n"
"PO-Revision-Date: 2014-10-22 07:55+0000\n" "PO-Revision-Date: 2015-12-14 11:14+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n" "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

View File

@ -5,12 +5,13 @@
# #
# Translators: # Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2015 # fabrixxm <fabrix.xm@gmail.com>, 2015
# Sandro Santilli <strk@keybit.net>, 2015
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-07-24 19:11+0200\n" "POT-Creation-Date: 2015-09-22 15:18+0200\n"
"PO-Revision-Date: 2015-08-31 11:58+0000\n" "PO-Revision-Date: 2015-12-14 10:47+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n" "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -19,11 +20,11 @@ msgstr ""
"Language: it\n" "Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: langfilter.php:43 #: langfilter.php:44
msgid "Language Filter" msgid "Language Filter"
msgstr "Filtro Lingua" msgstr "Filtro Lingua"
#: langfilter.php:44 #: langfilter.php:45
msgid "" msgid ""
"This addon tries to identify the language of a postings. If it does not " "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. " "match any language spoken by you (see below) the posting will be collapsed. "
@ -31,29 +32,40 @@ msgid ""
"postings." "postings."
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." 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:45 #: langfilter.php:46
msgid "Use the language filter" msgid "Use the language filter"
msgstr "Usa il filtro lingua" msgstr "Usa il filtro lingua"
#: langfilter.php:46 #: langfilter.php:47
msgid "I speak" msgid "I speak"
msgstr "I parlo" msgstr "Parlo"
#: langfilter.php:46
msgid ""
"List of abbreviations for languages you speak, comma seperated. For excample"
" \"de,it\"."
msgstr "Lista di abbreviazioni per le lingue che parli, separate da virgola. Per esempio \"it,de\""
#: langfilter.php:47 #: langfilter.php:47
msgid ""
"List of abbreviations (iso2 codes) for languages you speak, comma separated."
" For example \"de,it\"."
msgstr "Lista di abbreviazioni (codici iso2) per le lingue che parli, separate da virgola. Per esempio \"it,de\""
#: langfilter.php:48
msgid "Minimum confidence in language detection"
msgstr "Fiducia minima nel rilevamento della lingua"
#: 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 "Fiducia minima che il rilevamento della lingua sia corretto, da 0 a 100. I post non saranno filtrati quando la fiducia nel rilevamento della lingua è sotto questo valore percentuale."
#: langfilter.php:49
msgid "Save Settings" msgid "Save Settings"
msgstr "Salva Impostazioni" msgstr "Salva Impostazioni"
#: langfilter.php:66 #: langfilter.php:73
msgid "Language Filter Settings saved." msgid "Language Filter Settings saved."
msgstr "Impostazioni Filtro Lingua salvate." msgstr "Impostazioni Filtro Lingua salvate."
#: langfilter.php:105 #: langfilter.php:123
#, php-format #, php-format
msgid "unspoken language %s - Click to open/close" msgid "unspoken language %s - Click to open/close"
msgstr "lingua non parlata %s - Clicca per aprire/chiudere" msgstr "lingua non parlata %s - Clicca per aprire/chiudere"

View File

@ -8,8 +8,10 @@ function string_plural_select_it($n){
$a->strings["Language Filter"] = "Filtro Lingua"; $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 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["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["Use the language filter"] = "Usa il filtro lingua";
$a->strings["I speak"] = "I parlo"; $a->strings["I speak"] = "Parlo";
$a->strings["List of abbreviations for languages you speak, comma seperated. For excample \"de,it\"."] = "Lista di abbreviazioni per le lingue che parli, separate da virgola. Per esempio \"it,de\""; $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\"";
$a->strings["Minimum confidence in language detection"] = "Fiducia minima nel rilevamento della lingua";
$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."] = "Fiducia minima che il rilevamento della lingua sia corretto, da 0 a 100. I post non saranno filtrati quando la fiducia nel rilevamento della lingua è sotto questo valore percentuale.";
$a->strings["Save Settings"] = "Salva Impostazioni"; $a->strings["Save Settings"] = "Salva Impostazioni";
$a->strings["Language Filter Settings saved."] = "Impostazioni Filtro Lingua salvate."; $a->strings["Language Filter Settings saved."] = "Impostazioni Filtro Lingua salvate.";
$a->strings["unspoken language %s - Click to open/close"] = "lingua non parlata %s - Clicca per aprire/chiudere"; $a->strings["unspoken language %s - Click to open/close"] = "lingua non parlata %s - Clicca per aprire/chiudere";

View File

@ -88,7 +88,7 @@ function nsfw_addon_settings(&$a,&$s) {
$s .= '<input id="nsfw-enable" type="checkbox" name="nsfw-enable" value="1"' . $enable_checked . ' />'; $s .= '<input id="nsfw-enable" type="checkbox" name="nsfw-enable" value="1"' . $enable_checked . ' />';
$s .= '<div class="clear"></div>'; $s .= '<div class="clear"></div>';
$s .= '<label id="nsfw-label" for="nsfw-words">' . t('Comma separated list of keywords to hide') . ' </label>'; $s .= '<label id="nsfw-label" for="nsfw-words">' . t('Comma separated list of keywords to hide') . ' </label>';
$s .= '<input id="nsfw-words" type="text" name="nsfw-words" value="' . $words .'" />'; $s .= '<textarea id="nsfw-words" type="text" name="nsfw-words">' . $words .'</textarea>';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>'; $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';

View File

@ -4,14 +4,15 @@
# #
# #
# Translators: # Translators:
# Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015
# Nicola Spanti <translations@nicola-spanti.info>, 2015 # Nicola Spanti <translations@nicola-spanti.info>, 2015
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-07-27 07:21+0200\n" "POT-Creation-Date: 2015-07-27 07:21+0200\n"
"PO-Revision-Date: 2015-08-30 17:23+0000\n" "PO-Revision-Date: 2015-12-12 11:28+0000\n"
"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n" "Last-Translator: Damien Goutte-Gattat <damien+transifex@incenp.org>\n"
"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n" "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -27,7 +28,7 @@ msgstr "Publier sur GNU Social"
msgid "" msgid ""
"Please contact your site administrator.<br />The provided API URL is not " "Please contact your site administrator.<br />The provided API URL is not "
"valid." "valid."
msgstr "" msgstr "Merci de contacter l'administrateur du site.<br />L'URL d'API fournie est invalide."
#: statusnet.php:225 #: statusnet.php:225
msgid "We could not contact the GNU Social API with the Path you entered." msgid "We could not contact the GNU Social API with the Path you entered."

View File

@ -6,7 +6,7 @@ function string_plural_select_fr($n){
}} }}
; ;
$a->strings["Post to GNU Social"] = "Publier sur GNU Social"; $a->strings["Post to GNU Social"] = "Publier sur GNU Social";
$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = ""; $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Merci de contacter l'administrateur du site.<br />L'URL d'API fournie est invalide.";
$a->strings["We could not contact the GNU Social API with the Path you entered."] = ""; $a->strings["We could not contact the GNU Social API with the Path you entered."] = "";
$a->strings["GNU Social settings updated."] = "Paramètres du GNU Social mis à jour."; $a->strings["GNU Social settings updated."] = "Paramètres du GNU Social mis à jour.";
$a->strings["GNU Social Import/Export/Mirror"] = ""; $a->strings["GNU Social Import/Export/Mirror"] = "";