Skip to content

Commit

Permalink
* Shorter French translations of login/logout menu entries. (index.fr…
Browse files Browse the repository at this point in the history
…ench.php)

- Removing disableTemplateEval setting, as it's not longer a choice in the main repo. (Help, ManageSettings)
  • Loading branch information
Nao committed Dec 21, 2014
1 parent d127297 commit c46b760
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 15 deletions.
2 changes: 0 additions & 2 deletions Help.english.php
Expand Up @@ -290,8 +290,6 @@
<br><br>If bandwidth is not an issue, you may want to serve it from your website, where it will be compressed along with other scripts. This will ensure
that jQuery is always available, as long as your website is up. Make sure to use a CDN if your server doesn\'t have the zlib library up and running (which most
servers will have anyway), otherwise you\'ll be serving a really big file...';
$txt['help_disableTemplateEval'] = 'By default, templates are included directly, rather than evaluated. Evaluating helps with showing more useful debug information in case a template contains an error.<br><br>
On large forums however, this customized inclusion process may be significantly slower. Therefore, advanced users may wish to disable it.';
$txt['help_db_show_debug'] = 'Enables query debugging features. This is very useful for debugging purposes, and the debug query information is shown at the bottom of each
page when this setting is enabled.<br><br>
The following items are displayed:
Expand Down
1 change: 0 additions & 1 deletion ManageSettings.english.php
Expand Up @@ -26,7 +26,6 @@
$txt['jquery_jquery'] = 'jQuery CDN';
$txt['jquery_google'] = 'Google CDN';
$txt['jquery_microsoft'] = 'Microsoft CDN';
$txt['disableTemplateEval'] = 'Disable evaluation of templates';
$txt['db_show_debug'] = 'Show debug information';
$txt['db_show_debug_who'] = 'Show debug information to which users:';
$txt['db_show_debug_who_log'] = 'Show debug query log to which users:';
Expand Down
3 changes: 0 additions & 3 deletions english-uk/Help.english-uk.php
Expand Up @@ -56,9 +56,6 @@

$txt['help_disableCustomPerPage'] = 'Tick this option to stop users from customising the amount of messages and topics to display per page on the Message Index and Topic Display page respectively.';

$txt['help_disableTemplateEval'] = 'By default, templates are included directly, rather than evaluated. Evaluating helps with showing more useful debug information in case a template contains an error.<br><br>
On large forums however, this customised inclusion process may be significantly slower. Therefore, advanced users may wish to disable it.';

$txt['help_attachment_image_paranoid'] = 'Selecting this option will enable very strict security checks on image attachments. Warning! These extensive checks can fail on valid images too. It is strongly recommended to only use this option together with image re-encoding, in order to have Wedge try to resample the images which fail the security checks: if successful, they will be sanitised and uploaded. Otherwise, if image re-encoding is not enabled, all attachments failing checks will be rejected.';

$txt['help_avatar_paranoid'] = 'Selecting this option will enable very strict security checks on avatars. Warning! These extensive checks can fail on valid images too. It is strongly recommended to only use this option together with avatars re-encoding, in order to have Wedge try to resample the images which fail the security checks: if successful, they will be sanitised and uploaded. Otherwise, if re-encoding of avatars is not enabled, all avatars failing checks will be rejected.';
Expand Down
2 changes: 0 additions & 2 deletions french/Help.french.php
Expand Up @@ -282,8 +282,6 @@
<br><br>Si la bande passante n\'est pas un problème, vous pouvez aussi charger jQuery à partir de votre site, ce qui permet de vous assurer que le script sera
toujours disponible, et en passant de le compresser en même temps que script.js. Attention, si votre serveur ne dispose pas de la librairie zlib (ce qui est peu
probable heureusement), passez impérativement par un CDN pour éviter de servir un jQuery non compressé !';
$txt['help_disableTemplateEval'] = 'Par défaut, les modèles de thème sont simplement inclus au lieu d\'être évalués. L\'évaluation permet d\'afficher plus d\'informations en cas d\'erreur du traitement.<br><br>
Toutefois, sur des forums de grande taille, ce processus peut ralentir sensiblement le traitement. Il leur est donc recommandé de le laisser désactivé.';
$txt['help_db_show_debug'] = 'Active les fonctionnalités de débogage des requêtes, très utiles pour repérer les erreurs. Les informations sont montrées à la fin de chaque
page quand cette option est activée.<br><br>
Les éléments suivants sont affichés&#8239;:
Expand Down
1 change: 0 additions & 1 deletion french/ManageSettings.french.php
Expand Up @@ -26,7 +26,6 @@
$txt['jquery_jquery'] = 'Par le réseau de jQuery';
$txt['jquery_google'] = 'Par le réseau de Google';
$txt['jquery_microsoft'] = 'Par le réseau de Microsoft';
$txt['disableTemplateEval'] = 'Désactiver l\'évaluation des modèles (templates)';
$txt['db_show_debug'] = 'Montrer les informations de débogage';
$txt['db_show_debug_who'] = 'Montrer les informations de débogage à ces utilisateurs&#8239;:';
$txt['db_show_debug_who_log'] = 'Montrer la liste des requêtes SQL exécutées à ces utilisateurs&#8239;:';
Expand Down
4 changes: 2 additions & 2 deletions french/index.french.php
Expand Up @@ -64,7 +64,7 @@
$txt['remove'] = 'Enlever';
$txt['start_new_topic'] = 'Nouveau sujet';

$txt['login'] = 'Identifiez-vous';
$txt['login'] = 'Connexion';
// Use numeric entities in the below string.
$txt['username'] = 'Identifiant';
$txt['password'] = 'Mot de passe';
Expand Down Expand Up @@ -114,7 +114,7 @@
$txt['total'] = 'Total';
$txt['posts_made'] = 'Messages';
$txt['website'] = 'Site Web';
$txt['register'] = 'Inscrivez-vous';
$txt['register'] = 'Inscription';
$txt['warning_status'] = 'Niveau de sanction';
$txt['user_warn_warned'] = 'L\'utilisateur a reçu un avertissement';
$txt['user_warn_moderate'] = 'Les messages de l\'utilisateur doivent être approuvés avant publication';
Expand Down
3 changes: 0 additions & 3 deletions german/Help.german.php
Expand Up @@ -267,9 +267,6 @@
<br><br>Sollte Bandbreite keine Rolle spielen, kann die Datei von deinem eigenen Server ausgeliefert werden, wo es zusätzlich noch mit anderen Dateien komprimiert wird.
Dies stellt sicher, dass jQuery immer verfügbar ist, sofern deine Webseite online ist. Verwende unbedingt ein CDN, wenn dein Server nicht auf die zlib Bibliothek zurückgreifen kann.
Andernfalls wirst du eine sehr große Datei ausliefern...';
$txt['help_disableTemplateEval'] = 'Standardmäßig werden Vorlagen (Templates) verarbeitet statt nur inkludiert. Dieses hilft dabei, Debug Informationen anzuzeigen, wenn das Template einen Fehler enthält.<br/>
<br/>
Bei großen Foren kann dieser Inkludierungs-Prozess wesentlich mehr Zeit in Anspruch nehmen. Deshalb sollten erfahrene Benutzer diese Funktion eventuell deaktivieren.';
$txt['help_db_show_debug'] = 'Aktiviert das Debugging für Abfragen. Sehr nützlich, wenn man Fehler finden möchte. Die Ausgabe erscheint unterhalb der Seite, wenn diese FUnktion aktiviert ist<br><br>
Die folgenden Punkte werden angezeigt:
<ul>
Expand Down
1 change: 0 additions & 1 deletion german/ManageSettings.german.php
Expand Up @@ -26,7 +26,6 @@
$txt['jquery_jquery'] = 'jQuery CDN';
$txt['jquery_google'] = 'Google CDN';
$txt['jquery_microsoft'] = 'Microsoft CDN';
$txt['disableTemplateEval'] = 'Analyse von Templates deaktivieren (template eval)';
$txt['db_show_debug'] = 'Informationen für die Fehlersuche anzeigen';
$txt['db_show_debug_who'] = 'Fehlerinformationen nur folgenden Benutzern anzeigen:';
$txt['db_show_debug_who_log'] = 'Fehlerprotokoll nur folgenden Benutzern anzeigen:';
Expand Down

0 comments on commit c46b760

Please sign in to comment.