aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/calendar_monthly.class.php16
-rw-r--r--include/functions.inc.php2
-rw-r--r--include/functions_category.inc.php4
-rw-r--r--include/functions_html.inc.php18
-rw-r--r--language/en_UK/admin.lang.php21
-rw-r--r--language/en_UK/common.lang.php53
-rw-r--r--language/es_ES/admin.lang.php21
-rw-r--r--language/es_ES/common.lang.php31
-rw-r--r--language/fr_FR/admin.lang.php21
-rw-r--r--language/fr_FR/common.lang.php35
-rw-r--r--language/nl_NL/admin.lang.php22
-rw-r--r--language/nl_NL/common.lang.php32
-rw-r--r--picture.php2
-rw-r--r--template/yoga/menubar.tpl8
-rw-r--r--template/yoga/month_calendar.tpl2
-rw-r--r--template/yoga/picture.tpl6
-rw-r--r--template/yoga/upload.tpl90
-rw-r--r--upload.php55
18 files changed, 159 insertions, 280 deletions
diff --git a/include/calendar_monthly.class.php b/include/calendar_monthly.class.php
index ec3a656bc..afec4b000 100644
--- a/include/calendar_monthly.class.php
+++ b/include/calendar_monthly.class.php
@@ -480,16 +480,16 @@ SELECT id, file,tn_ext,path, width, height, DAYOFWEEK('.$this->date_field.')-1 a
)
)
);
- $alt = $wday_labels[$dow] . ' ' . $day.
- ' ('.sprintf("%d ".l10n('pictures'), $items[$day]['nb_images']).')';
$tpl_crt_week[] =
array(
- 'DAY' => $day,
- 'IMAGE' => $items[$day]['tn_url'],
- 'U_IMG_LINK'=> $url,
- 'IMAGE_STYLE' => $css_style,
- 'IMAGE_ALT' => $alt,
+ 'DAY' => $day,
+ 'DOW' => $dow,
+ 'NB_ELEMENTS' => $items[$day]['nb_images'],
+ 'IMAGE' => $items[$day]['tn_url'],
+ 'U_IMG_LINK' => $url,
+ 'IMAGE_STYLE' => $css_style,
+ 'IMAGE_ALT' => $items[$day]['file'],
);
}
}
@@ -514,4 +514,4 @@ SELECT id, file,tn_ext,path, width, height, DAYOFWEEK('.$this->date_field.')-1 a
}
}
-?> \ No newline at end of file
+?>
diff --git a/include/functions.inc.php b/include/functions.inc.php
index bc08ce41d..ff0ca41b0 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1084,7 +1084,7 @@ function l10n($key)
if ($conf['debug_l10n'] and !isset($lang[$key]) and !empty($key))
{
- echo '[l10n] language key "'.$key.'" is not defined<br />';
+ trigger_error('[l10n] language key "'.$key.'" is not defined', E_USER_NOTICE);
}
return isset($lang[$key]) ? $lang[$key] : $key;
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index cbbe2fce9..e0e410c1e 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -466,7 +466,7 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_
}
//at least one image direct or indirect
- $display_text.= l10n_dec('image_available', 'images_available', $cat_count_images);
+ $display_text.= l10n_dec('%d element', '%d elements', $cat_count_images);
if ($cat_count_categories == 0 or $cat_nb_images == $cat_count_images)
{
@@ -485,4 +485,4 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_
return $display_text;
}
-?> \ No newline at end of file
+?>
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 2b0486e70..36d56aea9 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -26,7 +26,7 @@
function get_icon($date, $is_child_date = false)
{
- global $page, $user, $lang;
+ global $page, $user;
if (empty($date))
{
@@ -54,8 +54,10 @@ function get_icon($date, $is_child_date = false)
if ( !isset($page['get_icon_cache']['_icons_'] ) )
{
$icons = array(false => 'recent', true => 'recent_by_child' );
- $title = l10n('recent_image').'&nbsp;'.$user['recent_period']
- .'&nbsp;'.l10n('days');
+ $title = sprintf(
+ l10n('elements posted during the last %d days'),
+ $user['recent_period']
+ );
foreach ($icons as $key => $icon)
{
$icon_url = get_themeconf('icon_dir').'/'.$icon.'.png';
@@ -78,7 +80,7 @@ function create_navigation_bar(
$url, $nb_element, $start, $nb_element_page, $clean_url = false
)
{
- global $lang, $conf;
+ global $conf;
$pages_around = $conf['paginate_pages_around'];
$start_str = $clean_url ? '/start-' :
@@ -374,8 +376,6 @@ SELECT id, name, permalink
*/
function get_html_menu_category($categories, $selected_category)
{
- global $lang;
-
$ref_level = 0;
$level = 0;
@@ -558,7 +558,7 @@ function name_compare($a, $b)
*/
function access_denied()
{
- global $user, $lang;
+ global $user;
$login_url =
get_root_url().'identification.php?redirect='
@@ -649,7 +649,7 @@ function get_tags_content_title()
)
)
.'" title="'
- .l10n('See pictures linked to this tag only')
+ .l10n('See elements linked to this tag only')
.'">'
.$page['tags'][$i]['name']
.'</a>';
@@ -747,4 +747,4 @@ function render_category_literal_description($desc)
{
return strip_tags($desc, '<span><p><a><br><b><i><small><big><strong><em>');
}
-?> \ No newline at end of file
+?>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index b17fcfe7e..1dd14f9e5 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -34,8 +34,6 @@ $lang['cat_inclu_part3_S'] = ' and %d virtual';
$lang['cat_inclu_part3_P'] = ' and %d virtual';
$lang['%d category moved'] = '%d category moved';
$lang['%d categories moved'] = '%d categories moved';
-$lang['%d element'] = '%d element';
-$lang['%d elements'] = '%d elements';
$lang['%d group'] = '%d group';
$lang['%d groups'] = '%d groups';
$lang['%d member'] = '%d member';
@@ -79,7 +77,6 @@ $lang['Check for upgrade failed for unknown reasons.'] = 'Check for upgrade fail
$lang['Check for upgrade'] = 'Check for upgrade';
$lang['Comments for all'] = 'Comments for all';
$lang['Controversy'] = 'Controversy';
-$lang['Creation date'] = 'Creation date';
$lang['Current name'] = 'Current name';
$lang['Database'] = 'Database';
$lang['Deactivate'] = 'Deactivate';
@@ -133,7 +130,6 @@ $lang['New name'] = 'New name';
$lang['New parent category'] = 'New parent category';
$lang['New tag'] = 'New tag';
$lang['No tag defined. Use Administration>Pictures>Tags'] = 'No tag defined. Use Administration>Pictures>Tags';
-$lang['No'] = 'No';
$lang['Number of comments per page'] = 'Number of comments per page';
$lang['Number of rates'] = 'Number of rates';
$lang['Number of thumbnails to create'] = 'Number of thumbnails to create';
@@ -182,7 +178,6 @@ $lang['Site manager'] = 'Site manager';
$lang['Status'] = 'Status';
$lang['Statistics'] = 'Statistics';
$lang['Storage category'] = 'Storage category';
-$lang['Submit'] = 'Submit';
$lang['Sum of rates'] = 'Sum of rates';
$lang['Tag "%s" already exists'] = 'Tag "%s" already exists';
$lang['Tag "%s" was added'] = 'Tag "%s" was added';
@@ -203,7 +198,6 @@ $lang['Virtual categories movement'] = 'Virtual categories movement';
$lang['Virtual categories to move'] = 'Virtual categories to move';
$lang['Virtual category name'] = 'Virtual category name';
$lang['Webmaster cannot be deleted'] = 'Webmaster cannot be deleted';
-$lang['Yes'] = 'Yes';
$lang['You are running on development sources, no check possible.'] = 'You are running on development sources, no check possible.';
$lang['You are running the latest version of PhpWebGallery.'] = 'You are running the latest version of PhpWebGallery.';
$lang['You cannot delete your account'] = "You cannot delete your account";
@@ -400,19 +394,6 @@ $lang['site_local'] = 'Local';
$lang['site_remote'] = 'Remote';
$lang['site_synchronize'] = 'synchronize';
$lang['site_synchronize_hint'] = 'update the database from files';
-$lang['stats_addr'] = 'IP Address';
-$lang['stats_category'] = 'Category';
-$lang['stats_daily_graph_title'] = 'Pages seen by hour';
-$lang['stats_day_title'] = 'Daily statistics';
-$lang['stats_file'] = 'File';
-$lang['stats_global_graph_title'] = 'Pages seen by month';
-$lang['stats_hour'] = 'Hour';
-$lang['stats_login'] = 'Login';
-$lang['stats_month_title'] = 'Monthly statistics';
-$lang['stats_monthly_graph_title'] = 'Pages seen by day';
-$lang['stats_pages_seen'] = 'Pages seen';
-$lang['stats_picture'] = 'Picture';
-$lang['stats_title'] = 'Last year statistics';
$lang['status'] = 'status';
$lang['storage'] = 'Directory';
$lang['sub-categories'] = 'sub-categories';
@@ -682,4 +663,4 @@ $lang['plugins_check_chmod'] = 'Please check "plugins" folder and sub-folders pe
$lang['plugins_server_error'] = 'Can\'t connect to server.';
$lang['Purge compiled templates'] = 'Purge compiled templates';
-?> \ No newline at end of file
+?>
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index cae146631..a34d8eb96 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -43,12 +43,10 @@ $lang['%d comment'] = '%d comment';
$lang['%d comments'] = '%d comments';
$lang['%d hit'] = '%d hit';
$lang['%d hits'] = '%d hits';
-$lang['%d new element'] = '%d new element';
-$lang['%d new elements'] = '%d new elements';
+$lang['%d new element'] = '%d new image';
+$lang['%d new elements'] = '%d new images';
$lang['%d new user'] = '%d new user';
$lang['%d new users'] = '%d new users';
-$lang['%d picture are also linked to current tags'] = '%d picture is also linked to current tags';
-$lang['%d pictures are also linked to current tags'] = '%d pictures are also linked to current tags';
$lang['%d waiting element'] = '%d waiting element';
$lang['%d waiting elements'] = '%d waiting elements';
$lang['About'] = 'About';
@@ -118,7 +116,6 @@ $lang['Search rules'] = 'Search rules';
$lang['Search tags'] = 'Search tags';
$lang['Search'] = 'Search';
$lang['See available tags'] = 'See available tags';
-$lang['See pictures linked to this tag only'] = 'See pictures linked to this tag only';
$lang['Send new password'] = 'Send new password';
$lang['Since'] = 'Since';
$lang['Sort by'] = 'Sort by';
@@ -135,8 +132,7 @@ $lang['Week %d'] = 'Week %d';
$lang['about_page_title'] = 'About PhpWebGallery';
$lang['access_forbiden'] = 'You are not authorized to access the requested page';
$lang['add to caddie'] = 'add to caddie';
-$lang['add_favorites_alt'] = 'Add to favorites';
-$lang['add_favorites_hint'] = 'Add this picture to your favorites';
+$lang['add_favorites_hint'] = 'add this image to your favorites';
$lang['admin'] = 'Administration';
$lang['adviser_mode_enabled'] = 'Adviser mode enabled';
$lang['all'] = 'all';
@@ -183,10 +179,8 @@ $lang['day'][3] = 'Wednesday';
$lang['day'][4] = 'Thursday';
$lang['day'][5] = 'Friday';
$lang['day'][6] = 'Saturday';
-$lang['days'] = 'days';
$lang['default_sort'] = 'Default';
-$lang['del_favorites_alt'] = 'Delete from favorites';
-$lang['del_favorites_hint'] = 'Delete this picture from your favorites';
+$lang['del_favorites_hint'] = 'delete this image from your favorites';
$lang['delete'] = 'Delete';
$lang['descending'] = 'descending';
$lang['download'] = 'download';
@@ -210,10 +204,7 @@ $lang['hint_customize'] = 'customize the appareance of the gallery';
$lang['hint_search'] = 'search';
$lang['home'] = 'Home';
$lang['home_hint'] = 'Back to the home page';
-$lang['ident_title'] = 'ident_title';
$lang['identification'] = 'Identification';
-$lang['image_available'] = '%d image';
-$lang['images_available'] = '%d images';
$lang['images_available_cpl'] = 'in this category';
$lang['images_available_cat'] = 'in %d sub-category';
$lang['images_available_cats'] = 'in %d sub-categories';
@@ -256,17 +247,16 @@ $lang['nbm_unknown_identifier'] = 'Unknown identifier';
$lang['new_password'] = 'New password';
$lang['new_rate'] = 'Rate this picture';
$lang['next_page'] = 'Next';
-$lang['no'] = 'No';
+/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'No' */ $lang['no'] = 'no';
$lang['no_category'] = 'Home';
$lang['no_rate'] = 'no rate';
-$lang['note_filter_day'] = 'Only displays elements posted within the last %s day.';
-$lang['note_filter_days'] = 'Only displays elements posted within the last %s days.';
+$lang['note_filter_day'] = 'Only displays elements posted within the last %d day.';
+$lang['note_filter_days'] = 'Only displays elements posted within the last %d days.';
$lang['password updated'] = 'password updated';
$lang['periods_error'] = 'Recent period must be a positive integer value';
-$lang['picture'] = 'picture';
+/* DEPRECATED USED IN comments.php FOR image_id ? */ $lang['picture'] = 'picture';
$lang['picture_high'] = 'Click on the picture to see it in high definition';
$lang['picture_show_metadata'] = 'Show file metadata';
-$lang['pictures'] = 'pictures';
$lang['powered_by'] = 'Powered by';
$lang['preferences'] = 'Preferences';
$lang['previous_page'] = 'Previous';
@@ -274,7 +264,6 @@ $lang['random_cat'] = 'Random pictures';
$lang['random_cat_hint'] = 'displays a set of random pictures';
$lang['recent_cats_cat'] = 'Recent categories';
$lang['recent_cats_cat_hint'] = 'displays recently updated categories';
-$lang['recent_image'] = 'Images within the';
$lang['recent_period'] = 'Recent period';
$lang['recent_pics_cat'] = 'Recent pictures';
$lang['recent_pics_cat_hint'] = 'displays most recent pictures';
@@ -291,7 +280,7 @@ $lang['register_title'] = 'Registration';
$lang['remember_me'] = 'Auto login';
$lang['remove this tag'] = 'remove this tag from the list';
$lang['representative'] = 'representative';
-$lang['reset'] = 'Reset';
+/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'Reset' */ $lang['reset'] = 'reset';
$lang['return to homepage'] = 'return to homepage';
$lang['search'] = 'Search';
$lang['search_author'] = 'Search for Author';
@@ -317,9 +306,9 @@ $lang['slideshow'] = 'slideshow';
$lang['slideshow_stop'] = 'stop the slideshow';
$lang['special_categories'] = 'Specials';
$lang['sql_queries_in'] = 'SQL queries in';
-$lang['start_filter_hint'] = 'displays only recently posted elements';
-$lang['stop_filter_hint'] = 'return to the display of all elements';
-$lang['submit'] = 'Submit';
+$lang['start_filter_hint'] = 'displays only recently posted images';
+$lang['stop_filter_hint'] = 'return to the display of all images';
+/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'Submit' */ $lang['submit'] = 'submit';
$lang['the beginning'] = 'the beginning';
$lang['theme'] = 'Interface theme';
$lang['thumbnails'] = 'Thumbnails';
@@ -327,7 +316,6 @@ $lang['title_comments'] = 'Users comments';
$lang['title_menu'] = 'Menu';
$lang['title_send_mail'] = 'A comment on your site';
$lang['today'] = 'today';
-$lang['total'] = 'images';
$lang['update_rate'] = 'Update your rating';
$lang['update_wrong_dirname'] = 'wrong filename';
$lang['upload_advise'] = 'Choose an image to place in the category : ';
@@ -338,7 +326,6 @@ $lang['upload_advise_thumbnail'] = 'Optional, but recommended : choose a thumbna
$lang['upload_advise_width'] = 'the width of the picture must not exceed : ';
$lang['upload_author'] = 'Author (eg "Pierrick LE GALL")';
$lang['upload_cannot_upload'] = 'can\'t upload the picture on the server';
-$lang['upload_creation_date'] = 'Creation date (DD/MM/YYYY)';
$lang['upload_err_username'] = 'the username must be given';
$lang['upload_file_exists'] = 'A picture\'s name already used';
$lang['upload_filenotfound'] = 'You must choose a picture fileformat for the image';
@@ -347,10 +334,8 @@ $lang['upload_name'] = 'Name of the picture';
$lang['upload_picture'] = 'Upload a picture';
$lang['upload_successful'] = 'Picture uploaded with success, an administrator will validate it as soon as possible';
$lang['upload_title'] = 'Upload a picture';
-$lang['upload_username'] = 'Username';
$lang['useful when password forgotten'] = 'useful when password forgotten';
-$lang['w_month'] = 'Month';
-$lang['yes'] = 'Yes';
+/* 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';
@@ -384,5 +369,13 @@ $lang['start_repeat'] = 'Repeat the slideshow';
$lang['stop_repeat'] = 'Not repeat the slideshow';
$lang['inc_period'] = 'Increase waiting between pictures';
$lang['dec_period'] = 'Decrease waiting between pictures';
-
-?> \ No newline at end of file
+$lang['Submit'] = 'Submit';
+$lang['Yes'] = 'Yes';
+$lang['No'] = 'No';
+$lang['%d element']='%d image';
+$lang['%d elements']='%d images';
+$lang['%d element are also linked to current tags'] = '%d image is also linked to current tags';
+$lang['%d elements are also linked to current tags'] = '%d images are also linked to current tags';
+$lang['See elements linked to this tag only'] = 'See images linked to this tag only';
+$lang['elements posted during the last %d days'] = 'images posted during the last %d days';
+?>
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index de805d6e4..bce57a8a7 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -34,8 +34,6 @@ $lang['cat_inclu_part3_S'] = ' et %d virtual';
$lang['cat_inclu_part3_P'] = ' et %d virtuales';
$lang['%d category moved'] = '%d categoría trasladada';
$lang['%d categories moved'] = '%d categorías trasladadas';
-$lang['%d element'] = '%d elemento';
-$lang['%d elements'] = '%d elementos';
$lang['%d group'] = '%d grupo';
$lang['%d groups'] = '%d grupos';
$lang['%d member'] = '%d miembro';
@@ -78,7 +76,6 @@ $lang['Check for upgrade failed for unknown reasons.'] = 'La comprobación de la
$lang['Check for upgrade'] = 'Última versión';
$lang['Comments for all'] = 'Comentarios para todos';
$lang['Controversy'] = 'Controversia';
-$lang['Creation date'] = 'Fecha de creación';
$lang['Current name'] = 'Nombre corriente';
$lang['Database'] = 'Base de datos';
$lang['Deactivate'] = 'Desactivar';
@@ -132,7 +129,6 @@ $lang['New name'] = 'Nuevo nombre';
$lang['New parent category'] = 'Nueva categoría allegada';
$lang['New tag'] = 'Nuevo tag';
$lang['No tag defined. Use Administration>Pictures>Tags'] = 'Ninguna tag definida. Utilizar la pantalla Adminstration> Imágenes> tags';
-$lang['No'] = 'No';
$lang['Number of comments per page'] = 'Número de comentarios por página';
$lang['Number of rates'] = 'Número de notas';
$lang['Number of thumbnails to create'] = 'Número de miniaturas que hay que crear';
@@ -181,7 +177,6 @@ $lang['Site manager'] = 'Gerente de los sitios';
$lang['Status'] = 'Estatuto';
$lang['Statistics'] = 'Estadísticas';
$lang['Storage category'] = 'Categoría de almacenamiento';
-$lang['Submit'] = 'Validar';
$lang['Sum of rates'] = 'Suma notas';
$lang['Tag "%s" already exists'] = 'El tag "%s" ya existe';
$lang['Tag "%s" was added'] = 'El tag "%s" ha sido añadida';
@@ -202,7 +197,6 @@ $lang['Virtual categories movement'] = 'Desplazamiento de categorías virtuales'
$lang['Virtual categories to move'] = 'Categorías virtuales que hay que desplazar';
$lang['Virtual category name'] = 'Nombre de la categoría virtual';
$lang['Webmaster cannot be deleted'] = 'El webmestre no puede ser suprimido';
-$lang['Yes'] = 'Si';
$lang['You are running on development sources, no check possible.'] = 'Usted trabaja con las fuentes de desarrollo, imposible verificar la última versión.';
$lang['You are running the latest version of PhpWebGallery.'] = 'Usted utiliza la última versión de PhpWebGallery.';
$lang['You cannot delete your account'] = "Usted no puede suprimir su cuenta";
@@ -400,19 +394,6 @@ $lang['site_local'] = 'Local';
$lang['site_remote'] = 'Distante';
$lang['site_synchronize'] = 'Sincronizar';
$lang['site_synchronize_hint'] = 'pone al día la base de datos a partir de los ficheros';
-$lang['stats_addr'] = 'Envía a IP';
-$lang['stats_category'] = 'Categoría';
-$lang['stats_daily_graph_title'] = 'Páginas vistas por hora';
-$lang['stats_day_title'] = 'Estadísticas diarias';
-$lang['stats_file'] = 'Fichero';
-$lang['stats_global_graph_title'] = 'Páginas vistas este mes';
-$lang['stats_hour'] = 'Hora';
-$lang['stats_login'] = 'Identificando';
-$lang['stats_month_title'] = 'Estadísticas mensuales';
-$lang['stats_monthly_graph_title'] = 'Páginas vistas este día';
-$lang['stats_pages_seen'] = 'Páginas vistas';
-$lang['stats_picture'] = 'Imagen';
-$lang['stats_title'] = 'Estadísticas del último año';
$lang['status'] = 'Estatuto';
$lang['storage'] = 'Repertorio';
$lang['sub-categories'] = 'subcategorías';
@@ -660,4 +641,4 @@ $lang['c13y_anomaly_ignored_count'] = '%d anomalía ha sido ignorada.';
$lang['c13y_anomalies_ignored_count'] = '%d anomalías han sido ignoradas.';
/* TODO */ $lang['Purge compiled templates'] = 'Purge compiled templates';
-?> \ No newline at end of file
+?>
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index 779eb743f..76dd89c1a 100644
--- a/language/es_ES/common.lang.php
+++ b/language/es_ES/common.lang.php
@@ -47,8 +47,6 @@ $lang['%d new element'] = '%d nuevo elemento';
$lang['%d new elements'] = '%d nuevos Elementos';
$lang['%d new user'] = '%d nuevo usuario';
$lang['%d new users'] = '%d nuevos usuarios';
-$lang['%d picture are also linked to current tags'] = '%d imagen es también vinculada a los tags corrientes';
-$lang['%d pictures are also linked to current tags'] = '%d imagenes son igualmente vinculadas a los tags corrientes';
$lang['%d waiting element'] = '%d elemento en espera';
$lang['%d waiting elements'] = '%d elementos en espera';
$lang['About'] = 'Acerca de';
@@ -118,7 +116,6 @@ $lang['Search rules'] = 'Criterios de búsqueda';
$lang['Search tags'] = 'Buscar tags';
$lang['Search'] = 'Buscar';
$lang['See available tags'] = 'Ver los tags disponibles';
-$lang['See pictures linked to this tag only'] = 'Ver las imágenes relacionadas únicamente a este tag';
$lang['Send new password'] = 'Enviar una nueva contraseña';
$lang['Since'] = 'Desde';
$lang['Sort by'] = 'Clasificar según';
@@ -135,8 +132,7 @@ $lang['Week %d'] = 'Semana %d';
$lang['about_page_title'] = 'Acerca de PhpWebGallery';
$lang['access_forbiden'] = 'Usted no esta autorizado a ver la pagina pedida';
$lang['add to caddie'] = 'Agregar al carrito';
-$lang['add_favorites_alt'] = 'Agregar en los favoritos';
-$lang['add_favorites_hint'] = 'Agregar esta imagen en sus favoritos';
+$lang['add_favorites_hint'] = 'agregar esta imagen en sus favoritos';
$lang['admin'] = 'Administración';
$lang['adviser_mode_enabled'] = 'Modo consejero activo';
$lang['all'] = 'todo';
@@ -183,10 +179,8 @@ $lang['day'][3] = 'Miércoles';
$lang['day'][4] = 'Jueves';
$lang['day'][5] = 'Viernes';
$lang['day'][6] = 'Sábado';
-$lang['days'] = 'días';
$lang['default_sort'] = 'Por defecto';
-$lang['del_favorites_alt'] = 'Borrar favoritos';
-$lang['del_favorites_hint'] = 'Borrar esta imágen de sus favoritos';
+$lang['del_favorites_hint'] = 'borrar esta imágen de sus favoritos';
$lang['delete'] = 'Suprimir';
$lang['descending'] = 'Descendiente';
$lang['download'] = 'descargar';
@@ -210,10 +204,7 @@ $lang['hint_customize'] = 'personalizar aspecto de la galería';
$lang['hint_search'] = 'Buscar';
$lang['home'] = 'Inicio';
$lang['home_hint'] = 'Volver a la página de inicio';
-$lang['ident_title'] = 'Identificación (FIXME)';
$lang['identification'] = 'Identificación';
-$lang['image_available'] = '%d Imágen';
-$lang['images_available'] = '%d Imágenes';
$lang['images_available_cpl'] = 'en esta categoría';
$lang['images_available_cat'] = 'en %d subcategoría';
$lang['images_available_cats'] = 'en %d subcategorías';
@@ -266,7 +257,6 @@ $lang['periods_error'] = 'El período de novedad debe ser un numero entero posit
$lang['picture'] = 'imagen';
$lang['picture_high'] = 'Pulse sobre la imagen para ver en alta resolución';
$lang['picture_show_metadata'] = 'Muestre los meta-datos del fichero';
-$lang['pictures'] = 'imágenes';
$lang['powered_by'] = 'Distribuido por';
$lang['preferences'] = 'Preferencias';
$lang['previous_page'] = 'Precedente';
@@ -274,7 +264,6 @@ $lang['random_cat'] = 'Imágenes aleatorias';
$lang['random_cat_hint'] = 'mostrar un grupo aleatorio de imágenes';
$lang['recent_cats_cat'] = 'Últimas categorías';
$lang['recent_cats_cat_hint'] = 'mostrar las categorías recientement actualizadas o creadas';
-$lang['recent_image'] = 'Esta imagen tiene menos de';
$lang['recent_period'] = 'Período reciente';
$lang['recent_pics_cat'] = 'Últimas imágenes';
$lang['recent_pics_cat_hint'] = 'Mostrar las imágenes más recientes';
@@ -327,7 +316,6 @@ $lang['title_comments'] = 'Comentarios usuarios';
$lang['title_menu'] = 'Menú';
$lang['title_send_mail'] = 'Una opinión sobre esta pagina';
$lang['today'] = 'hoy';
-$lang['total'] = 'imágenes';
$lang['update_rate'] = 'Actualizar nota';
$lang['update_wrong_dirname'] = 'Mal nombre de repertorio';
$lang['upload_advise'] = 'Elegir una imagen para agregar en esta categoría : ';
@@ -338,7 +326,6 @@ $lang['upload_advise_thumbnail'] = 'Opcional, pero recomendado: escoger una mini
$lang['upload_advise_width'] = 'La anchura de la imagen no debe sobrepasar : ';
$lang['upload_author'] = 'Autor';
$lang['upload_cannot_upload'] = 'Imposible trasladar el fichero sobre el camarero(servidor)';
-$lang['upload_creation_date'] = 'Fecha de creación (DD/MM/AAAA)';
$lang['upload_err_username'] = 'Falta el nombre de usuario';
$lang['upload_file_exists'] = 'este fichero ya existe';
$lang['upload_filenotfound'] = 'el formato del fichero no es valido';
@@ -347,9 +334,7 @@ $lang['upload_name'] = 'Nombre de la imagen';
$lang['upload_picture'] = 'Agregar una imagen';
$lang['upload_successful'] = 'Imagen agregada , un administrador la debe controlar para que esta sea visible';
$lang['upload_title'] = 'Agregar una imagen';
-$lang['upload_username'] = 'Nombre de usuario';
$lang['useful when password forgotten'] = 'Útil en caso de perdida de contraseña';
-$lang['w_month'] = 'Mes';
$lang['yes'] = 'Si';
$lang['page_end'] = 'Por la bajura de página';
$lang['qsearch'] = 'Búsqueda rápida';
@@ -384,5 +369,13 @@ $lang['from %s to %s'] = 'de %s a %s';
/* TODO */ $lang['stop_repeat'] = 'Not repeat the slideshow';
/* TODO */ $lang['inc_period'] = 'Increase waiting between pictures';
/* TODO */ $lang['dec_period'] = 'Decrease waiting between pictures';
-
-?> \ No newline at end of file
+$lang['Submit'] = 'Validar';
+$lang['Yes'] = 'Si';
+$lang['No'] = 'No';
+$lang['%d element']='%d imágen';
+$lang['%d elements']='%d imágenes';
+$lang['%d element are also linked to current tags'] = '%d imagen es también vinculada a los tags corrientes';
+$lang['%d elements are also linked to current tags'] = '%d imagenes son igualmente vinculadas a los tags corrientes';
+$lang['See elements linked to this tag only'] = 'Ver las imágenes relacionadas únicamente a este tag';
+$lang['elements posted during the last %d days'] = 'esta imagen tiene menos de %d dias';
+?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 70b90af4d..355fcda75 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -34,8 +34,6 @@ $lang['cat_inclu_part3_S'] = ' et %d virtuelle';
$lang['cat_inclu_part3_P'] = ' et %d virtuelles';
$lang['%d category moved'] = '%d catégorie déplacée';
$lang['%d categories moved'] = '%d catégories déplacées';
-$lang['%d element'] = '%d élément';
-$lang['%d elements'] = '%d éléments';
$lang['%d group'] = '%d groupe';
$lang['%d groups'] = '%d groupes';
$lang['%d member'] = '%d membre';
@@ -79,7 +77,6 @@ $lang['Check for upgrade failed for unknown reasons.'] = 'La vérification de la
$lang['Check for upgrade'] = 'Dernière version ?';
$lang['Comments for all'] = 'Commentaires pour tous';
$lang['Controversy'] = 'Controverse';
-$lang['Creation date'] = 'Date de création';
$lang['Current name'] = 'Nom courant';
$lang['Database'] = 'Base de données';
$lang['Deactivate'] = 'Désactiver';
@@ -133,7 +130,6 @@ $lang['New name'] = 'Nouveau nom';
$lang['New parent category'] = 'Nouvelle catégorie parente';
$lang['New tag'] = 'Nouveau tag';
$lang['No tag defined. Use Administration>Pictures>Tags'] = 'Aucun tag défini. Utiliser l\'écran Adminstration>Images>Tags';
-$lang['No'] = 'Non';
$lang['Number of comments per page'] = 'Nombre de commentaires par page';
$lang['Number of rates'] = 'Nombre de notes';
$lang['Number of thumbnails to create'] = 'Nombre de miniatures à créer';
@@ -182,7 +178,6 @@ $lang['Site manager'] = 'Gestionnaire des sites';
$lang['Status'] = 'Statut';
$lang['Statistics'] = 'Statistiques';
$lang['Storage category'] = 'Catégorie de stockage';
-$lang['Submit'] = 'Valider';
$lang['Sum of rates'] = 'Somme des notes';
$lang['Tag "%s" already exists'] = 'Le tag "%s" existe déjà';
$lang['Tag "%s" was added'] = 'Le tag "%s" a été ajouté';
@@ -203,7 +198,6 @@ $lang['Virtual categories movement'] = 'Déplacement de catégories virtuelles';
$lang['Virtual categories to move'] = 'Catégories virtuelles à déplacer';
$lang['Virtual category name'] = 'Nom de la catégorie virtuelle';
$lang['Webmaster cannot be deleted'] = 'Le webmestre ne peut pas être supprimé';
-$lang['Yes'] = 'Oui';
$lang['You are running on development sources, no check possible.'] = 'Vous travaillez avec les sources de développement, impossible de vérifier la dernière version.';
$lang['You are running the latest version of PhpWebGallery.'] = 'Vous utilisez la dernière version de PhpWebGallery.';
$lang['You cannot delete your account'] = "Vous ne pouvez pas supprimer votre compte";
@@ -400,19 +394,6 @@ $lang['site_local'] = 'Local';
$lang['site_remote'] = 'Distant';
$lang['site_synchronize'] = 'synchroniser';
$lang['site_synchronize_hint'] = 'met à jour la base de données à partir des fichiers';
-$lang['stats_addr'] = 'Adresse IP';
-$lang['stats_category'] = 'Catégorie';
-$lang['stats_daily_graph_title'] = 'Pages vues par heure';
-$lang['stats_day_title'] = 'Statistiques journalières';
-$lang['stats_file'] = 'Fichier';
-$lang['stats_global_graph_title'] = 'Pages vues par mois';
-$lang['stats_hour'] = 'Heure';
-$lang['stats_login'] = 'Identifiant';
-$lang['stats_month_title'] = 'Statistiques mensuelles';
-$lang['stats_monthly_graph_title'] = 'Pages vues par jour';
-$lang['stats_pages_seen'] = 'Pages vues';
-$lang['stats_picture'] = 'Image';
-$lang['stats_title'] = 'Statistiques de la dernière année';
$lang['status'] = 'statut';
$lang['storage'] = 'Répertoire';
$lang['sub-categories'] = 'sous-catégories';
@@ -682,4 +663,4 @@ $lang['plugins_check_chmod'] = 'Vérifiez les permissions du dossier "plugins" e
$lang['plugins_server_error'] = 'Impossible de se connecter au serveur.';
$lang['Purge compiled templates'] = 'Purger les templates compilés';
-?> \ No newline at end of file
+?>
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index 2eaf64435..43d6c7054 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -43,12 +43,10 @@ $lang['%d comment'] = '%d commentaire';
$lang['%d comments'] = '%d commentaires';
$lang['%d hit'] = 'vue %d fois';
$lang['%d hits'] = 'vue %d fois';
-$lang['%d new element'] = '%d nouvel élément';
-$lang['%d new elements'] = '%d nouveaux éléments';
+$lang['%d new element'] = '%d nouvelle image';
+$lang['%d new elements'] = '%d nouvelles images';
$lang['%d new user'] = '%d nouvel utilisateur';
$lang['%d new users'] = '%d nouveaux utilisateurs';
-$lang['%d picture are also linked to current tags'] = '%d image est également liée aux tags courants';
-$lang['%d pictures are also linked to current tags'] = '%d images sont également liées aux tags courants';
$lang['%d waiting element'] = '%d élément en attente';
$lang['%d waiting elements'] = '%d éléments en attente';
$lang['About'] = 'À propos';
@@ -118,7 +116,6 @@ $lang['Search rules'] = 'Critères de recherche';
$lang['Search tags'] = 'Rechercher les tags';
$lang['Search'] = 'Rechercher';
$lang['See available tags'] = 'Voir les tags disponibles';
-$lang['See pictures linked to this tag only'] = 'Voir les images liées uniquement à ce tag';
$lang['Send new password'] = 'Envoyer le nouveau mot de passe';
$lang['Since'] = 'Depuis';
$lang['Sort by'] = 'Trier selon';
@@ -135,8 +132,7 @@ $lang['Week %d'] = 'Semaine %d';
$lang['about_page_title'] = 'À propos de PhpWebGallery';
$lang['access_forbiden'] = 'Vous n\'êtes pas autorisé sur la page demandée';
$lang['add to caddie'] = 'ajouter au panier';
-$lang['add_favorites_alt'] = 'Ajouter aux favoris';
-$lang['add_favorites_hint'] = 'Ajouter cette image à vos favoris';
+$lang['add_favorites_hint'] = 'ajouter cette image à vos favoris';
$lang['admin'] = 'Administration';
$lang['adviser_mode_enabled'] = 'Mode conseiller actif';
$lang['all'] = 'tout';
@@ -183,10 +179,8 @@ $lang['day'][3] = 'Mercredi';
$lang['day'][4] = 'Jeudi';
$lang['day'][5] = 'Vendredi';
$lang['day'][6] = 'Samedi';
-$lang['days'] = 'jours';
$lang['default_sort'] = 'Par défaut';
-$lang['del_favorites_alt'] = 'Supprimer des favoris';
-$lang['del_favorites_hint'] = 'Supprimer cette image de vos favoris';
+$lang['del_favorites_hint'] = 'supprimer cette image de vos favoris';
$lang['delete'] = 'Supprimer';
$lang['descending'] = 'décroissant';
$lang['download'] = 'télécharger';
@@ -210,10 +204,7 @@ $lang['hint_customize'] = 'personnaliser l\'apparence de la galerie';
$lang['hint_search'] = 'recherche';
$lang['home'] = 'Accueil';
$lang['home_hint'] = 'Retour à la page d\'accueil';
-$lang['ident_title'] = 'Identification (FIXME)';
$lang['identification'] = 'Identification';
-$lang['image_available'] = '%d image';
-$lang['images_available'] = '%d images';
$lang['images_available_cpl'] = 'dans cette catégorie';
$lang['images_available_cat'] = 'dans %d sous-catégorie';
$lang['images_available_cats'] = 'dans %d sous-catégories';
@@ -266,7 +257,6 @@ $lang['periods_error'] = 'La période de nouveauté doit être un entier positif
$lang['picture'] = 'image';
$lang['picture_high'] = 'Cliquer sur l\'image pour la visualiser en haute définition';
$lang['picture_show_metadata'] = 'Montrer les méta-données du fichier';
-$lang['pictures'] = 'images';
$lang['powered_by'] = 'Propulsé par';
$lang['preferences'] = 'Préférences';
$lang['previous_page'] = 'Précédent';
@@ -274,7 +264,6 @@ $lang['random_cat'] = 'Images au hasard';
$lang['random_cat_hint'] = 'afficher un ensemble aléatoire d\'images';
$lang['recent_cats_cat'] = 'Catégories récentes';
$lang['recent_cats_cat_hint'] = 'afficher les catégories récemment mises à jour ou créées';
-$lang['recent_image'] = 'Images de moins de';
$lang['recent_period'] = 'Période récente';
$lang['recent_pics_cat'] = 'Images récentes';
$lang['recent_pics_cat_hint'] = 'afficher les images les plus récentes';
@@ -327,7 +316,6 @@ $lang['title_comments'] = 'Commentaires utilisateurs';
$lang['title_menu'] = 'Menu';
$lang['title_send_mail'] = 'Un commentaire sur le site';
$lang['today'] = 'aujourd\'hui';
-$lang['total'] = 'images';
$lang['update_rate'] = 'Mettre à jour votre note';
$lang['update_wrong_dirname'] = 'mauvais nom de répertoire';
$lang['upload_advise'] = 'Choisir une image à ajouter dans cette catégorie : ';
@@ -338,7 +326,6 @@ $lang['upload_advise_thumbnail'] = 'Optionnel, mais recommandé : choisir une mi
$lang['upload_advise_width'] = 'la largeur de l\'image ne doit pas dépasser : ';
$lang['upload_author'] = 'Auteur';
$lang['upload_cannot_upload'] = 'impossible de transférer le fichier sur le serveur';
-$lang['upload_creation_date'] = 'Date de création (JJ/MM/AAAA)';
$lang['upload_err_username'] = 'nom d\'utilisateur manquant';
$lang['upload_file_exists'] = 'ce fichier existe déjà';
$lang['upload_filenotfound'] = 'le format du fichier n\'est pas un format d\'image';
@@ -347,9 +334,7 @@ $lang['upload_name'] = 'Nom de l\'image';
$lang['upload_picture'] = 'Ajouter une image';
$lang['upload_successful'] = 'Image ajoutée avec succès, un administrateur doit valider l\'ajout pour le rendre visible';
$lang['upload_title'] = 'Ajouter une image';
-$lang['upload_username'] = 'Nom d\'utilisateur';
$lang['useful when password forgotten'] = 'utile en cas d\'oubli de mot de passe';
-$lang['w_month'] = 'Mois';
$lang['yes'] = 'Oui';
$lang['page_end'] = 'Bas de page';
$lang['qsearch'] = 'Recherche rapide';
@@ -384,5 +369,13 @@ $lang['start_repeat'] = 'Répeter le diaporama';
$lang['stop_repeat'] = 'Ne pas répeter le diaporama';
$lang['inc_period'] = 'Augmenter l\'attente entre les images';
$lang['dec_period'] = 'Diminuer l\'attente entre les images';
-
-?> \ No newline at end of file
+$lang['Submit'] = 'Valider';
+$lang['Yes'] = 'Oui';
+$lang['No'] = 'Non';
+$lang['%d element']='%d image';
+$lang['%d elements']='%d images';
+$lang['%d element are also linked to current tags'] = '%d image est également liée aux tags courants';
+$lang['%d elements are also linked to current tags'] = '%d images sont également liées aux tags courants';
+$lang['See elements linked to this tag only'] = 'Voir les images liées uniquement à ce tag';
+$lang['elements posted during the last %d days'] = 'images ajoutées au cours de %d derniers jours';
+?>
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 4df7419ae..4e855cbb2 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -35,8 +35,6 @@ $lang['cat_inclu_part3_S'] = ' en %d virtueel';
$lang['cat_inclu_part3_P'] = ' en %d virtueel';
$lang['%d category moved'] = '%d categorie verplaatst';
$lang['%d categories moved'] = '%d categorieën verplaatst';
-$lang['%d element'] = '%d element';
-$lang['%d elements'] = '%d elementen';
$lang['%d group'] = '%d groep';
$lang['%d groups'] = '%d groepen';
$lang['%d member'] = '%d lid';
@@ -79,7 +77,6 @@ $lang['Check for upgrade failed for unknown reasons.'] = 'Controle voor upgrade
$lang['Check for upgrade'] = 'Controleer voor een upgrade';
$lang['Comments for all'] = 'Commentaar voor alles';
$lang['Controversy'] = 'Controversieel';
-$lang['Creation date'] = 'Aanmaak datum';
$lang['Current name'] = 'Huidige naam';
$lang['Database'] = 'Database';
$lang['Deactivate'] = 'Deactiveer';
@@ -133,7 +130,6 @@ $lang['New name'] = 'Nieuwe naam';
$lang['New parent category'] = 'Nieuwe hoofd categorie';
$lang['New tag'] = 'Nieuwe tag';
$lang['No tag defined. Use Administration>Pictures>Tags'] = 'Geen tag gedefineerd. Gebruik beheer>afbeeldingen>Tags';
-$lang['No'] = 'Nee';
$lang['Number of comments per page'] = 'Aantal commentaren per pagina';
$lang['Number of rates'] = 'Aantal beoordelingen';
$lang['Number of thumbnails to create'] = 'Aantal thumbnails om te maken';
@@ -182,7 +178,6 @@ $lang['Site manager'] = 'Site manager';
$lang['Status'] = 'Status';
$lang['Statistics'] = 'Statistieken';
$lang['Storage category'] = 'Storage category';
-$lang['Submit'] = 'Bevestig';
$lang['Sum of rates'] = 'Eind oordeel';
$lang['Tag "%s" already exists'] = 'Tag "%s" bestaat al';
$lang['Tag "%s" was added'] = 'Tag "%s" is toegevoegd';
@@ -203,7 +198,6 @@ $lang['Virtual categories movement'] = 'Virtuele categorie verplaatsing';
$lang['Virtual categories to move'] = 'Virtuele categorien om te verplaatsen';
$lang['Virtual category name'] = 'Virtuele categorie naam';
$lang['Webmaster cannot be deleted'] = 'Webmaster kan niet verwijderd worden';
-$lang['Yes'] = 'Ja';
$lang['You are running on development sources, no check possible.'] = 'Je werkt op basis van ontwikkelins bronnen, geen controle mogelijk.';
$lang['You are running the latest version of PhpWebGallery.'] = 'Je hebt de laatste versie van PhpWebGallery.';
$lang['You cannot delete your account'] = "Je kan je account niet verwijderen";
@@ -401,19 +395,6 @@ $lang['site_local'] = 'Lokaal';
$lang['site_remote'] = 'Remote';
$lang['site_synchronize'] = 'synchronizeer';
$lang['site_synchronize_hint'] = 'werk de database bij vanuit bestanden';
-$lang['stats_addr'] = 'IP Adres';
-$lang['stats_category'] = 'Categorie';
-$lang['stats_daily_graph_title'] = 'Pagina\'s bekeken per uur';
-$lang['stats_day_title'] = 'Dagelijkse statistieken';
-$lang['stats_file'] = 'Bestand';
-$lang['stats_global_graph_title'] = 'Pagina\'s bekeken per maand';
-$lang['stats_hour'] = 'Uur';
-$lang['stats_login'] = 'Login';
-$lang['stats_month_title'] = 'Maandelijkse statistieken';
-$lang['stats_monthly_graph_title'] = 'Pagina\'s bekeken per dag';
-$lang['stats_pages_seen'] = 'Pagina\'s bekeken';
-$lang['stats_picture'] = 'afbeeldingen';
-$lang['stats_title'] = 'Afgelopen jaar statistieken';
$lang['status'] = 'status';
$lang['storage'] = 'Map';
$lang['sub-categories'] = 'sub-categorie';
@@ -635,6 +616,7 @@ $lang['c13y_webmaster_non_existent'] = 'Hoofd "webmaster" bestaat niet meer';
$lang['c13y_bad_webmaster_status'] = 'Hoofd "webmaster" status is niet correct';
$lang['c13y_user_created'] = 'Gebruiker "%s" gemaakt met wachtwoord "%s" ';
$lang['c13y_user_status_updated'] = 'Status van de gebruiker "%s" is bijgewerkt';
+$lang['add new elements to caddie'] = 'Voeg nieuwe elementen toe ann caddie';
// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
$lang['no_display_thumbnail'] = 'Geen weergave';
$lang['display_thumbnail_classic'] = 'Klassieke weergave';
@@ -661,4 +643,4 @@ $lang['c13y_submit_correction'] = 'Pas geselecteerde correcties toe';
/* TODO */ $lang['c13y_anomalies_ignored_count'] = '%d anomalies has been ignored.';
/* TODO */ $lang['Purge compiled templates'] = 'Purge compiled templates';
-?> \ No newline at end of file
+?>
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index 704c75d9a..cffaeb0de 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -47,8 +47,6 @@ $lang['%d new element'] = '%d nieuw element';
$lang['%d new elements'] = '%d nieuwe elementen';
$lang['%d new user'] = '%d nieuwe gebruiker';
$lang['%d new users'] = '%d nieuwe gebruikers';
-$lang['%d picture are also linked to current tags'] = '%d picture are also linked to current tags';
-$lang['%d pictures are also linked to current tags'] = '%d pictures are also linked to current tags';
$lang['%d waiting element'] = '%d wachtende element';
$lang['%d waiting elements'] = '%d wachtende elementen';
$lang['About'] = 'Over';
@@ -118,7 +116,6 @@ $lang['Search rules'] = 'Zoek opties';
$lang['Search tags'] = 'Zoek tags';
$lang['Search'] = 'Zoeken';
$lang['See available tags'] = 'Toon beschikbare tags';
-$lang['See pictures linked to this tag only'] = 'Toon afbeelding gelinkt met deze tag';
$lang['Send new password'] = 'Stuur nieuw wachtwoord';
$lang['Since'] = 'Sinds';
$lang['Sort by'] = 'Sorteren op';
@@ -135,8 +132,7 @@ $lang['Week %d'] = 'Week %d';
$lang['about_page_title'] = 'Over PhpWebGallery';
$lang['access_forbiden'] = 'Je hebt geen rechten tot de opgevraagde pagina';
$lang['add to caddie'] = 'Toevoegen aan caddie';
-$lang['add_favorites_alt'] = 'Toevoegen aan favorieten';
-$lang['add_favorites_hint'] = 'Voeg deze afbeelding toe aan jou favorieten';
+$lang['add_favorites_hint'] = 'voeg deze afbeelding toe aan jou favorieten';
$lang['admin'] = 'Beheer';
$lang['adviser_mode_enabled'] = 'Advies mode geactiveerd';
$lang['all'] = 'alle';
@@ -183,10 +179,8 @@ $lang['day'][3] = 'Woensdag';
$lang['day'][4] = 'Donderdag';
$lang['day'][5] = 'Vrijdag';
$lang['day'][6] = 'Zaterdag';
-$lang['days'] = 'dagen';
$lang['default_sort'] = 'Standaard';
-$lang['del_favorites_alt'] = 'Verwijderen uit de favorieten';
-$lang['del_favorites_hint'] = 'Verwijder deze foto van je favorieten';
+$lang['del_favorites_hint'] = 'verwijder deze foto van je favorieten';
$lang['delete'] = 'Verwijderen';
$lang['descending'] = 'descending';
$lang['download'] = 'download';
@@ -210,10 +204,7 @@ $lang['hint_customize'] = 'Verschijning van de gallerie aanpassen';
$lang['hint_search'] = 'zoeken';
$lang['home'] = 'Home';
$lang['home_hint'] = 'Terug naar de home page';
-$lang['ident_title'] = 'ident_title';
$lang['identification'] = 'Identificatie';
-$lang['image_available'] = '%d afbeeldingen';
-$lang['images_available'] = '%d afbeelding(en)';
$lang['images_available_cpl'] = 'in deze categorie';
$lang['images_available_cat'] = 'in %d sub-categorie';
$lang['images_available_cats'] = 'in %d sub-categorieën';
@@ -266,7 +257,6 @@ $lang['periods_error'] = 'Recente periode moet een positieve waarde zijn';
$lang['picture'] = 'afbeelding';
$lang['picture_high'] = 'Klik op de afbeelding om het te bekijken in een groter formaat';
$lang['picture_show_metadata'] = 'Toon bestands metadata';
-$lang['pictures'] = 'afbeelding';
$lang['powered_by'] = 'Powered by';
$lang['preferences'] = 'Voorkeuren';
$lang['previous_page'] = 'Vorige';
@@ -274,7 +264,6 @@ $lang['random_cat'] = 'Random afbeelding';
$lang['random_cat_hint'] = 'toon een set van willekeurige afbeelding';
$lang['recent_cats_cat'] = 'Recente categorieën';
$lang['recent_cats_cat_hint'] = 'toon recentelijk bijgewerkte categorieën';
-$lang['recent_image'] = 'afbeelding binnen de';
$lang['recent_period'] = 'Recente periode';
$lang['recent_pics_cat'] = 'Recente afbeelding';
$lang['recent_pics_cat_hint'] = 'toon meest recente afbeelding';
@@ -327,7 +316,6 @@ $lang['title_comments'] = 'Gebruikers commentaar';
$lang['title_menu'] = 'Menu';
$lang['title_send_mail'] = 'commentaar op je site';
$lang['today'] = 'vandaag';
-$lang['total'] = 'afbeelding';
$lang['update_rate'] = 'Werk je beoordeling bij';
$lang['update_wrong_dirname'] = 'verkeerde bestandsnaam';
$lang['upload_advise'] = 'Kies een afbeelding om in een categorie te plaatsen : ';
@@ -338,7 +326,6 @@ $lang['upload_advise_thumbnail'] = 'Optioneel, maar aanbevolen : kies een thumbn
$lang['upload_advise_width'] = 'de breedte van de afbeelding mag niet te groot zijn : ';
$lang['upload_author'] = 'Auteur (eg "Pierrick LE GALL")';
$lang['upload_cannot_upload'] = 'kan de afbeelding niet op de server plaatsen';
-$lang['upload_creation_date'] = 'Aanmaak datum (DD/MM/YYYY)';
$lang['upload_err_username'] = 'de gebruikersnaam moet ingevuld zijn';
$lang['upload_file_exists'] = 'De naam is al in gebruik';
$lang['upload_filenotfound'] = 'Je moet een afbeeldingsformaat opgeven voor de afbeelding';
@@ -347,9 +334,7 @@ $lang['upload_name'] = 'Naam van de afbeelding';
$lang['upload_picture'] = 'Uploaden van een afbeelding';
$lang['upload_successful'] = 'Afbeelding met succes ge-upload, een beheerder moet de afbeelding valideren, dit gebeurd zsm.';
$lang['upload_title'] = 'Upload een afbeelding';
-$lang['upload_username'] = 'Gebruikersnaam';
$lang['useful when password forgotten'] = 'handig bij het vergeten van je wachtwoord';
-$lang['w_month'] = 'Maand';
$lang['yes'] = 'Ja';
$lang['page_end'] = 'Pagina eind';
$lang['qsearch'] = 'Snel zoeken';
@@ -372,7 +357,6 @@ $lang['Waiting page: %s'] = 'Wacht pagina: %s';
$lang['Picture uploaded by %s'] = 'Afbeelding ge-uploaded door %s';
// --------- Starting below: New or revised $lang ---- from version 1.7.1
$lang['guest_must_be_guest'] = 'Foutieve status voor gebruiker "guest", gebruik standaard status. Waarschuw de webmaster.';
-$lang['add new elements to caddie'] = 'Voeg nieuwe elementen toe ann caddie';
// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
$lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster en speciale gebruiker kunnen deze methode niet gebruiken';
$lang['reg_err_mail_address_dbl'] = 'Een andere gebruiker maakt al gebruik van dit email adres';
@@ -385,5 +369,13 @@ $lang['from %s to %s'] = 'van %s tot %s';
/* TODO */ $lang['stop_repeat'] = 'Not repeat the slideshow';
/* TODO */ $lang['inc_period'] = 'Increase waiting between pictures';
/* TODO */ $lang['dec_period'] = 'Decrease waiting between pictures';
-
-?> \ No newline at end of file
+$lang['Submit'] = 'Bevestig';
+$lang['Yes'] = 'Ja';
+$lang['No'] = 'Nee';
+$lang['%d element']='%d afbeelding';
+$lang['%d elements']='%d afbeeldingen';
+$lang['%d element are also linked to current tags'] = '%d image are also linked to current tags';
+$lang['%d elements are also linked to current tags'] = '%d images are also linked to current tags';
+$lang['See elements linked to this tag only'] = 'Toon afbeelding gelinkt met deze tag';
+$lang['elements posted during the last %d days'] = 'afbeelding binnen de %d dagen';
+?>
diff --git a/picture.php b/picture.php
index 07d6ef7cd..4ef0ff34f 100644
--- a/picture.php
+++ b/picture.php
@@ -672,7 +672,6 @@ SELECT COUNT(*) AS nb_fav
'FAVORITE_IMG' =>
get_root_url().get_themeconf('icon_dir').'/favorite.png',
'FAVORITE_HINT' => l10n('add_favorites_hint'),
- 'FAVORITE_ALT' => l10n('add_favorites_alt'),
'U_FAVORITE' => add_url_params(
$url_self,
array('action'=>'add_to_favorites')
@@ -688,7 +687,6 @@ SELECT COUNT(*) AS nb_fav
'FAVORITE_IMG' =>
get_root_url().get_themeconf('icon_dir').'/del_favorite.png',
'FAVORITE_HINT' => l10n('del_favorites_hint'),
- 'FAVORITE_ALT' => l10n('del_favorites_alt'),
'U_FAVORITE' => add_url_params(
$url_self,
array('action'=>'remove_from_favorites')
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index a7e01fcad..7169ff39f 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -36,7 +36,7 @@
<a href="{$U_UPLOAD}">{'upload_picture'|@translate}</a>
</li></ul>
{/if}
- <p class="totalImages">{$NB_PICTURE} {'total'|@translate}</p>
+ <p class="totalImages">{$pwg->l10n_dec('%d element', '%d elements', $NB_PICTURE)}</p>
</dd>
</dl>
@@ -50,12 +50,12 @@
<li>
{if !empty($tag.add) }
<a href="{$tag.add.URL}"
- title="{$pwg->l10n_dec('%d picture are also linked to current tags', '%d pictures are also linked to current tags', $tag.add.COUNTER)}"
+ title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.add.COUNTER)}"
rel="nofollow">
<img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" />
</a>
{/if}
- <a href="{$tag.U_TAG}" class="{$tag.CLASS}" title="{'See pictures linked to this tag only'|@translate}">{$tag.NAME}</a>
+ <a href="{$tag.U_TAG}" class="{$tag.CLASS}" title="{'See elements linked to this tag only'|@translate}">{$tag.NAME}</a>
</li>
{/foreach}
</ul>
@@ -146,7 +146,7 @@
</label>
{/if}
<p>
- <input class="submit" type="submit" name="login" value="{'submit'|@translate}">
+ <input class="submit" type="submit" name="login" value="{'Submit'|@translate}">
</p>
<ul class="actions">
diff --git a/template/yoga/month_calendar.tpl b/template/yoga/month_calendar.tpl
index a965d40e1..34f035915 100644
--- a/template/yoga/month_calendar.tpl
+++ b/template/yoga/month_calendar.tpl
@@ -46,7 +46,7 @@
<div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div>
<div class="calImg" style="width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px;">
<a href="{$day.U_IMG_LINK}">
- <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$day.IMAGE_ALT}" />
+ <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d element','%d elements', $day.NB_ELEMENTS)}" />
</a>
</div>
{else}
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index e50c8cbb6..9e0d6fa2f 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -45,13 +45,13 @@
{/if}
{if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
{if isset($favorite) }
- <a href="{$favorite.U_FAVORITE}" title="{$favorite.FAVORITE_HINT}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="{$favorite.FAVORITE_ALT}"></a>
+ <a href="{$favorite.U_FAVORITE}" title="{$favorite.FAVORITE_HINT}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{$favorite.FAVORITE_HINT}"></a>
{/if}
{if !empty($U_SET_AS_REPRESENTATIVE) }
<a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a>
{/if}
{if isset($U_ADMIN) }
- <a href="{$U_ADMIN}" title="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'link_info_image'|@translate}"></a>
+ <a href="{$U_ADMIN}" title="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
{/if}
{if isset($U_CADDIE) }
<a href="{$U_CADDIE}" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
@@ -220,7 +220,7 @@
{/if}
<label>{'comment'|@translate}<textarea name="content" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label>
<input type="hidden" name="key" value="{$comment_add.KEY}" />
- <input class="submit" type="submit" value="{'submit'|@translate}">
+ <input class="submit" type="submit" value="{'Submit'|@translate}">
</fieldset>
</form>
{/if}
diff --git a/template/yoga/upload.tpl b/template/yoga/upload.tpl
index 0f5edd7f2..1aad667e3 100644
--- a/template/yoga/upload.tpl
+++ b/template/yoga/upload.tpl
@@ -1,37 +1,37 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
+
<div id="content">
<div class="titrePage">
<ul class="categoryActions">
- <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+ <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
+ </ul>
+ <h2>{'upload_title'|@translate}</h2>
+ </div>
+
+ {if !empty($errors)}
+ <div class="errors">
+ <ul>
+ {foreach from=$errors item=error}
+ <li>{$error}</li>
+ {/foreach}
</ul>
- <h2>{lang:upload_title}</h2>
</div>
+ {/if}
- <!-- BEGIN upload_not_successful -->
- <form enctype="multipart/form-data" method="post" action="{F_ACTION}">
+ {if not $UPLOAD_SUCCESSFUL }
+ <form enctype="multipart/form-data" method="post" action="{$F_ACTION}">
<table style="width:80%;margin-left:auto;margin-right:auto;">
- <!-- BEGIN errors -->
- <tr>
- <td colspan="2">
- <div class="errors">
- <ul>
- <!-- BEGIN error -->
- <li>{upload_not_successful.errors.error.ERROR}</li>
- <!-- END error -->
- </ul>
- </div>
- </td>
- </tr>
- <!-- END errors -->
<tr>
<td colspan="2" class="menu">
- <div style="text-align:center;">{ADVISE_TITLE}</div>
+ <div style="text-align:center;">{$ADVISE_TITLE}</div>
+ {if not empty($advises)}
<ul>
- <!-- BEGIN advise -->
- <li>{upload_not_successful.advise.ADVISE}</li>
- <!-- END advise -->
+ {foreach from=$advises item=advise}
+ <li>{$advise}</li>
+ {/foreach}
</ul>
+ {/if}
</td>
</tr>
<tr>
@@ -39,65 +39,65 @@
<input name="picture" type="file" value="" />
</td>
</tr>
- <!-- BEGIN fields -->
+ {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
<!-- username -->
<tr>
- <td class="menu">{lang:upload_username} <span style="color:red;">*</span></td>
+ <td class="menu">{'Username'|@translate} <span style="color:red;">*</span></td>
<td align="left" style="padding:10px;">
- <input name="username" type="text" value="{NAME}" />
+ <input name="username" type="text" value="{$NAME}" />
</td>
</tr>
<!-- mail address -->
<tr>
- <td class="menu">{lang:mail_address} <span style="color:red;">*</span></td>
+ <td class="menu">{'mail_address'|@translate} <span style="color:red;">*</span></td>
<td align="left" style="padding:10px;">
- <input name="mail_address" type="text" value="{EMAIL}" />
+ <input name="mail_address" type="text" value="{$EMAIL}" />
</td>
</tr>
<!-- name of the picture -->
<tr>
- <td class="menu">{lang:upload_name}</td>
+ <td class="menu">{'upload_name'|@translate}</td>
<td align="left" style="padding:10px;">
- <input name="name" type="text" value="{NAME_IMG}" />
+ <input name="name" type="text" value="{$NAME_IMG}" />
</td>
</tr>
<!-- author -->
<tr>
- <td class="menu">{lang:upload_author}</td>
+ <td class="menu">{'upload_author'|@translate}</td>
<td align="left" style="padding:10px;">
- <input name="author" type="text" value="{AUTHOR_IMG}" />
+ <input name="author" type="text" value="{$AUTHOR_IMG}" />
</td>
</tr>
<!-- date of creation -->
<tr>
- <td class="menu">{lang:upload_creation_date}</td>
+ <td class="menu">{'Creation date'|@translate} (DD/MM/YYYY)</td>
<td align="left" style="padding:10px;">
- <input name="date_creation" type="text" value="{DATE_IMG}" />
+ <input name="date_creation" type="text" value="{$DATE_IMG}" />
</td>
</tr>
<!-- comment -->
<tr>
- <td class="menu">{lang:comment}</td>
+ <td class="menu">{'comment'|@translate}</td>
<td align="left" style="padding:10px;">
- <textarea name="comment" rows="3" cols="40" style="overflow:auto">{COMMENT_IMG}</textarea>
+ <textarea name="comment" rows="3" cols="40" style="overflow:auto">{$COMMENT_IMG}</textarea>
</td>
</tr>
- <!-- END fields -->
+ {/if}
<tr>
<td colspan="2" align="center">
- <input class="submit" name="submit" type="submit" value="{lang:submit}" />
+ <input class="submit" name="submit" type="submit" value="{'Submit'|@translate}" />
</td>
</tr>
</table>
</form>
- <!-- END upload_not_successful -->
- <!-- BEGIN upload_successful -->
- {lang:upload_successful}<br />
+ {else}
+ {'upload_successful'|@translate}<br />
<div style="text-align:center;">
- <a href="{U_RETURN}">[ {lang:home} ]</a>
+ <a href="{$U_RETURN}">[ {'home'|@translate} ]</a>
</div>
- <!-- END upload_successful -->
- <!-- BEGIN note -->
- <div style="text-align:left;"><span style="color:red;">*</span> : {lang:mandatory}</div>
- <!-- END note -->
+ {/if}
+
+ {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
+ <div style="text-align:left;"><span style="color:red;">*</span> : {'mandatory'|@translate}</div>
+ {/if}
</div> <!-- content -->
diff --git a/upload.php b/upload.php
index 3ba555486..520ad40b1 100644
--- a/upload.php
+++ b/upload.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$
@@ -103,7 +103,7 @@ function validate_upload( $temp_name, $my_max_file_size,
case 2 : $result['type'] = 'jpg'; break;
case 3 : $result['type'] = 'png'; break;
default :
- array_push( $result['error'], l10n('upload_advise_filetype') );
+ array_push( $result['error'], l10n('upload_advise_filetype') );
}
}
}
@@ -134,14 +134,14 @@ if (isset($page['category']))
check_restrictions( $page['category'] );
$category = get_cat_info( $page['category'] );
$category['cat_dir'] = get_complete_dir( $page['category'] );
-
+
if (url_is_remote($category['cat_dir']) or !$category['uploadable'])
{
- die('Fatal: you take a wrong way, bye bye');
+ page_forbidden('upload not allowed');
}
}
else { // $page['category'] may be set by a futur plugin but without it
- die('Fatal: you take a wrong way, bye bye');
+ bad_request('invalid parameters');
}
$error = array();
@@ -173,7 +173,7 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
{
array_push( $error, l10n('upload_err_username') );
}
-
+
$date_creation = '';
if ( !empty($_POST['date_creation']) )
{
@@ -202,7 +202,7 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
{
array_push( $error, l10n('update_wrong_dirname') );
}
-
+
if ( sizeof( $error ) == 0 )
{
$result = validate_upload( $path, $conf['upload_maxfilesize'],
@@ -315,10 +315,8 @@ else
$advise_title.= get_cat_display_name($category['upper_names']);
}
-$template->assign_vars(
+$template->assign(
array(
- 'U_HOME' => make_index_url(),
-
'ADVISE_TITLE' => $advise_title,
'NAME' => $username,
'EMAIL' => $mail_address,
@@ -332,26 +330,18 @@ $template->assign_vars(
'U_RETURN' => make_index_url(array('category' => $category)),
)
);
-
+
+$template->assign('errors', $error);
+$template->assign('UPLOAD_SUCCESSFUL', $page['upload_successful'] );
+
if ( !$page['upload_successful'] )
{
- $template->assign_block_vars('upload_not_successful',array());
-//-------------------------------------------------------------- errors display
-if ( sizeof( $error ) != 0 )
-{
- $template->assign_block_vars('upload_not_successful.errors',array());
- for ( $i = 0; $i < sizeof( $error ); $i++ )
- {
- $template->assign_block_vars('upload_not_successful.errors.error',array('ERROR'=>$error[$i]));
- }
-}
-
//--------------------------------------------------------------------- advises
if ( !empty($conf['upload_maxfilesize']) )
{
$content = l10n('upload_advise_filesize');
$content.= $conf['upload_maxfilesize'].' KB';
- $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
+ $template->append('advises', $content);
}
if ( isset( $page['waiting_id'] ) )
@@ -360,13 +350,13 @@ if ( sizeof( $error ) != 0 )
{
$content = l10n('upload_advise_width');
$content.= $conf['upload_maxwidth_thumbnail'].' px';
- $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
+ $template->append('advises', $content);
}
if ( $conf['upload_maxheight_thumbnail'] != '' )
{
$content = l10n('upload_advise_height');
$content.= $conf['upload_maxheight_thumbnail'].' px';
- $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
+ $template->append('advises', $content);
}
}
else
@@ -375,28 +365,23 @@ if ( sizeof( $error ) != 0 )
{
$content = l10n('upload_advise_width');
$content.= $conf['upload_maxwidth'].' px';
- $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
+ $template->append('advises', $content);
}
if ( $conf['upload_maxheight'] != '' )
{
$content = l10n('upload_advise_height');
$content.= $conf['upload_maxheight'].' px';
- $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
+ $template->append('advises', $content);
}
}
- $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>l10n('upload_advise_filetype')));
-
+ $template->append('advises', l10n('upload_advise_filetype'));
+
//----------------------------------------- optionnal username and mail address
if ( !isset( $page['waiting_id'] ) )
{
- $template->assign_block_vars('upload_not_successful.fields',array());
- $template->assign_block_vars('note',array());
+ $template->assign('SHOW_FORM_FIELDS', true);
}
}
-else
-{
- $template->assign_block_vars('upload_successful',array());
-}
//----------------------------------------------------------- html code display
$template->parse('upload');
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 10:53:54 +0000