From cea445de2ea25a11b831ea6c810bfb4321b393cc Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 8 Feb 2015 10:44:47 +0100 Subject: [PATCH 1/3] FR update for the strings --- view/fr/messages.po | 30 +++++++++++++++--------------- view/fr/strings.php | 26 +++++++++++++------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/view/fr/messages.po b/view/fr/messages.po index 74f603793..349ca2b16 100644 --- a/view/fr/messages.po +++ b/view/fr/messages.po @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-04 11:35+0100\n" -"PO-Revision-Date: 2015-02-05 09:47+0000\n" -"Last-Translator: fabrixxm \n" +"PO-Revision-Date: 2015-02-06 00:14+0000\n" +"Last-Translator: Damien Goutte-Gattat \n" "Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -622,19 +622,19 @@ msgstr "défaut" #: ../../view/theme/clean/config.php:57 msgid "Midnight" -msgstr "" +msgstr "Minuit" #: ../../view/theme/clean/config.php:58 msgid "Bootstrap" -msgstr "" +msgstr "Bootstrap" #: ../../view/theme/clean/config.php:59 msgid "Shades of Pink" -msgstr "" +msgstr "Nuances de rose" #: ../../view/theme/clean/config.php:60 msgid "Lime and Orange" -msgstr "" +msgstr "Lime et Orange" #: ../../view/theme/clean/config.php:61 msgid "GeoCities Retro" @@ -642,29 +642,29 @@ msgstr "" #: ../../view/theme/clean/config.php:85 msgid "Background Image" -msgstr "" +msgstr "Images de fond" #: ../../view/theme/clean/config.php:85 msgid "" "The URL to a picture (e.g. from your photo album) that should be used as " "background image." -msgstr "" +msgstr "L'URL vers une image (de votre album de photo, p. ex.) qui devra être utilisée comme image de fond." #: ../../view/theme/clean/config.php:86 msgid "Background Color" -msgstr "" +msgstr "Couleur de fond" #: ../../view/theme/clean/config.php:86 msgid "HEX value for the background color. Don't include the #" -msgstr "" +msgstr "Valeur hexadécimale de la couleur de fond (sans le #)." #: ../../view/theme/clean/config.php:88 msgid "font size" -msgstr "" +msgstr "taille de la police" #: ../../view/theme/clean/config.php:88 msgid "base font size for your interface" -msgstr "" +msgstr "taille de base de la police pour votre interface" #: ../../view/theme/duepuntozero/config.php:45 msgid "greenzero" @@ -6072,15 +6072,15 @@ msgstr "Il n'y a pas de conversation avec cet id." #: ../../include/api.php:1614 msgid "Invalid request." -msgstr "" +msgstr "Requête invalide." #: ../../include/api.php:1625 msgid "Invalid item." -msgstr "" +msgstr "Item invalide." #: ../../include/api.php:1635 msgid "Invalid action. " -msgstr "" +msgstr "Action invalide." #: ../../include/api.php:1643 msgid "DB error" diff --git a/view/fr/strings.php b/view/fr/strings.php index 00f09c482..46267b9e4 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -118,17 +118,17 @@ $a->strings["Set resize level for images in posts and comments (width and height $a->strings["Set theme width"] = "Largeur du thème"; $a->strings["Set colour scheme"] = "Choisir le schéma de couleurs"; $a->strings["default"] = "défaut"; -$a->strings["Midnight"] = ""; -$a->strings["Bootstrap"] = ""; -$a->strings["Shades of Pink"] = ""; -$a->strings["Lime and Orange"] = ""; +$a->strings["Midnight"] = "Minuit"; +$a->strings["Bootstrap"] = "Bootstrap"; +$a->strings["Shades of Pink"] = "Nuances de rose"; +$a->strings["Lime and Orange"] = "Lime et Orange"; $a->strings["GeoCities Retro"] = ""; -$a->strings["Background Image"] = ""; -$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = ""; -$a->strings["Background Color"] = ""; -$a->strings["HEX value for the background color. Don't include the #"] = ""; -$a->strings["font size"] = ""; -$a->strings["base font size for your interface"] = ""; +$a->strings["Background Image"] = "Images de fond"; +$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "L'URL vers une image (de votre album de photo, p. ex.) qui devra être utilisée comme image de fond."; +$a->strings["Background Color"] = "Couleur de fond"; +$a->strings["HEX value for the background color. Don't include the #"] = "Valeur hexadécimale de la couleur de fond (sans le #)."; +$a->strings["font size"] = "taille de la police"; +$a->strings["base font size for your interface"] = "taille de base de la police pour votre interface"; $a->strings["greenzero"] = ""; $a->strings["purplezero"] = ""; $a->strings["easterbunny"] = ""; @@ -1364,9 +1364,9 @@ $a->strings["Weekly posting limit of %d posts reached. The post was rejected."] $a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Le quota mensuel de %d publications a été atteint. La publication a été rejetée."; $a->strings["There is no status with this id."] = "Il n'y a pas de statut avec cet id."; $a->strings["There is no conversation with this id."] = "Il n'y a pas de conversation avec cet id."; -$a->strings["Invalid request."] = ""; -$a->strings["Invalid item."] = ""; -$a->strings["Invalid action. "] = ""; +$a->strings["Invalid request."] = "Requête invalide."; +$a->strings["Invalid item."] = "Item invalide."; +$a->strings["Invalid action. "] = "Action invalide."; $a->strings["DB error"] = ""; $a->strings["view full size"] = "voir en pleine taille"; $a->strings["Starts:"] = "Débute:"; From f931eba7f2db4a7b82039a3130d09cd47ca7cd5b Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 8 Feb 2015 12:07:35 +0100 Subject: [PATCH 2/3] Noscrape is now enabled all the time. --- mod/admin.php | 4 ---- mod/friendica.php | 5 +---- mod/noscrape.php | 3 --- view/templates/admin_site.tpl | 1 - 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 2a923f4ca..76ecf1f45 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -372,7 +372,6 @@ function admin_page_site_post(&$a){ $basepath = ((x($_POST,'basepath')) ? notags(trim($_POST['basepath'])) : ''); $singleuser = ((x($_POST,'singleuser')) ? notags(trim($_POST['singleuser'])) : ''); $proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False); - $disable_noscrape = ((x($_POST,'disable_noscrape')) ? true : false); if($ssl_policy != intval(get_config('system','ssl_policy'))) { if($ssl_policy == SSL_POLICY_FULL) { q("update `contact` set @@ -500,7 +499,6 @@ function admin_page_site_post(&$a){ set_config('system','temppath', $temppath); set_config('system','basepath', $basepath); set_config('system','proxy_disabled', $proxy_disabled); - set_config('system','disable_noscrape', $disable_noscrape); info( t('Site settings updated.') . EOL); goaway($a->get_baseurl(true) . '/admin/site' ); @@ -668,8 +666,6 @@ function admin_page_site(&$a) { '$proxy_disabled' => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")), '$relocate_url' => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."), - - '$disable_noscrape'=> array('disable_noscrape', t("Disable noscrape"), get_config('system','disable_noscrape'), t("The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping. Disabling it will cause higher load on your server and the directory server.")), '$form_security_token' => get_form_security_token("admin_site") )); diff --git a/mod/friendica.php b/mod/friendica.php index ba2127629..7b99f9e6f 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -38,11 +38,8 @@ function friendica_init(&$a) { 'site_name' => $a->config['sitename'], 'platform' => FRIENDICA_PLATFORM, 'info' => ((x($a->config,'info')) ? $a->config['info'] : ''), + 'no_scrape_url' => $a->get_baseurl().'/noscrape' ); - - //Enable noscrape? - if(!get_config('system','disable_noscrape')) - $data['no_scrape_url'] = $a->get_baseurl().'/noscrape'; echo json_encode($data); killme(); diff --git a/mod/noscrape.php b/mod/noscrape.php index a859efd41..10df72eeb 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -2,9 +2,6 @@ function noscrape_init(&$a) { - if(get_config('system','disable_noscrape')) - killme(); - if($a->argc > 1) $which = $a->argv[1]; else diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl index 24ff751be..0baed8a8a 100644 --- a/view/templates/admin_site.tpl +++ b/view/templates/admin_site.tpl @@ -111,7 +111,6 @@ {{include file="field_checkbox.tpl" field=$suppress_language}}

{{$performance}}

- {{include file="field_checkbox.tpl" field=$disable_noscrape}} {{include file="field_checkbox.tpl" field=$use_fulltext_engine}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} From 1781fbff1387f4cba03fcd679f7ec38718a21722 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 8 Feb 2015 12:12:19 +0100 Subject: [PATCH 3/3] Bad HTML in the admin side menu for webfinger and probe --- view/templates/admin_aside.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/templates/admin_aside.tpl b/view/templates/admin_aside.tpl index e98ee5584..0f28a1cf3 100644 --- a/view/templates/admin_aside.tpl +++ b/view/templates/admin_aside.tpl @@ -41,7 +41,7 @@

{{$diagnosticstxt}}

-