aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-09-21 21:14:54 +0000
committerrvelices <rv-github@modusoptimus.com>2010-09-21 21:14:54 +0000
commit5ff171684eec339ed83119eb57e124174c07d465 (patch)
treeaeeaa7a472aa683da26e035ffb873a99b1096219 /admin/include
parentb472955f7d994ad66f62a39b8e1dbb541ac17a4f (diff)
feature 1616: rename "category" into "album" (4th commit; almost there)
git-svn-id: http://piwigo.org/svn/trunk@6993 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions.php2
-rw-r--r--admin/include/functions_permalinks.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 718fa7236..d8aade68d 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1062,7 +1062,7 @@ SELECT uppercats
{
array_push(
$page['errors'],
- l10n('You cannot move a album in its own sub album')
+ l10n('You cannot move an album in its own sub album')
);
return;
}
diff --git a/admin/include/functions_permalinks.php b/admin/include/functions_permalinks.php
index 4073970fd..579f5f159 100644
--- a/admin/include/functions_permalinks.php
+++ b/admin/include/functions_permalinks.php
@@ -87,7 +87,7 @@ SELECT permalink
{
$page['errors'][] =
sprintf(
- l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'),
+ l10n('Permalink %s has been previously used by album %s. Delete from the permalink history first'),
$permalink, $old_cat_id
);
return false;
@@ -156,7 +156,7 @@ function set_cat_permalink( $cat_id, $permalink, $save )
{
$page['errors'][] =
sprintf(
- l10n('Permalink %s is already used by category %s'),
+ l10n('Permalink %s is already used by album %s'),
$permalink, $existing_cat_id
);
return false;
@@ -169,7 +169,7 @@ function set_cat_permalink( $cat_id, $permalink, $save )
{
$page['errors'][] =
sprintf(
- l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'),
+ l10n('Permalink %s has been previously used by album %s. Delete from the permalink history first'),
$permalink, $old_cat_id
);
return false;