aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--admin/group_perm.php13
-rw-r--r--comments.php2
-rw-r--r--include/functions_user.inc.php9
-rw-r--r--language/en_UK/admin.lang.php48
-rw-r--r--language/en_UK/common.lang.php4
-rw-r--r--language/es_ES/admin.lang.php26
-rw-r--r--language/es_ES/common.lang.php4
-rw-r--r--language/fr_FR/admin.lang.php28
-rw-r--r--language/fr_FR/common.lang.php4
-rw-r--r--language/nl_NL/admin.lang.php26
-rw-r--r--language/nl_NL/common.lang.php4
-rw-r--r--plugins/event_tracer/tracer_admin.tpl2
-rw-r--r--profile.php40
-rw-r--r--register.php2
-rw-r--r--template/yoga/admin/cat_list.tpl4
-rw-r--r--template/yoga/admin/check_integrity.tpl4
-rw-r--r--template/yoga/admin/notification_by_mail.tpl16
-rw-r--r--template/yoga/admin/user_list.tpl28
-rw-r--r--template/yoga/index.tpl4
-rw-r--r--template/yoga/profile_content.tpl11
20 files changed, 90 insertions, 189 deletions
diff --git a/admin/group_perm.php b/admin/group_perm.php
index 0ddc4114d..c73bfbdd6 100644
--- a/admin/group_perm.php
+++ b/admin/group_perm.php
@@ -47,8 +47,7 @@ if (isset($_GET['group_id']) and is_numeric($_GET['group_id']))
}
else
{
- echo l10n('group_id URL parameter is missing');
- exit();
+ die('group_id URL parameter is missing');
}
// +-----------------------------------------------------------------------+
@@ -93,19 +92,19 @@ SELECT id
// an error (in SQL statement), so we need to know which categories are
// accesible
$authorized_ids = array();
-
+
$query = '
SELECT cat_id
FROM '.GROUP_ACCESS_TABLE.'
WHERE group_id = '.$page['group'].'
;';
$result = pwg_query($query);
-
+
while ($row = mysql_fetch_array($result))
{
array_push($authorized_ids, $row['cat_id']);
}
-
+
$inserts = array();
$to_autorize_ids = array_diff($private_uppercats, $authorized_ids);
foreach ($to_autorize_ids as $to_autorize_id)
@@ -144,14 +143,14 @@ $template->assign_vars(
'L_CAT_OPTIONS_TRUE'=>l10n('authorized'),
'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
'L_CAT_OPTIONS_INFO'=>l10n('permuser_info'),
-
+
'F_ACTION' =>
PHPWG_ROOT_PATH.
'admin.php?page=group_perm&group_id='.
$page['group']
)
);
-
+
// only private categories are listed
$query_true = '
SELECT id,name,uppercats,global_rank
diff --git a/comments.php b/comments.php
index 45fcc3666..1bc6f757c 100644
--- a/comments.php
+++ b/comments.php
@@ -172,7 +172,7 @@ UPDATE '.COMMENTS_TABLE.'
// | page header and options |
// +-----------------------------------------------------------------------+
-$title= l10n('title_comments');
+$title= l10n('User comments');
$page['body_id'] = 'theCommentsPage';
$template->set_filenames(array('comments'=>'comments.tpl'));
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 02cb2c873..bec05e907 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -96,7 +96,7 @@ function register_user($login, $password, $mail_address,
$errors = trigger_event('register_user_check',
$errors,
array(
- 'login'=>$login,
+ 'username'=>$login,
'password'=>$password,
'email'=>$mail_address,
)
@@ -159,13 +159,12 @@ SELECT id
if ($with_notification and $conf['email_admin_on_new_user'])
{
include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
- $username = $_POST['login'];
$admin_url = get_absolute_root_url()
- .'admin.php?page=user_list&username='.$username;
+ .'admin.php?page=user_list&username='.$login;
$keyargs_content = array
(
- get_l10n_args('User: %s', $username),
+ get_l10n_args('User: %s', $login),
get_l10n_args('Email: %s', $_POST['mail_address']),
get_l10n_args('', ''),
get_l10n_args('Admin: %s', $admin_url)
@@ -173,7 +172,7 @@ SELECT id
pwg_mail_notification_admins
(
- get_l10n_args('Registration of %s', $username),
+ get_l10n_args('Registration of %s', $login),
$keyargs_content
);
}
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 1dd14f9e5..48787cd83 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -137,7 +137,6 @@ $lang['Only private categories are listed'] = 'Only private categories are liste
$lang['Operating system'] = 'Operating system';
$lang['Options'] = 'Options';
$lang['Order alphanumerically'] = 'Order alphanumerically';
-$lang['Order by'] = 'Order by';
$lang['Other private categories'] = 'Other private categories';
$lang['Page banner'] = 'Page banner';
$lang['Parent category'] = 'Parent category';
@@ -203,8 +202,6 @@ $lang['You are running the latest version of PhpWebGallery.'] = 'You are running
$lang['You cannot delete your account'] = "You cannot delete your account";
$lang['You cannot move a category in its own sub category'] = 'You cannot move a category in its own sub category';
$lang['You need to confirm deletion'] = 'You need to confirm deletion';
-$lang['actions'] = 'Actions';
-$lang['add keywords'] = 'add keywords';
$lang['add tags'] = 'add tags';
$lang['adviser'] = 'Adviser';
$lang['associate to category'] = 'associate to category';
@@ -239,10 +236,8 @@ $lang['description'] = 'description';
$lang['dissociate from category'] = 'dissociate from category';
$lang['dissociate from group'] = 'dissociate from group';
$lang['edit category permissions'] = 'edit category permissions';
-$lang['edit'] = 'Edit';
$lang['editcat_confirm'] = 'Category informations updated successfully.';
$lang['editcat_uploadable'] = 'Authorize upload';
-$lang['elements per line'] = 'elements per line';
$lang['elements per page'] = 'elements per page';
$lang['elements'] = 'elements';
$lang['enabled_high'] = 'High definition enabled';
@@ -258,7 +253,6 @@ $lang['group "%s" updated'] = 'group "%s" updated';
$lang['group'] = 'group';
$lang['group_add_error1'] = 'The name of a group must not contain " or \' or be empty.';
$lang['group_add_error2'] = 'This name is already used by another group.';
-$lang['group_id URL parameter is missing'] = 'group_id URL parameter is missing';
$lang['groups'] = 'Groups';
$lang['history'] = 'History';
$lang['instructions'] = 'Instructions';
@@ -274,9 +268,6 @@ $lang['manage sub-categories'] = 'manage sub-categories';
$lang['manage'] = 'Manage';
$lang['maximum height'] = 'maximum height';
$lang['maximum width'] = 'maximum width';
-$lang['metadata_basic'] = 'basic';
-$lang['metadata_exif'] = 'EXIF';
-$lang['metadata_iptc'] = 'IPTC';
$lang['name'] = 'name';
$lang['nbm_background_treatment_redirect_second'] = 'Execution time is out, treatment must be continue [Estmated time: %d second].';
$lang['nbm_background_treatment_redirect_seconds'] = 'Execution time is out, treatment must be continue [Estmated time: %d seconds].';
@@ -324,7 +315,6 @@ $lang['nbm_object_unsubscribe'] = 'Unsubscribe from notification by mail';
$lang['nbm_param_mode'] = 'Parameter';
$lang['nbm_redirect_msg'] = 'Processing treatment.'."\n\n".'Please wait...';
$lang['nbm_repost_submit'] = 'Continue processing treatment';
-$lang['nbm_send_check_all'] = 'Check All';
$lang['nbm_send_complementary_mail_content'] = 'Complementary mail content';
$lang['nbm_send_detailed_content'] = 'Add detailed content';
$lang['nbm_send_mail_as'] = 'Send mail as';
@@ -332,7 +322,6 @@ $lang['nbm_send_mail_to_users'] = 'Send mail to users';
$lang['nbm_send_mode'] = 'Send';
$lang['nbm_send_options'] = 'Options';
$lang['nbm_send_submit'] = 'Send';
-$lang['nbm_send_uncheck_all'] = 'Uncheck All';
$lang['nbm_subscribe_col'] = 'Subscribed';
$lang['nbm_subscribe_mode'] = 'Subscribe';
$lang['nbm_title_param'] = 'Parameters';
@@ -376,7 +365,6 @@ $lang['remote_site_local_update'] = 'read local listing.xml and update';
$lang['remote_site_test'] = 'test';
$lang['remote_site_test_hint'] = 'test this remote site';
$lang['remote_site_uncorrect_url'] = 'Remote site url must start by http or https and must only contain characters among "/", "a-zA-Z0-9", "-" or "_"';
-$lang['remove keyword'] = 'remove keyword';
$lang['remove tags'] = 'remove tags';
$lang['repair and optimize database'] = 'Repair and optimize database';
$lang['selection'] = 'selection';
@@ -406,9 +394,8 @@ $lang['title_categories'] = 'Categories management';
$lang['title_configuration'] = 'PhpWebGallery configuration';
$lang['title_default'] = 'PhpWebGallery administration';
$lang['title_edit_cat'] = 'Edit a category';
-$lang['title_groups'] = 'Groups management';
-$lang['title_history'] = 'History';
-$lang['title_liste_users'] = 'Users list';
+$lang['title_groups'] = 'Group management';
+$lang['title_liste_users'] = 'User list';
$lang['title_picmod'] = 'Modify informations about a picture';
$lang['title_thumbnails'] = 'Thumbnail creation';
$lang['title_update'] = 'Database synchronization with files';
@@ -487,8 +474,6 @@ $lang['user_status_webmaster'] = 'Webmaster';
$lang['username'] = 'username';
$lang['users'] = 'Users';
$lang['virtual_category'] = 'Virtual category';
-$lang['visitors'] = 'Visitors';
-$lang['w_day'] = 'Day';
$lang['waiting'] = 'Waiting';
$lang['is_default_group'] = 'default';
$lang['toggle_is_default_group'] = 'Toggle \'default group\' property';
@@ -496,10 +481,6 @@ $lang['Advanced_features'] = 'Advanced features';
$lang['Elements_not_linked'] = 'Not linked elements';
$lang['web_services'] = 'Web services ';
$lang['title_wscheck'] = ' Access management ';
-$lang['ws_set_status'] = ' Environment ';
-$lang['ws_enable'] = ' Enable ';
-$lang['ws_disable'] = ' Disable ';
-$lang['ws set to'] = ' Environment temporary set ';
$lang['ws_failed_upd'] = ' -> <strong>Uncompleted demand</strong> ';
$lang['ws_success_upd'] = ' -> Successfully completed ';
$lang['ws_adding_legend'] = ' Add a new partner access to Web Services ';
@@ -514,7 +495,6 @@ $lang['ws_Request'] = ' Request ';
$lang['ws_Limit'] = ' Limit ';
$lang['ws_Comment'] = ' Comment ';
$lang['Modify End from Now +'] = 'Modify End from Now + ';
-$lang['Confirmation'] = ' Confirmation ';
$lang['Delete'] = ' Remove ';
$lang['Confidential partner key'] = 'Confidential partner key';
$lang['Basis of access key calculation'] = 'Basis of access key calculation';
@@ -545,12 +525,10 @@ $lang['Month'] = 'Month';
$lang['Day'] = 'Day';
$lang['Pages seen'] = 'Pages seen';
$lang['Pictures'] = 'Pictures';
-$lang['High quality'] = 'High quality';
$lang['time'] = 'time';
$lang['user'] = 'user';
$lang['IP'] = 'IP';
$lang['image'] = '';
-$lang['high quality'] = 'high quality';
$lang['section'] = 'section';
$lang['tags'] = 'tags';
$lang['conf_history_guest'] = 'Save page visits by guests';
@@ -593,20 +571,20 @@ $lang['c13y_Impossible_automatic_correction'] = 'Impossible automatic correction
$lang['c13y_Correction_applied_success'] = 'Correction applied with success';
$lang['c13y_Correction_applied_error'] = 'Correction applied with error';
$lang['c13y_anomaly_count'] = '%d anomaly has been detected.';
-$lang['c13y_anomalies_count'] = '%d anomalies has been detected.';
+$lang['c13y_anomalies_count'] = '%d anomalies have been detected.';
$lang['c13y_anomaly_corrected_count'] = '%d anomaly has been corrected.';
-$lang['c13y_anomalies_corrected_count'] = '%d anomalies has been detected corrected.';
-$lang['c13y_anomaly_not_corrected_count'] = '%d anomaly hasn\'t been corrected.';
-$lang['c13y_anomalies_not_corrected_count'] = '%d anomalies hasn\'t been corrected.';
+$lang['c13y_anomalies_corrected_count'] = '%d anomalies have been detected corrected.';
+$lang['c13y_anomaly_not_corrected_count'] = '%d anomaly has not been corrected.';
+$lang['c13y_anomalies_not_corrected_count'] = '%d anomalies have not been corrected.';
$lang['c13y_more_info'] = 'Go to %s or %s for more informations';
$lang['c13y_more_info_forum'] = 'the forum';
$lang['c13y_more_info_wiki'] = 'the wiki';
$lang['c13y_exif_anomaly'] = '%s value is not correct file because exif are not supported';
$lang['c13y_exif_correction'] = '%s must be to set to false in your config_local.inc.php file';
-$lang['c13y_guest_non_existent'] = 'Main "guest" user don\'t exist any more';
+$lang['c13y_guest_non_existent'] = 'Main "guest" user does not exist';
$lang['c13y_bad_guest_status'] = 'Main "guest" user status is incorrect';
-$lang['c13y_default_non_existent'] = 'Default user don\'t exist any more';
-$lang['c13y_webmaster_non_existent'] = 'Main "webmaster" user don\'t exist any more';
+$lang['c13y_default_non_existent'] = 'Default user does not exist';
+$lang['c13y_webmaster_non_existent'] = 'Main "webmaster" user does not exist';
$lang['c13y_bad_webmaster_status'] = 'Main "webmaster" user status is incorrect';
$lang['c13y_user_created'] = 'User "%s" created with "%s" like password';
$lang['c13y_user_status_updated'] = 'Status of user "%s" updated';
@@ -625,8 +603,8 @@ $lang['Level 2'] = 'Friends';
$lang['Level 4'] = 'Family';
$lang['Level 8'] = 'Admins';
$lang['c13y_maintenance'] = 'Reinitialize check integrity';
-$lang['c13y_check_all'] = 'Check all';
-$lang['c13y_uncheck_all'] = 'Uncheck all';
+$lang['Check all'] = 'Check all';
+$lang['Uncheck all'] = 'Uncheck all';
$lang['c13y_check_auto'] = 'Check automatic corrections';
$lang['c13y_submit_correction'] = 'Apply selected corrections';
$lang['c13y_submit_ignore'] = 'Ignore selected anomalies';
@@ -634,7 +612,7 @@ $lang['c13y_submit_refresh'] = 'Refresh';
$lang['c13y_ignore_msg1'] = 'The anomaly will be ignored until next application version';
$lang['c13y_ignore_msg2'] = 'Correction the anomaly will cancel the fact that it\'s ignored';
$lang['c13y_anomaly_ignored_count'] = '%d anomaly has been ignored.';
-$lang['c13y_anomalies_ignored_count'] = '%d anomalies has been ignored.';
+$lang['c13y_anomalies_ignored_count'] = '%d anomalies have been ignored.';
$lang['plugins_need_update'] = 'Plugins which need upgrade';
$lang['plugins_dontneed_update'] = 'Plugins up to date';
@@ -645,7 +623,7 @@ $lang['plugins_auto_update'] = 'Automatic upgrade';
$lang['plugins_auto_install'] = 'Automatic installation';
$lang['plugins_download'] = 'Download file';
$lang['plugins_description'] = '<b>Version:</b> %s<br><br><b>Date:</b> %s<br><br>%s';
-$lang['plugins_tab_list'] = 'Plugins list';
+$lang['plugins_tab_list'] = 'Plugin list';
$lang['plugins_tab_update'] = 'Check for updates';
$lang['plugins_tab_new'] = 'Other plugins';
$lang['plugins_delete'] = 'Delete';
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index a34d8eb96..b6cdb666b 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -275,8 +275,6 @@ $lang['reg_err_login5'] = 'this login is already used';
$lang['reg_err_mail_address'] = 'mail address must be like xxx@yyy.eee (example : jack@altern.org)';
$lang['reg_err_pass'] = 'please enter your password again';
$lang['register'] = 'register';
-$lang['register_page_title'] = 'Registration';
-$lang['register_title'] = 'Registration';
$lang['remember_me'] = 'Auto login';
$lang['remove this tag'] = 'remove this tag from the list';
$lang['representative'] = 'representative';
@@ -312,7 +310,6 @@ $lang['stop_filter_hint'] = 'return to the display of all images';
$lang['the beginning'] = 'the beginning';
$lang['theme'] = 'Interface theme';
$lang['thumbnails'] = 'Thumbnails';
-$lang['title_comments'] = 'Users comments';
$lang['title_menu'] = 'Menu';
$lang['title_send_mail'] = 'A comment on your site';
$lang['today'] = 'today';
@@ -336,7 +333,6 @@ $lang['upload_successful'] = 'Picture uploaded with success, an administrator wi
$lang['upload_title'] = 'Upload a picture';
$lang['useful when password forgotten'] = 'useful when password forgotten';
/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'Yes' */ $lang['yes'] = 'yes';
-$lang['page_end'] = 'Page bottom';
$lang['qsearch'] = 'Quick search';
$lang['Connected user: %s'] = 'Connected user: %s';
$lang['IP: %s'] = 'IP: %s';
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index bce57a8a7..bd3b07ffe 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -136,7 +136,6 @@ $lang['Only private categories are listed'] = 'Sólo las categorías particulare
$lang['Operating system'] = 'Systema de explotación';
$lang['Options'] = 'Opciones';
$lang['Order alphanumerically'] = 'Ordenar alfabético - numéricamente';
-$lang['Order by'] = 'Clasificar según';
$lang['Other private categories'] = 'Otras categorías particulares';
$lang['Page banner'] = 'Bandera de las páginas';
$lang['Parent category'] = 'Categoría allegada';
@@ -202,8 +201,6 @@ $lang['You are running the latest version of PhpWebGallery.'] = 'Usted utiliza l
$lang['You cannot delete your account'] = "Usted no puede suprimir su cuenta";
$lang['You cannot move a category in its own sub category'] = 'Usted no puede desplazar una categoría en su propia subcategoría';
$lang['You need to confirm deletion'] = 'Usted debe confirmar la supresión';
-$lang['actions'] = 'Acciones';
-$lang['add keywords'] = 'Añadir palabras-llaves';
$lang['add tags'] = 'Añadir los tags';
$lang['adviser'] = 'Consejero';
$lang['associate to category'] = 'asociar con la categoría';
@@ -238,10 +235,8 @@ $lang['description'] = 'Descripción';
$lang['dissociate from category'] = 'Disociar la categoría';
$lang['dissociate from group'] = 'Disociar el grupo';
$lang['edit category permissions'] = 'Modificar los permisos de la categoría';
-$lang['edit'] = 'Modificar';
$lang['editcat_confirm'] = 'Las informaciones de la categoría han sido puestas al día con éxito.';
$lang['editcat_uploadable'] = 'Autorizar el añadido de imágenes';
-$lang['elements per line'] = 'Elementos por línea';
$lang['elements per page'] = 'Elementos por página';
$lang['elements'] = 'Elementos';
$lang['enabled_high'] = 'Alta definición activo';
@@ -257,7 +252,6 @@ $lang['group "%s" updated'] = 'grupo "%s" puestos al día';
$lang['group'] = 'grupo';
$lang['group_add_error1'] = 'El nombre del grupo no debe contener "or \' y no debe estar vacío.';
$lang['group_add_error2'] = 'Este nombre es ya utilizado por otro grupo.';
-$lang['group_id URL parameter is missing'] = 'Falta el parámetro de URL "group_id" ';
$lang['groups'] = 'Grupos';
$lang['history'] = 'Reseña histórica';
$lang['instructions'] = 'Instrucciones';
@@ -273,9 +267,6 @@ $lang['manage sub-categories'] = 'administrar las subcategorías';
$lang['manage'] = 'Administrar';
$lang['maximum height'] = 'Altura máxima';
$lang['maximum width'] = 'Anchura máxima';
-$lang['metadata_basic'] = 'básico';
-$lang['metadata_exif'] = 'EXIF';
-$lang['metadata_iptc'] = 'IPTC';
$lang['name'] = 'nombre';
$lang['nbm_background_treatment_redirect_second'] = 'Ser sobrepasado el tiempo de ejecución, el tratamiento debe continuar [el Tiempo estimado: %d el segundo].';
$lang['nbm_background_treatment_redirect_seconds'] = 'Ser sobrepasado el tiempo de ejecución, el tratamiento debe continuar [el Tiempo estimado: %d secundas].';
@@ -323,7 +314,6 @@ $lang['nbm_object_unsubscribe'] = 'Désinscription a la notificación por mail';
$lang['nbm_param_mode'] = 'Parametraje';
$lang['nbm_redirect_msg'] = 'Tratamiento corriente.'."\n".'Por favor, espere...';
$lang['nbm_repost_submit'] = 'Continuar el tratamiento corriente...';
-$lang['nbm_send_check_all'] = 'Todo verificado';
$lang['nbm_send_complementary_mail_content'] = 'Contenido complementario del mail';
$lang['nbm_send_detailed_content'] = 'Añadido de un contenido detallado';
$lang['nbm_send_mail_as'] = 'Enviar el mail como';
@@ -331,7 +321,6 @@ $lang['nbm_send_mail_to_users'] = 'Envío de mail a los utilizadores';
$lang['nbm_send_mode'] = 'Envío';
$lang['nbm_send_options'] = 'Opciones';
$lang['nbm_send_submit'] = 'Enviar';
-$lang['nbm_send_uncheck_all'] = 'Soltar todo';
$lang['nbm_subscribe_col'] = 'Inscritos';
$lang['nbm_subscribe_mode'] = 'Inscripción';
$lang['nbm_title_param'] = 'Parámetros';
@@ -376,7 +365,6 @@ $lang['remote_site_local_update'] = 'Leer el listing.xml local y poner al día';
$lang['remote_site_test'] = 'testar';
$lang['remote_site_test_hint'] = 'testar este sitio distante';
$lang['remote_site_uncorrect_url'] = 'EL URL del sitio distante debe comenzar por "http " o "https" y debe contener carácteres sólo entre "/", " a- zA-Z0-9 ", "-" o "_"';
-$lang['remove keyword'] = 'suprimir palabra-clave';
$lang['remove tags'] = 'suprimir los tags';
$lang['repair and optimize database'] = 'Reparar y optimizar la base de datos';
$lang['selection'] = 'Selección';
@@ -407,7 +395,6 @@ $lang['title_configuration'] = 'Configuración de PhpWebGallery';
$lang['title_default'] = 'Administración de PhpWebGallery';
$lang['title_edit_cat'] = 'Modificar una categoría';
$lang['title_groups'] = 'Gestión de los grupos';
-$lang['title_history'] = 'Reseña histórica';
$lang['title_liste_users'] = 'Lista utilizadores';
$lang['title_picmod'] = 'Modificar las informaciones de una imagen';
$lang['title_thumbnails'] = 'Creación de las miniaturas';
@@ -487,8 +474,6 @@ $lang['user_status_webmaster'] = 'Webmestre';
$lang['username'] = 'nombre utilizador';
$lang['users'] = 'Utilizadores';
$lang['virtual_category'] = 'Categoría virtual';
-$lang['visitors'] = 'Visitadores';
-$lang['w_day'] = 'Día';
$lang['waiting'] = 'En espera';
$lang['is_default_group'] = 'por defecto';
$lang['toggle_is_default_group'] = 'Invertir la propiedad \'grupo por defecto\'';
@@ -496,10 +481,6 @@ $lang['Advanced_features'] = 'Funciones avanzadas';
$lang['Elements_not_linked'] = 'Elementos no atados';
$lang['web_services'] = 'Servicios Web ';
$lang['title_wscheck'] = ' Gestión de los accesos ';
-$lang['ws_set_status'] = ' Medio ambiente ';
-$lang['ws_enable'] = ' Activo ';
-$lang['ws_disable'] = ' Inactivo ';
-$lang['ws set to'] = ' Modificar temporalmente el medio ambiente ';
$lang['ws_failed_upd'] = ' -> <strong>Operación no realizada</strong> ';
$lang['ws_success_upd'] = ' -> Acción realizada correctamente ';
$lang['ws_adding_legend'] = ' Añadido de un acceso compañero a los Servicios Web ';
@@ -514,7 +495,6 @@ $lang['ws_Request'] = 'Demanda';
$lang['ws_Limit'] = ' Límite ';
$lang['ws_Comment'] = ' Comentario ';
$lang['Modify End from Now +'] = 'Modificar el Fin por este instante + ';
-$lang['Confirmation'] = ' Confirmación ';
$lang['Delete'] = ' Retirada ';
$lang['Confidential partner key'] = 'Llave confidencial';
$lang['Basis of access key calculation'] = 'Base de cálculo de la llave';
@@ -549,12 +529,10 @@ $lang['Month'] = 'Mes';
$lang['Day'] = 'Día';
$lang['Pages seen'] = 'Páginas vistas';
$lang['Pictures'] = 'Imágenes';
-$lang['High quality'] = 'Alta resolución';
$lang['time'] = 'Hora';
$lang['user'] = 'utilizador';
$lang['IP'] = 'IP';
$lang['image'] = 'Imágenes';
-$lang['high quality'] = 'alta resolución';
$lang['section'] = 'sección';
$lang['tags'] = 'tags';
$lang['conf_history_guest'] = 'Registrar las páginas visitadas por los invitados';
@@ -629,8 +607,8 @@ $lang['Level 2'] = 'Amigos';
$lang['Level 4'] = 'Familia';
$lang['Level 8'] = 'Admins';
$lang['c13y_maintenance'] = 'Reinicializar los controles de integridad';
-$lang['c13y_check_all'] = 'Todo verificado';
-$lang['c13y_uncheck_all'] = 'Soltar todo';
+$lang['Check all'] = 'Todo verificado';
+$lang['Uncheck all'] = 'Soltar todo';
$lang['c13y_check_auto'] = 'Puntear las correcciones automáticas';
$lang['c13y_submit_correction'] = 'Aplicar las correcciones seleccionadas';
$lang['c13y_submit_ignore'] = 'Ignorar las anomalías seleccionadas';
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index 76dd89c1a..7daa903d7 100644
--- a/language/es_ES/common.lang.php
+++ b/language/es_ES/common.lang.php
@@ -275,8 +275,6 @@ $lang['reg_err_login5'] = 'Este nombre de usuario ya está utilizado';
$lang['reg_err_mail_address'] = 'Su dirección electrónica debe ser del formato xxx@yyy.eee (ejemplo : jack@altern.org)';
$lang['reg_err_pass'] = 'Por favor, escriba nuevamente su contraseña';
$lang['register'] = 'Inscríbase';
-$lang['register_page_title'] = 'Inscripción';
-$lang['register_title'] = 'Inscripción';
$lang['remember_me'] = 'Conexión automática';
$lang['remove this tag'] = 'quitar este tag de la lista';
$lang['representative'] = 'representante';
@@ -312,7 +310,6 @@ $lang['submit'] = 'Aceptar';
$lang['the beginning'] = 'el principio';
$lang['theme'] = 'Tema';
$lang['thumbnails'] = 'Miniaturas';
-$lang['title_comments'] = 'Comentarios usuarios';
$lang['title_menu'] = 'Menú';
$lang['title_send_mail'] = 'Una opinión sobre esta pagina';
$lang['today'] = 'hoy';
@@ -336,7 +333,6 @@ $lang['upload_successful'] = 'Imagen agregada , un administrador la debe control
$lang['upload_title'] = 'Agregar una imagen';
$lang['useful when password forgotten'] = 'Útil en caso de perdida de contraseña';
$lang['yes'] = 'Si';
-$lang['page_end'] = 'Por la bajura de página';
$lang['qsearch'] = 'Búsqueda rápida';
$lang['Connected user: %s'] = 'Utilizador conectado: %s';
$lang['IP: %s'] = 'IP: %s';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 355fcda75..d374609bf 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -137,7 +137,6 @@ $lang['Only private categories are listed'] = 'Seules les catégories privées s
$lang['Operating system'] = 'System d\'exploitation';
$lang['Options'] = 'Options';
$lang['Order alphanumerically'] = 'Ordonner alphabético-numériquement';
-$lang['Order by'] = 'Trier selon';
$lang['Other private categories'] = 'Autres catégories privées';
$lang['Page banner'] = 'Bannière des pages';
$lang['Parent category'] = 'Catégorie parente';
@@ -160,7 +159,7 @@ $lang['Preferences'] = 'Préférences';
$lang['Properties'] = 'Propriétés';
$lang['Random picture'] = 'Au hasard';
$lang['Rate date'] = 'Date de notation';
-$lang['Rating by guests'] = 'Notation par les visiteurs';
+$lang['Rating by guests'] = 'Notation par les invités';
$lang['Rating'] = 'Notation';
$lang['Reject All'] = 'Tout rejeter';
$lang['Reject'] = 'Rejeter';
@@ -203,8 +202,6 @@ $lang['You are running the latest version of PhpWebGallery.'] = 'Vous utilisez l
$lang['You cannot delete your account'] = "Vous ne pouvez pas supprimer votre compte";
$lang['You cannot move a category in its own sub category'] = 'Vous ne pouvez pas déplacer une catégorie dans sa propre sous-catégorie';
$lang['You need to confirm deletion'] = 'Vous devez confirmer la suppression';
-$lang['actions'] = 'Actions';
-$lang['add keywords'] = 'ajouter des mots-clef';
$lang['add tags'] = 'ajouter les tags';
$lang['adviser'] = 'Conseiller';
$lang['associate to category'] = 'associer à la catégorie';
@@ -239,10 +236,8 @@ $lang['description'] = 'description';
$lang['dissociate from category'] = 'dissocier de la catégorie';
$lang['dissociate from group'] = 'dissocier du groupe';
$lang['edit category permissions'] = 'Modifier les permissions de la catégorie';
-$lang['edit'] = 'Modifier';
$lang['editcat_confirm'] = 'Les informations de la catégorie ont été mises à jour avec succès.';
$lang['editcat_uploadable'] = 'Autoriser l\'ajout d\'images';
-$lang['elements per line'] = 'éléments par ligne';
$lang['elements per page'] = 'éléments par page';
$lang['elements'] = 'éléments';
$lang['enabled_high'] = 'Haute définition actif';
@@ -258,7 +253,6 @@ $lang['group "%s" updated'] = 'groupe "%s" mis à jour';
$lang['group'] = 'groupe';
$lang['group_add_error1'] = 'Le nom du groupe ne doit pas contenir " or \' et ne doit pas être vide.';
$lang['group_add_error2'] = 'Ce nom est déjà utilisé par un autre groupe.';
-$lang['group_id URL parameter is missing'] = 'Le paramètre d\'URL "group_id" est manquant';
$lang['groups'] = 'Groupes';
$lang['history'] = 'Historique';
$lang['instructions'] = 'Instructions';
@@ -274,9 +268,6 @@ $lang['manage sub-categories'] = 'gérer les sous-catégories';
$lang['manage'] = 'Gérer';
$lang['maximum height'] = 'hauteur maximum';
$lang['maximum width'] = 'largeur maximum';
-$lang['metadata_basic'] = 'basique';
-$lang['metadata_exif'] = 'EXIF';
-$lang['metadata_iptc'] = 'IPTC';
$lang['name'] = 'nom';
$lang['nbm_background_treatment_redirect_second'] = 'Le temps d\'exécution étant dépassé, le traitement doit continuer [Temps estimé: %d second].';
$lang['nbm_background_treatment_redirect_seconds'] = 'Le temps d\'exécution étant dépassé, le traitement doit continuer [Temps estimé: %d secondes].';
@@ -324,7 +315,6 @@ $lang['nbm_object_unsubscribe'] = 'Désinscription à la notification par mail';
$lang['nbm_param_mode'] = 'Paramétrage';
$lang['nbm_redirect_msg'] = 'Traitement en cours.'."\n".'Veuillez patienter...';
$lang['nbm_repost_submit'] = 'Continuer le traitement en cours...';
-$lang['nbm_send_check_all'] = 'Tout cocher';
$lang['nbm_send_complementary_mail_content'] = 'Contenu complémentaire du mail';
$lang['nbm_send_detailed_content'] = 'Ajout d\'un contenu détaillé';
$lang['nbm_send_mail_as'] = 'Envoyer le mail en tant que';
@@ -332,7 +322,6 @@ $lang['nbm_send_mail_to_users'] = 'Envoi de mail aux utilisateurs';
$lang['nbm_send_mode'] = 'Envoi';
$lang['nbm_send_options'] = 'Options';
$lang['nbm_send_submit'] = 'Envoyer';
-$lang['nbm_send_uncheck_all'] = 'Tout décocher';
$lang['nbm_subscribe_col'] = 'Inscrits';
$lang['nbm_subscribe_mode'] = 'Inscription';
$lang['nbm_title_param'] = 'Paramètres';
@@ -376,7 +365,6 @@ $lang['remote_site_local_update'] = 'lire le listing.xml local et mettre à jour
$lang['remote_site_test'] = 'tester';
$lang['remote_site_test_hint'] = 'tester ce site distant';
$lang['remote_site_uncorrect_url'] = 'L\'URL d\'un site distant doit commencer par "http" ou "https" et ne doit contenir des caractères que parmi "/", "a-zA-Z0-9", "-" ou "_"';
-$lang['remove keyword'] = 'supprimer mot-clef';
$lang['remove tags'] = 'supprimer les tags';
$lang['repair and optimize database'] = 'Réparer et optimiser la base de données';
$lang['selection'] = 'sélection';
@@ -407,7 +395,6 @@ $lang['title_configuration'] = 'Configuration de PhpWebGallery';
$lang['title_default'] = 'Administration de PhpWebGallery';
$lang['title_edit_cat'] = 'Modifier une catégorie';
$lang['title_groups'] = 'Gestion des groupes';
-$lang['title_history'] = 'Historique';
$lang['title_liste_users'] = 'Liste des utilisateurs';
$lang['title_picmod'] = 'Modifier les informations d\'une image';
$lang['title_thumbnails'] = 'Création des miniatures';
@@ -487,8 +474,6 @@ $lang['user_status_webmaster'] = 'Webmestre';
$lang['username'] = 'nom utilisateur';
$lang['users'] = 'Utilisateurs';
$lang['virtual_category'] = 'Catégorie virtuelle';
-$lang['visitors'] = 'Visiteurs';
-$lang['w_day'] = 'Jour';
$lang['waiting'] = 'En attente';
$lang['is_default_group'] = 'par défaut';
$lang['toggle_is_default_group'] = 'Inverser la propriété \'groupe par défaut\'';
@@ -496,10 +481,6 @@ $lang['Advanced_features'] = 'Fonctions avancées';
$lang['Elements_not_linked'] = 'Eléments non liés';
$lang['web_services'] = 'Services Web ';
$lang['title_wscheck'] = ' Gestion des accès ';
-$lang['ws_set_status'] = ' Environnement ';
-$lang['ws_enable'] = ' Actif ';
-$lang['ws_disable'] = ' Inactif ';
-$lang['ws set to'] = ' Modifier temporairement l\'environnement en ';
$lang['ws_failed_upd'] = ' -> <strong>Opération non réalisée</strong> ';
$lang['ws_success_upd'] = ' -> Action réalisée correctement ';
$lang['ws_adding_legend'] = ' Ajout d\'un accès partenaire aux Services Web ';
@@ -514,7 +495,6 @@ $lang['ws_Request'] = 'Requête';
$lang['ws_Limit'] = ' Limite ';
$lang['ws_Comment'] = ' Commentaire ';
$lang['Modify End from Now +'] = 'Modifier la Fin par cet instant + ';
-$lang['Confirmation'] = ' Confirmation ';
$lang['Delete'] = ' Retrait ';
$lang['Confidential partner key'] = 'Clé confidentielle';
$lang['Basis of access key calculation'] = 'Base de calcul de la clé';
@@ -545,12 +525,10 @@ $lang['Month'] = 'Mois';
$lang['Day'] = 'Jour';
$lang['Pages seen'] = 'Pages vues';
$lang['Pictures'] = 'Images';
-$lang['High quality'] = 'Haute résolution';
$lang['time'] = 'heure';
$lang['user'] = 'utilisateur';
$lang['IP'] = 'IP';
$lang['image'] = 'images';
-$lang['high quality'] = 'haute résolution';
$lang['section'] = 'section';
$lang['tags'] = 'tags';
$lang['conf_history_guest'] = 'Enregistrer les pages visitées par les invités';
@@ -625,8 +603,8 @@ $lang['Level 2'] = 'Amis';
$lang['Level 4'] = 'Famille';
$lang['Level 8'] = 'Admins';
$lang['c13y_maintenance'] = 'Réinitialiser les contrôles d\'intégrité';
-$lang['c13y_check_all'] = 'Tout cocher';
-$lang['c13y_uncheck_all'] = 'Tout décocher';
+$lang['Check all'] = 'Tout cocher';
+$lang['Uncheck all'] = 'Tout décocher';
$lang['c13y_check_auto'] = 'Cocher les corrections automatiques';
$lang['c13y_submit_correction'] = 'Appliquer les corrections sélectionnées';
$lang['c13y_submit_ignore'] = 'Ignorer les anomalies sélectionnées';
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index 43d6c7054..d207515bf 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -275,8 +275,6 @@ $lang['reg_err_login5'] = 'ce nom utilisateur est déjà pris';
$lang['reg_err_mail_address'] = 'l\'adresse e-mail doit être de la forme xxx@yyy.eee (exemple : jack@altern.org)';
$lang['reg_err_pass'] = 'S\'il vous plaît, entrez à nouveau votre mot de passe';
$lang['register'] = 's\'enregistrer';
-$lang['register_page_title'] = 'Enregistrement';
-$lang['register_title'] = 'Enregistrement';
$lang['remember_me'] = 'Connexion auto';
$lang['remove this tag'] = 'enlever ce tag de la liste';
$lang['representative'] = 'représentant';
@@ -312,7 +310,6 @@ $lang['submit'] = 'Valider';
$lang['the beginning'] = 'le début';
$lang['theme'] = 'Thème de l\'interface';
$lang['thumbnails'] = 'Miniatures';
-$lang['title_comments'] = 'Commentaires utilisateurs';
$lang['title_menu'] = 'Menu';
$lang['title_send_mail'] = 'Un commentaire sur le site';
$lang['today'] = 'aujourd\'hui';
@@ -336,7 +333,6 @@ $lang['upload_successful'] = 'Image ajoutée avec succès, un administrateur doi
$lang['upload_title'] = 'Ajouter une image';
$lang['useful when password forgotten'] = 'utile en cas d\'oubli de mot de passe';
$lang['yes'] = 'Oui';
-$lang['page_end'] = 'Bas de page';
$lang['qsearch'] = 'Recherche rapide';
$lang['Connected user: %s'] = 'Utilisateur connecté: %s';
$lang['IP: %s'] = 'IP: %s';
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 4e855cbb2..0c25565a4 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -137,7 +137,6 @@ $lang['Only private categories are listed'] = 'Alleen private categorieen worden
$lang['Operating system'] = 'Besturingssysteem';
$lang['Options'] = 'Opties';
$lang['Order alphanumerically'] = 'sorteer alphanumeriek';
-$lang['Order by'] = 'sorteer op';
$lang['Other private categories'] = 'Andere private categorieën';
$lang['Page banner'] = 'Pagina banner';
$lang['Parent category'] = 'Hoofd categorie';
@@ -203,8 +202,6 @@ $lang['You are running the latest version of PhpWebGallery.'] = 'Je hebt de laat
$lang['You cannot delete your account'] = "Je kan je account niet verwijderen";
$lang['You cannot move a category in its own sub category'] = 'Je kan een categorie niet verplaatsen in zijn eigen sub categorie';
$lang['You need to confirm deletion'] = 'Je moet de verwijdering bevestigen';
-$lang['actions'] = 'Acties';
-$lang['add keywords'] = 'Toevoegen sleutelwoorden';
$lang['add tags'] = 'Toevoegen tags';
$lang['adviser'] = 'Adviseer';
$lang['associate to category'] = 'link aan categorie';
@@ -239,10 +236,8 @@ $lang['description'] = 'omschrijving';
$lang['dissociate from category'] = 'verwijder link naar categorie';
$lang['dissociate from group'] = 'verwijder link naar groep';
$lang['edit category permissions'] = 'bewerk categorie rechten';
-$lang['edit'] = 'Bewerk(en)';
$lang['editcat_confirm'] = 'Categorie informatie is met succes bijgewerkt.';
$lang['editcat_uploadable'] = 'Toestaan van upload';
-$lang['elements per line'] = 'elementen per regel';
$lang['elements per page'] = 'elementen per pagina';
$lang['elements'] = 'elementen';
$lang['enabled_high'] = 'Hoge weergaven ingeschakeld';
@@ -258,7 +253,6 @@ $lang['group "%s" updated'] = 'groep "%s" bijgewerkt';
$lang['group'] = 'groep';
$lang['group_add_error1'] = 'De naam van de groep mag geen spatie bevatten of leeg zijn.';
$lang['group_add_error2'] = 'Deze naam is al in gebruik door een andere groep.';
-$lang['group_id URL parameter is missing'] = 'group_id URL parameter is onbekend';
$lang['groups'] = 'Groepen';
$lang['history'] = 'Geschiedenis';
$lang['instructions'] = 'Instructies';
@@ -274,9 +268,6 @@ $lang['manage sub-categories'] = 'beheer sub-categorie';
$lang['manage'] = 'Beheren';
$lang['maximum height'] = 'maximale hoogte';
$lang['maximum width'] = 'maximale breedte';
-$lang['metadata_basic'] = 'basis';
-$lang['metadata_exif'] = 'EXIF';
-$lang['metadata_iptc'] = 'IPTC';
$lang['name'] = 'naam';
$lang['nbm_background_treatment_redirect_second'] = 'Executie tijd is om, treatment moet verder gaan [Verwachte tijd: %d seconden].';
$lang['nbm_background_treatment_redirect_seconds'] = 'Executie tijd is om, treatment moet verder gaan [Verwachte tijd: %d seconden].';
@@ -324,7 +315,6 @@ $lang['nbm_object_unsubscribe'] = 'Uitschrijven van meldingen per mail';
$lang['nbm_param_mode'] = 'Parameter';
$lang['nbm_redirect_msg'] = 'Bezig met voltooien van de bewerking.'."\n\n".'Even wachten...';
$lang['nbm_repost_submit'] = 'Verder gaan met de bewerking';
-$lang['nbm_send_check_all'] = 'Selecteer Alles';
$lang['nbm_send_complementary_mail_content'] = 'Bijkomende mailinhoud';
$lang['nbm_send_detailed_content'] = 'Toevoegen gedetaileerde inhoud';
$lang['nbm_send_mail_as'] = 'Stuur mail als';
@@ -332,7 +322,6 @@ $lang['nbm_send_mail_to_users'] = 'Stuur mail aan gebruikers';
$lang['nbm_send_mode'] = 'Sturen';
$lang['nbm_send_options'] = 'Opties';
$lang['nbm_send_submit'] = 'Stuur';
-$lang['nbm_send_uncheck_all'] = 'Deselecteer Alles';
$lang['nbm_subscribe_col'] = 'Ingeschreven';
$lang['nbm_subscribe_mode'] = 'Inschrijven';
$lang['nbm_title_param'] = 'Parameters';
@@ -377,7 +366,6 @@ $lang['remote_site_local_update'] = 'lees locale listing.xml en werk bij';
$lang['remote_site_test'] = 'test';
$lang['remote_site_test_hint'] = 'test deze remote site';
$lang['remote_site_uncorrect_url'] = 'Remote site url moet starten met http of https end moet allen bestaan uit characters met "/", "a-zA-Z0-9", "-" or "_"';
-$lang['remove keyword'] = 'verwijder sleutelwoord';
$lang['remove tags'] = 'verwijder tags';
$lang['repair and optimize database'] = 'repareer en optimaliseer de database';
$lang['selection'] = 'selectie';
@@ -408,7 +396,6 @@ $lang['title_configuration'] = 'PhpWebGallery configuratie';
$lang['title_default'] = 'PhpWebGallery beheer';
$lang['title_edit_cat'] = 'Bewerk een categorie';
$lang['title_groups'] = 'Groepsbeheer';
-$lang['title_history'] = 'Geschiedenis';
$lang['title_liste_users'] = 'Gebruikerslijst';
$lang['title_picmod'] = 'Verander de informatie van een plaatje';
$lang['title_thumbnails'] = 'Thumbnails maken';
@@ -488,8 +475,6 @@ $lang['user_status_webmaster'] = 'Webmaster';
$lang['username'] = 'gebruikersnaam';
$lang['users'] = 'Gebruikers';
$lang['virtual_category'] = 'Virtuele categoriën';
-$lang['visitors'] = 'Bezoekers';
-$lang['w_day'] = 'Dag';
$lang['waiting'] = 'Wachten';
$lang['is_default_group'] = 'standaard';
$lang['toggle_is_default_group'] = 'Aanpassen \'standaard groep\' eigenschap';
@@ -497,10 +482,6 @@ $lang['Advanced_features'] = 'Geavanceerde functies';
$lang['Elements_not_linked'] = 'Niet gelinkte elementen';
$lang['web_services'] = 'Web services ';
$lang['title_wscheck'] = ' Toegangsbeheer';
-$lang['ws_set_status'] = ' Omgeving ';
-$lang['ws_enable'] = ' Inschakelen ';
-$lang['ws_disable'] = ' Uitschakelen ';
-$lang['ws set to'] = ' Tijdelijk ingesteld op';
$lang['ws_failed_upd'] = ' -> <strong>Niet voltooide eis</strong> ';
$lang['ws_success_upd'] = ' -> Succesvol afgerond ';
$lang['ws_adding_legend'] = ' Voeg een nieuwe partner toegang toe aan Web Services ';
@@ -515,7 +496,6 @@ $lang['ws_Request'] = ' Vraag ';
$lang['ws_Limit'] = ' Limiet ';
$lang['ws_Comment'] = ' Commentaar ';
$lang['Modify End from Now +'] = 'Verander eind vanaf hier + ';
-$lang['Confirmation'] = ' Bevestiging ';
$lang['Delete'] = ' Verwijderen ';
$lang['Confidential partner key'] = 'Vertrouwelijke partner sleutel';
$lang['Basis of access key calculation'] = 'Basis van de toegangssleutel berekening';
@@ -550,12 +530,10 @@ $lang['Month'] = 'Maand';
$lang['Day'] = 'Dag';
$lang['Pages seen'] = 'Pagina\'s bekeken';
$lang['Pictures'] = 'Afbeeldingen';
-$lang['High quality'] = 'Hoge kwaliteit';
$lang['time'] = 'tijd';
$lang['user'] = 'gebruiker';
$lang['IP'] = 'IP';
$lang['image'] = '';
-$lang['high quality'] = 'hoge kwaliteit';
$lang['section'] = 'sectie';
$lang['tags'] = 'tags';
$lang['conf_history_guest'] = 'Bewaar pagina bezoek van gasten';
@@ -631,8 +609,8 @@ $lang['Level 2'] = 'Vrienden';
$lang['Level 4'] = 'Familie';
$lang['Level 8'] = 'Admins';
/* TODO */ $lang['c13y_maintenance'] = 'Reinitialize check integrity';
-$lang['c13y_check_all'] = 'Selecteer alles';
-$lang['c13y_uncheck_all'] = 'Deselecteer alles';
+$lang['Check all'] = 'Selecteer alles';
+$lang['Uncheck all'] = 'Deselecteer alles';
/* TODO */ $lang['c13y_check_auto'] = 'Check automatic corrections';
$lang['c13y_submit_correction'] = 'Pas geselecteerde correcties toe';
/* TODO */ $lang['c13y_submit_ignore'] = 'Ignore selected anomalies';
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index cffaeb0de..816b55387 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -275,8 +275,6 @@ $lang['reg_err_login5'] = 'deze gebruikersnaam is al in gebruik';
$lang['reg_err_mail_address'] = 'mail adres moet zijn xxx@yyy.eee (voorbeeld : jack@altern.org)';
$lang['reg_err_pass'] = 'vul uw wachtwoord nogmaals in';
$lang['register'] = 'registreer';
-$lang['register_page_title'] = 'Registratie';
-$lang['register_title'] = 'Registratie';
$lang['remember_me'] = 'Auto login';
$lang['remove this tag'] = 'verwijder de tag van de lijst';
$lang['representative'] = 'representatief';
@@ -312,7 +310,6 @@ $lang['submit'] = 'Bevestig';
$lang['the beginning'] = 'het begin';
$lang['theme'] = 'thema';
$lang['thumbnails'] = 'Thumbnails';
-$lang['title_comments'] = 'Gebruikers commentaar';
$lang['title_menu'] = 'Menu';
$lang['title_send_mail'] = 'commentaar op je site';
$lang['today'] = 'vandaag';
@@ -336,7 +333,6 @@ $lang['upload_successful'] = 'Afbeelding met succes ge-upload, een beheerder moe
$lang['upload_title'] = 'Upload een afbeelding';
$lang['useful when password forgotten'] = 'handig bij het vergeten van je wachtwoord';
$lang['yes'] = 'Ja';
-$lang['page_end'] = 'Pagina eind';
$lang['qsearch'] = 'Snel zoeken';
$lang['Connected user: %s'] = 'Aangemeld als gebruiker: %s';
$lang['IP: %s'] = 'IP: %s';
diff --git a/plugins/event_tracer/tracer_admin.tpl b/plugins/event_tracer/tracer_admin.tpl
index 4830a8b85..9ff457019 100644
--- a/plugins/event_tracer/tracer_admin.tpl
+++ b/plugins/event_tracer/tracer_admin.tpl
@@ -8,7 +8,7 @@ The event tracer is a developer tool that logs in the footer of the window all c
You can use this plugin to see what events is PhpWebGallery calling.
<b>Note that $conf['show_queries'] must be true.</b>
</p>
-<form method="post" action="{$EVENT_TRACER_F_ACTION}" class="general">
+<form method="post" action="" class="general">
<fieldset>
<legend>Event Tracer</legend>
diff --git a/profile.php b/profile.php
index a74ca42de..cf8868e74 100644
--- a/profile.php
+++ b/profile.php
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | file : $Id$
// | last update : $Date$
@@ -54,8 +54,6 @@ if (!defined('PHPWG_ROOT_PATH'))
make_index_url(), // for redirect
$userdata );
- $template->assign('U_HOME', make_index_url());
-
// +-----------------------------------------------------------------------+
// | errors display |
// +-----------------------------------------------------------------------+
@@ -70,16 +68,26 @@ if (!defined('PHPWG_ROOT_PATH'))
}
//------------------------------------------------------ update & customization
-function save_profile_from_post(&$userdata, &$errors)
+function save_profile_from_post($userdata, &$errors)
{
global $conf;
$errors = array();
-
+
if (!isset($_POST['validate']))
{
return false;
}
+ $special_user = in_array($userdata['id'], array($conf['guest_id'], $conf['default_user_id']));
+ if ($special_user)
+ {
+ unset($_POST['mail_address'],
+ $_POST['password'],
+ $_POST['use_new_pwd'],
+ $_POST['passwordConf']
+ );
+ }
+
$int_pattern = '/^\d+$/';
if (empty($_POST['nb_image_line'])
or (!preg_match($int_pattern, $_POST['nb_image_line'])))
@@ -158,7 +166,7 @@ function save_profile_from_post(&$userdata, &$errors)
$fields = array($conf['user_fields']['email']);
$data = array();
- $data{$conf['user_fields']['id']} = $_POST['userid'];
+ $data{$conf['user_fields']['id']} = $userdata['id'];
$data{$conf['user_fields']['email']} = $_POST['mail_address'];
// password is updated only if filled
@@ -182,7 +190,7 @@ function save_profile_from_post(&$userdata, &$errors)
);
$data = array();
- $data['user_id'] = $_POST['userid'];
+ $data['user_id'] = $userdata['id'];
foreach ($fields as $field)
{
@@ -195,7 +203,7 @@ function save_profile_from_post(&$userdata, &$errors)
array('primary' => array('user_id'), 'update' => $fields),
array($data));
- trigger_action( 'loc_user_profile_updated', $_POST['userid'] );
+ trigger_action( 'save_profile_from_post', $userdata['id'] );
if (!empty($_POST['redirect']))
{
@@ -214,13 +222,12 @@ function load_profile_in_template($url_action, $url_redirect, $userdata)
$template->assign('radio_options',
array(
- 'true' => l10n('yes'),
- 'false' => l10n('no')));
+ 'true' => l10n('Yes'),
+ 'false' => l10n('No')));
$template->assign(
array(
'USERNAME'=>$userdata['username'],
- 'USERID'=>$userdata['id'],
'EMAIL'=>get_email_address_as_display_text(@$userdata['email']),
'NB_IMAGE_LINE'=>$userdata['nb_image_line'],
'NB_ROW_PAGE'=>$userdata['nb_line_page'],
@@ -255,12 +262,13 @@ function load_profile_in_template($url_action, $url_redirect, $userdata)
}
$template->assign('language_options', $language_options);
- if (!(in_array($userdata['id'], array($conf['guest_id'], $conf['default_user_id']))))
- {
- $template->assign('not_special_user', true);
- $template->assign('in_admin', defined('IN_ADMIN'));
- }
+ $special_user = in_array($userdata['id'], array($conf['guest_id'], $conf['default_user_id']));
+ $template->assign('SPECIAL_USER', $special_user);
+ $template->assign('IN_ADMIN', defined('IN_ADMIN'));
+ // allow plugins to add their own form data to content
+ trigger_action( 'load_profile_in_template', $userdata );
+
$template->assign_var_from_handle('PROFILE_CONTENT', 'profile_content');
}
?>
diff --git a/register.php b/register.php
index fc9122bd3..7dc791a24 100644
--- a/register.php
+++ b/register.php
@@ -70,7 +70,7 @@ $email = !empty($_POST['mail_address'])?$_POST['mail_address']:'';
//
// Start output of page
//
-$title= l10n('register_page_title');
+$title= l10n('Registration');
$page['body_id'] = 'theRegisterPage';
include(PHPWG_ROOT_PATH.'include/page_header.php');
diff --git a/template/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index c7a83f8d7..b408a5a50 100644
--- a/template/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
@@ -6,9 +6,9 @@
<form id="addVirtual" action="{$F_ACTION}" method="post">
<p>
{'cat_add'|@translate} : <input type="text" name="virtual_name" />
- <input class="submit" type="submit" value="{'submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED} />
+ <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED} />
{if count($categories)>9 }
- <a href="#EoP" class="button"><img src="{$themeconf.icon_dir}/page_end.png" class="button" alt="{'page_end'|@translate}" /></a>
+ <a href="#EoP" class="button"><img src="{$themeconf.icon_dir}/page_end.png" class="button" alt="page_end" /></a>
{/if}
</p>
</form>
diff --git a/template/yoga/admin/check_integrity.tpl b/template/yoga/admin/check_integrity.tpl
index 7bbd1183f..1e8c65db3 100644
--- a/template/yoga/admin/check_integrity.tpl
+++ b/template/yoga/admin/check_integrity.tpl
@@ -56,8 +56,8 @@
<p>
{if $c13y_show_submit_ignore}
- <a href="#" onclick="SelectAll(document.getElementById('c13y')); return false;">{'c13y_check_all'|@translate}</a>
- / <a href="#" onclick="DeselectAll(document.getElementById('c13y')); return false;">{'c13y_uncheck_all'|@translate}</a>
+ <a href="#" onclick="SelectAll(document.getElementById('c13y')); return false;">{'Check all'|@translate}</a>
+ / <a href="#" onclick="DeselectAll(document.getElementById('c13y')); return false;">{'Uncheck all'|@translate}</a>
{/if}
{if isset($c13y_do_check)}
/ <a href="#" onclick="DeselectAll(document.getElementById('c13y'));
diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
index ec04852cb..3afa4161b 100644
--- a/template/yoga/admin/notification_by_mail.tpl
+++ b/template/yoga/admin/notification_by_mail.tpl
@@ -24,8 +24,8 @@
<tr>
<td><label>{lang:nbm_send_html_mail}</label></td>
<td>
- <label><input type="radio" name="nbm_send_html_mail" value="true" {param.SEND_HTML_MAIL_YES}/>{lang:yes}</label>
- <label><input type="radio" name="nbm_send_html_mail" value="false" {param.SEND_HTML_MAIL_NO}/>{lang:no}</label>
+ <label><input type="radio" name="nbm_send_html_mail" value="true" {param.SEND_HTML_MAIL_YES}/>{lang:Yes}</label>
+ <label><input type="radio" name="nbm_send_html_mail" value="false" {param.SEND_HTML_MAIL_NO}/>{lang:No}</label>
</td>
</tr>
<tr>
@@ -38,8 +38,8 @@
<tr>
<td><label>{lang:nbm_send_detailed_content}</label></td>
<td>
- <label><input type="radio" name="nbm_send_detailed_content" value="true" {param.SEND_DETAILED_CONTENT_YES}/>{lang:yes}</label>
- <label><input type="radio" name="nbm_send_detailed_content" value="false" {param.SEND_DETAILED_CONTENT_NO}/>{lang:no}</label>
+ <label><input type="radio" name="nbm_send_detailed_content" value="true" {param.SEND_DETAILED_CONTENT_YES}/>{lang:Yes}</label>
+ <label><input type="radio" name="nbm_send_detailed_content" value="false" {param.SEND_DETAILED_CONTENT_NO}/>{lang:No}</label>
</td>
</tr>
<tr>
@@ -52,8 +52,8 @@
<br><i><small>{lang:nbm_info_send_recent_post_dates}</small></i>
</td>
<td>
- <label><input type="radio" name="nbm_send_recent_post_dates" value="true" {param.SEND_RECENT_POST_DATES_YES}/>{lang:yes}</label>
- <label><input type="radio" name="nbm_send_recent_post_dates" value="false" {param.SEND_RECENT_POST_DATES_NO}/>{lang:no}</label>
+ <label><input type="radio" name="nbm_send_recent_post_dates" value="true" {param.SEND_RECENT_POST_DATES_YES}/>{lang:Yes}</label>
+ <label><input type="radio" name="nbm_send_recent_post_dates" value="false" {param.SEND_RECENT_POST_DATES_NO}/>{lang:No}</label>
</td>
</tr>
</table>
@@ -101,8 +101,8 @@
<!-- END user_send_mail -->
</table>
<p>
- <a href="#" onclick="SelectAll(document.getElementById('notification_by_mail')); return false;">{lang:nbm_send_check_all}</a>
- / <a href="#" onclick="DeselectAll(document.getElementById('notification_by_mail')); return false;">{lang:nbm_send_uncheck_all}</a>
+ <a href="#" onclick="SelectAll(document.getElementById('notification_by_mail')); return false;">{lang:Check all}</a>
+ / <a href="#" onclick="DeselectAll(document.getElementById('notification_by_mail')); return false;">{lang:Uncheck all}</a>
</p>
</fieldset>
diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index ffb0d651e..25b0e705e 100644
--- a/template/yoga/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
@@ -34,7 +34,7 @@
</label>
<label>
- {'Order by'|@translate}
+ {'Sort by'|@translate}
{html_options name=order_by options=$order_options selected=$order_selected}
</label>
@@ -62,7 +62,7 @@
{foreach from=$cpl_title_user item=title}
<th>{$title}</th>
{/foreach}
- <th>{'actions'|@translate}</th>
+ <th>{'Actions'|@translate}</th>
</tr>
{foreach from=$users item=user name=users_loop}
<tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
@@ -116,8 +116,8 @@
<td>
<label><input type="radio" name="adviser" value="leave" checked="checked" /> {'leave'|@translate}</label>
/ {'set to'|@translate}
- <label><input type="radio" name="adviser" value="true" {$ADVISER_YES} />{'yes'|@translate}</label>
- <label><input type="radio" name="adviser" value="false" {$ADVISER_NO} />{'no'|@translate}</label>
+ <label><input type="radio" name="adviser" value="true" {$ADVISER_YES} />{'Yes'|@translate}</label>
+ <label><input type="radio" name="adviser" value="false" {$ADVISER_NO} />{'No'|@translate}</label>
</td>
</tr>
{/if}
@@ -160,8 +160,8 @@
<td>
<label><input type="radio" name="enabled_high" value="leave" checked="checked" /> {'leave'|@translate}</label>
/ {'set to'|@translate}
- <label><input type="radio" name="enabled_high" value="true" {$ENABLED_HIGH_YES} />{'yes'|@translate}</label>
- <label><input type="radio" name="enabled_high" value="false" {$ENABLED_HIGH_NO} />{'no'|@translate}</label>
+ <label><input type="radio" name="enabled_high" value="true" {$ENABLED_HIGH_YES} />{'Yes'|@translate}</label>
+ <label><input type="radio" name="enabled_high" value="false" {$ENABLED_HIGH_NO} />{'No'|@translate}</label>
</td>
</tr>
@@ -243,8 +243,8 @@
<td>
<label><input type="radio" name="expand" value="leave" checked="checked" /> {'leave'|@translate}</label>
/ {'set to'|@translate}
- <label><input type="radio" name="expand" value="true" {$EXPAND_YES} />{'yes'|@translate}</label>
- <label><input type="radio" name="expand" value="false" {$EXPAND_NO} />{'no'|@translate}</label>
+ <label><input type="radio" name="expand" value="true" {$EXPAND_YES} />{'Yes'|@translate}</label>
+ <label><input type="radio" name="expand" value="false" {$EXPAND_NO} />{'No'|@translate}</label>
</td>
</tr>
@@ -253,8 +253,8 @@
<td>
<label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {'leave'|@translate}</label>
/ {'set to'|@translate}
- <label><input type="radio" name="show_nb_comments" value="true" {$SHOW_NB_COMMENTS_YES} />{'yes'|@translate}</label>
- <label><input type="radio" name="show_nb_comments" value="false" {$SHOW_NB_COMMENTS_NO} />{'no'|@translate}</label>
+ <label><input type="radio" name="show_nb_comments" value="true" {$SHOW_NB_COMMENTS_YES} />{'Yes'|@translate}</label>
+ <label><input type="radio" name="show_nb_comments" value="false" {$SHOW_NB_COMMENTS_NO} />{'No'|@translate}</label>
</td>
</tr>
@@ -263,8 +263,8 @@
<td>
<label><input type="radio" name="show_nb_hits" value="leave" checked="checked" /> {'leave'|@translate}</label>
/ {'set to'|@translate}
- <label><input type="radio" name="show_nb_hits" value="true" {$SHOW_NB_HITS_YES} />{'yes'|@translate}</label>
- <label><input type="radio" name="show_nb_hits" value="false" {$SHOW_NB_HITS_NO} />{'no'|@translate}</label>
+ <label><input type="radio" name="show_nb_hits" value="true" {$SHOW_NB_HITS_YES} />{'Yes'|@translate}</label>
+ <label><input type="radio" name="show_nb_hits" value="false" {$SHOW_NB_HITS_NO} />{'No'|@translate}</label>
</td>
</tr>
@@ -303,8 +303,8 @@
</p>
<p>
- <input class="submit" type="submit" value="{'submit'|@translate}" name="pref_submit" {$TAG_INPUT_ENABLED} />
- <input class="submit" type="reset" value="{'reset'|@translate}" name="pref_reset" />
+ <input class="submit" type="submit" value="{'Submit'|@translate}" name="pref_submit" {$TAG_INPUT_ENABLED} />
+ <input class="submit" type="reset" value="{'Reset'|@translate}" name="pref_reset" />
</p>
</form>
diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl
index 081344925..b2ebef958 100644
--- a/template/yoga/index.tpl
+++ b/template/yoga/index.tpl
@@ -28,7 +28,7 @@
{/if}
{if isset($U_SLIDESHOW) }
- <li><a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_slideshow.png" class="button" alt="{'slideshow'|@translate}"/></a></li>
+ <li><a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_slideshow.png" class="button" alt="{'slideshow'|@translate}"/></a></li>
{/if}
{if isset($U_MODE_FLAT) }
@@ -68,7 +68,7 @@
</div> <!-- titrePage -->
-{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
+{if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
{if !empty($category_search_results) }
<div style="font-size:16px;text-align:left;margin:10px">{'Category results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
diff --git a/template/yoga/profile_content.tpl b/template/yoga/profile_content.tpl
index 2be70857b..9cabf0a51 100644
--- a/template/yoga/profile_content.tpl
+++ b/template/yoga/profile_content.tpl
@@ -2,22 +2,21 @@
<form method="post" name="profile" action="{$F_ACTION}" id="profile" class="properties">
<fieldset>
- <legend>{'register_title'|@translate}</legend>
- <input type="hidden" name="userid" value="{$USERID}" />
+ <legend>{'Registration'|@translate}</legend>
<input type="hidden" name="redirect" value="{$REDIRECT}" />
<ul>
<li>
<span class="property">{'Username'|@translate}</span>
{$USERNAME}
</li>
-{if isset($not_special_user)}
+{if not $SPECIAL_USER} {* can modify password + email*}
<li>
<span class="property">
<label for="mail_address">{'Email address'|@translate}</label>
</span>
<input type="text" name="mail_address" id="mail_address" value="{$EMAIL}">
</li>
-{if !$in_admin}
+{if not $IN_ADMIN} {* admins do not need old password*}
<li>
<span class="property">
<label for="password">{'Password'|@translate}</label>
@@ -103,8 +102,8 @@
</fieldset>
<p class="bottomButtons">
- <input class="submit" type="submit" name="validate" value="{'submit'|@translate}">
- <input class="submit" type="reset" name="reset" value="{'reset'|@translate}">
+ <input class="submit" type="submit" name="validate" value="{'Submit'|@translate}">
+ <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
</p>
</form>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 08:09:12 +0000