aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/cat_options.php4
-rw-r--r--admin/group_list.php8
-rw-r--r--admin/history.php2
-rw-r--r--admin/include/functions.php4
-rw-r--r--admin/include/functions_notification_by_mail.inc.php12
-rw-r--r--admin/include/functions_waiting.inc.php2
-rw-r--r--admin/intro.php6
-rw-r--r--admin/notification_by_mail.php10
-rw-r--r--admin/site_manager.php2
-rw-r--r--admin/tags.php8
-rw-r--r--admin/template/goto/group_list.tpl8
-rw-r--r--admin/template/goto/plugins_new.tpl2
-rw-r--r--admin/template/goto/plugins_update.tpl2
-rw-r--r--admin/template/goto/site_manager.tpl2
-rw-r--r--admin/template/goto/tags.tpl2
-rw-r--r--admin/template/goto/user_list.tpl2
-rw-r--r--admin/user_list.php7
17 files changed, 41 insertions, 42 deletions
diff --git a/admin/cat_options.php b/admin/cat_options.php
index 67d626625..1b371ae72 100644
--- a/admin/cat_options.php
+++ b/admin/cat_options.php
@@ -162,8 +162,8 @@ $tabsheet = new tabsheet();
$opt_link = $link_start.'cat_options&section=';
$tabsheet->add('status', l10n('Public / Private'), $opt_link.'status');
$tabsheet->add('visible', l10n('Lock'), $opt_link.'visible');
-$tabsheet->add('Upload', l10n('Upload'), $opt_link.'Upload');
-$tabsheet->add('Comments', l10n('Comments'), $opt_link.'Comments');
+$tabsheet->add('upload', l10n('Upload'), $opt_link.'upload');
+$tabsheet->add('comments', l10n('Comments'), $opt_link.'comments');
if ($conf['allow_random_representative'])
{
$tabsheet->add('representative', l10n('Representative'), $opt_link.'representative');
diff --git a/admin/group_list.php b/admin/group_list.php
index 3ecfa6b0d..416d78bb9 100644
--- a/admin/group_list.php
+++ b/admin/group_list.php
@@ -72,7 +72,7 @@ DELETE
array_push(
$page['infos'],
- sprintf(l10n('group \"%s\" deleted'), $groupname)
+ sprintf(l10n('group "%s" deleted'), $groupname)
);
}
@@ -84,7 +84,7 @@ if (isset($_POST['submit_add']) and !is_adviser())
{
if (empty($_POST['groupname']))
{
- array_push($page['errors'], l10n('The name of a group must not contain \" or \' or be empty.'));
+ array_push($page['errors'], l10n('The name of a group must not contain " or \' or be empty.'));
}
if (count($page['errors']) == 0)
{
@@ -113,7 +113,7 @@ INSERT INTO '.GROUPS_TABLE.'
array_push(
$page['infos'],
- sprintf(l10n('group \"%s\" added'), $_POST['groupname'])
+ sprintf(l10n('group "%s" added'), $_POST['groupname'])
);
}
}
@@ -141,7 +141,7 @@ UPDATE '.GROUPS_TABLE.'
array_push(
$page['infos'],
- sprintf(l10n('group \"%s\" updated'), $groupname)
+ sprintf(l10n('group "%s" updated'), $groupname)
);
}
diff --git a/admin/history.php b/admin/history.php
index b8f30299a..33113db6c 100644
--- a/admin/history.php
+++ b/admin/history.php
@@ -51,7 +51,7 @@ else
}
$types = array('none', 'picture', 'high', 'other');
-$display_thumbnails = array('no_display_thumbnail', 'display_thumbnail_classic', 'display_thumbnail_hoverbox');
+$display_thumbnails = array('No display', 'Classic display', 'Hoverbox display');
// +-----------------------------------------------------------------------+
// | Check Access and exit when user status is not ok |
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 1df95314b..14e975b12 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1666,7 +1666,7 @@ SELECT id
return array(
'info' => sprintf(
- l10n('Tag \"%s\" was added'),
+ l10n('Tag "%s" was added'),
stripslashes($tag_name)
),
'id' => $inserted_id,
@@ -1676,7 +1676,7 @@ SELECT id
{
return array(
'error' => sprintf(
- l10n('Tag \"%s\" already exists'),
+ l10n('Tag "%s" already exists'),
stripslashes($tag_name)
)
);
diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php
index e05e027f1..35a83f616 100644
--- a/admin/include/functions_notification_by_mail.inc.php
+++ b/admin/include/functions_notification_by_mail.inc.php
@@ -315,16 +315,16 @@ function display_counter_info()
if ($env_nbm['error_on_mail_count'] != 0)
{
- array_push($page['errors'], l10n_dec('nbm_msg_n_mail_not_send', 'nbm_msg_n_mails_not_send', $env_nbm['error_on_mail_count']));
+ array_push($page['errors'], l10n_dec('%d mail was not sent.', '%d mails were not sent.', $env_nbm['error_on_mail_count']));
if ($env_nbm['sent_mail_count'] != 0)
- array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count']));
+ array_push($page['infos'], l10n_dec('%d mail was sent.', '%d mails were sent.', $env_nbm['sent_mail_count']));
}
else
{
if ($env_nbm['sent_mail_count'] == 0)
array_push($page['infos'], l10n('No mail to send.'));
else
- array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count']));
+ array_push($page['infos'], l10n_dec('%d mail was sent.', '%d mails were sent.', $env_nbm['sent_mail_count']));
}
}
@@ -491,12 +491,12 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su
}
- array_push($page['infos'], l10n_dec('nbm_user_change_enabled_updated_data_count', 'nbm_users_change_enabled_updated_data_count', $updated_data_count));
+ array_push($page['infos'], l10n_dec('%d user was updated.', '%d users were updated.', $updated_data_count));
if ($error_on_updated_data_count != 0)
{
array_push($page['errors'],
- l10n_dec('nbm_user_change_enabled_error_on_updated_data_count',
- 'nbm_users_change_enabled_error_on_updated_data_count',
+ l10n_dec('%d user was not updated.',
+ '%d users were not updated.',
$error_on_updated_data_count));
}
diff --git a/admin/include/functions_waiting.inc.php b/admin/include/functions_waiting.inc.php
index 16642474c..b7f2f6fe0 100644
--- a/admin/include/functions_waiting.inc.php
+++ b/admin/include/functions_waiting.inc.php
@@ -30,7 +30,7 @@ function waiting_tabsheet()
// TabSheet
$tabsheet = new tabsheet();
// TabSheet initialization
- $tabsheet->add('Comments', l10n('Comments'), $link_start.'Comments');
+ $tabsheet->add('comments', l10n('Comments'), $link_start.'comments');
$tabsheet->add('upload', l10n('Pictures'), $link_start.'upload');
// TabSheet selection
$tabsheet->select($page['page']);
diff --git a/admin/intro.php b/admin/intro.php
index 2d2310da7..137efe95b 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -200,11 +200,11 @@ $template->assign(
'DB_VERSION' => $db_version,
'DB_ELEMENTS' => l10n_dec('%d element', '%d elements', $nb_elements),
'DB_CATEGORIES' =>
- l10n_dec('cat_inclu_part1_S', 'cat_inclu_part1_P',
+ l10n_dec('%d category including ', '%d categories including ',
$nb_categories).
- l10n_dec('cat_inclu_part2_S', 'cat_inclu_part2_P',
+ l10n_dec('%d physical', '%d physical',
$nb_physical).
- l10n_dec('cat_inclu_part3_S', 'cat_inclu_part3_P',
+ l10n_dec(' and %d virtual', ' and %d virtual',
$nb_virtual),
'DB_IMAGE_CATEGORY' => l10n_dec('%d association', '%d associations', $nb_image_category),
'DB_TAGS' => l10n_dec('%d tag', '%d tags', $nb_tags),
diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php
index 8b3190a40..eee0f30c5 100644
--- a/admin/notification_by_mail.php
+++ b/admin/notification_by_mail.php
@@ -81,8 +81,8 @@ function do_timeout_treatment($post_keyname, $check_key_treated = array())
$must_repost = true;
array_push($page['errors'],
- l10n_dec('nbm_background_treatment_redirect_second',
- 'nbm_background_treatment_redirect_seconds',
+ l10n_dec('Execution time is out, treatment must be continue [Estmated time: %d second].',
+ 'Execution time is out, treatment must be continue [Estmated time: %d seconds].',
$time_refresh));
}
}
@@ -200,9 +200,7 @@ order by
$query = 'delete from '.USER_MAIL_NOTIFICATION_TABLE.' where check_key in ('.implode(",", $quoted_check_key_list).');';
$result = pwg_query($query);
- redirect($base_url.get_query_string_diff(array(), false), l10n('Processing treatment.
-
-Please wait...'));
+ redirect($base_url.get_query_string_diff(array(), false), l10n("Processing treatment.\nPlease wait..."));
}
}
}
@@ -533,7 +531,7 @@ where
}
array_push($page['infos'],
- l10n_dec('nbm_updated_param_count', 'nbm_updated_params_count',
+ l10n_dec('%d parameter was updated.', '%d parameters were updated.',
$updated_param_count));
// Reload conf with new values
diff --git a/admin/site_manager.php b/admin/site_manager.php
index 145ef2b17..ee25bd826 100644
--- a/admin/site_manager.php
+++ b/admin/site_manager.php
@@ -251,7 +251,7 @@ while ($row = pwg_db_fetch_assoc($result))
$tpl_var =
array(
'NAME' => $row['galleries_url'],
- 'TYPE' => l10n( $is_remote ? 'site_remote' : 'site_local' ),
+ 'TYPE' => l10n( $is_remote ? 'Remote' : 'Local' ),
'CATEGORIES' => (int)@$sites_detail[$row['id']]['nb_categories'],
'IMAGES' => (int)@$sites_detail[$row['id']]['nb_images'],
'U_SYNCHRONIZE' => $update_url
diff --git a/admin/tags.php b/admin/tags.php
index 57781b71a..24368bcfb 100644
--- a/admin/tags.php
+++ b/admin/tags.php
@@ -67,7 +67,7 @@ SELECT id, name
array_push(
$page['errors'],
sprintf(
- l10n('Tag \"%s\" already exists'),
+ l10n('Tag "%s" already exists'),
$tag_name
)
);
@@ -125,7 +125,7 @@ DELETE
array_push(
$page['infos'],
l10n_dec(
- 'The %d following tag were deleted',
+ 'The following tag was deleted',
'The %d following tags were deleted',
count($tag_names)).' : '.
implode(', ', $tag_names)
@@ -164,7 +164,7 @@ SELECT id
array_push(
$page['infos'],
sprintf(
- l10n('Tag \"%s\" was added'),
+ l10n('Tag "%s" was added'),
stripslashes($tag_name)
)
);
@@ -174,7 +174,7 @@ SELECT id
array_push(
$page['errors'],
sprintf(
- l10n('Tag \"%s\" already exists'),
+ l10n('Tag "%s" already exists'),
stripslashes($tag_name)
)
);
diff --git a/admin/template/goto/group_list.tpl b/admin/template/goto/group_list.tpl
index 8aff9daed..6b32da66b 100644
--- a/admin/template/goto/group_list.tpl
+++ b/admin/template/goto/group_list.tpl
@@ -30,11 +30,11 @@
<td><a href="{$group.U_MEMBERS}">{$group.MEMBERS}</a></td>
<td style="text-align:center;">
<a href="{$group.U_PERM}">
- <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/Permissions.png" class="button" style="border:none" alt="{'Permissions'|@translate}" title="{'Permissions'|@translate}"></a>
+ <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'Permissions'|@translate}" title="{'Permissions'|@translate}"></a>
<a href="{$group.U_DELETE}" onclick="return confirm('{'delete'|@translate|@escape:'javascript'}' + '\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
- <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/Delete.png" class="button" style="border:none" alt="{'Delete'|@translate}" title="{'Delete'|@translate}" {$TAG_INPUT_ENABLED}></a>
- <a href="{$group.U_ISDEFAULT}" onclick="return confirm('{'toggle_is_default_group'|@translate|@escape:'javascript'}' +'\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
- <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/Toggle \'default group\' property.png" class="button" style="border:none" alt="{'Toggle \'default group\' property'|@translate}" title="{'Toggle \'default group\' property'|@translate}" {$TAG_INPUT_ENABLED}></a>
+ <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none" alt="{'Delete'|@translate}" title="{'Delete'|@translate}" {$TAG_INPUT_ENABLED}></a>
+ <a href="{$group.U_ISDEFAULT}" onclick="return confirm('{'Toggle \'default group\' property'|@translate|@escape:'javascript'}' +'\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
+ <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/toggle_is_default_group.png" class="button" style="border:none" alt="{'Toggle \'default group\' property'|@translate}" title="{'Toggle \'default group\' property'|@translate}" {$TAG_INPUT_ENABLED}></a>
</td>
</tr>
{/foreach}
diff --git a/admin/template/goto/plugins_new.tpl b/admin/template/goto/plugins_new.tpl
index 99b6a6c8c..6b106b87e 100644
--- a/admin/template/goto/plugins_new.tpl
+++ b/admin/template/goto/plugins_new.tpl
@@ -38,7 +38,7 @@ jQuery().ready(function(){ldelim}
<td style="text-align:center;"><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.VER_DESC|htmlspecialchars|nl2br}">{$plugin.VERSION}</a></td>
<td>{$plugin.DATE}</td>
<td>{$plugin.AUTHOR}</td>
- <td style="text-align:center;"><a href="{$plugin.URL_INSTALL}" onclick="return confirm('{'plugins_confirm_install'|@translate|@escape:javascript}');">{'plugins_auto_install'|@translate}</a>
+ <td style="text-align:center;"><a href="{$plugin.URL_INSTALL}" onclick="return confirm('{'Are you sure you want to install this plugin?'|@translate|@escape:javascript}');">{'Automatic installation'|@translate}</a>
/ <a href="{$plugin.URL_DOWNLOAD}">{'Download file'|@translate}</a>
</td>
</tr>
diff --git a/admin/template/goto/plugins_update.tpl b/admin/template/goto/plugins_update.tpl
index 470b53558..3cb628f75 100644
--- a/admin/template/goto/plugins_update.tpl
+++ b/admin/template/goto/plugins_update.tpl
@@ -31,7 +31,7 @@ jQuery().ready(function(){ldelim}
<td><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.EXT_DESC|htmlspecialchars|nl2br}">{$plugin.EXT_NAME}</a></td>
<td style="text-align:center;">{$plugin.VERSION}</td>
<td style="text-align:center;"><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.NEW_VER_DESC|htmlspecialchars|nl2br}">{$plugin.NEW_VERSION}</a></td>
- <td style="text-align:center;"><a href="{$plugin.URL_UPDATE}" onclick="return confirm('{'plugins_confirm_upgrade'|@translate|@escape:javascript}');">{'plugins_auto_update'|@translate}</a>
+ <td style="text-align:center;"><a href="{$plugin.URL_UPDATE}" onclick="return confirm('{'Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'|@translate|@escape:javascript}');">{'plugins_auto_update'|@translate}</a>
/ <a href="{$plugin.URL_DOWNLOAD}">{'Download file'|@translate}</a></td>
</tr>
{/foreach}
diff --git a/admin/template/goto/site_manager.tpl b/admin/template/goto/site_manager.tpl
index 1cbdfbf87..678f177fb 100644
--- a/admin/template/goto/site_manager.tpl
+++ b/admin/template/goto/site_manager.tpl
@@ -33,7 +33,7 @@
{if not empty($sites)}
<table class="table2">
<tr class="throw">
- <td>{'Remote'|@translate} / {'Remote'|@translate}</td>
+ <td>{'Local'|@translate} / {'Remote'|@translate}</td>
<td>{'Actions'|@translate}</td>
</tr>
{foreach from=$sites item=site name=site}
diff --git a/admin/template/goto/tags.tpl b/admin/template/goto/tags.tpl
index 27ee02693..3db8417a6 100644
--- a/admin/template/goto/tags.tpl
+++ b/admin/template/goto/tags.tpl
@@ -46,7 +46,7 @@
<p>
<input class="submit" type="submit" name="edit" value="{'Edit selected tags'|@translate}">
- <input class="submit" type="submit" name="delete" value="{'Are you sure?'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>
+ <input class="submit" type="submit" name="delete" value="{'Delete selected tags'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>
</p>
</fieldset>
diff --git a/admin/template/goto/user_list.tpl b/admin/template/goto/user_list.tpl
index 2a7d4c690..ed68a719a 100644
--- a/admin/template/goto/user_list.tpl
+++ b/admin/template/goto/user_list.tpl
@@ -87,7 +87,7 @@
<td>{$data}</td>
{/foreach}
<td style="text-align:center;">
- <a href="{$user.U_PERM}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/Permissions.png" class="button" style="border:none" alt="{'Permissions'|@translate}" title="{'Permissions'|@translate}"></a>
+ <a href="{$user.U_PERM}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'Permissions'|@translate}" title="{'Permissions'|@translate}"></a>
<a href="{$user.U_PROFILE}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" style="border:none" alt="{'Profile'|@translate}" title="{'Profile'|@translate}"></a>
{foreach from=$user.plugin_actions item=data}
{$data}
diff --git a/admin/user_list.php b/admin/user_list.php
index 1583de0a1..b69bac20e 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -215,7 +215,7 @@ if ($conf['double_password_type_in_admin'] == true)
array_push(
$page['infos'],
sprintf(
- l10n('user \"%s\" added'),
+ l10n('user "%s" added'),
$_POST['login']
)
);
@@ -235,7 +235,7 @@ else if ($conf['double_password_type_in_admin'] == false)
array_push(
$page['infos'],
sprintf(
- l10n('user \"%s\" added'),
+ l10n('user "%s" added'),
$_POST['login']
)
);
@@ -592,6 +592,7 @@ $template->assign('language_options', get_languages());
$template->assign('language_selected',
isset($_POST['pref_submit']) ? $_POST['language'] : get_default_language());
+Log::getInstance()->debug($status);
// Status options
foreach (get_enums(USER_INFOS_TABLE, 'status') as $status)
{
@@ -693,7 +694,7 @@ foreach ($visible_user_list as $local_user)
}
$properties[] =
(isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true'))
- ? l10n('') : l10n('');
+ ? l10n('High definition') : l10n('');
$template->append(
'users',
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 03:50:37 +0000