diff options
author | rvelices <rv-github@modusoptimus.com> | 2010-05-27 20:28:43 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2010-05-27 20:28:43 +0000 |
commit | f0d6ec33ce231f77077ba6535ca8312286f9a40b (patch) | |
tree | 471c42102ac8688b561858c6258c27b7ff3763f3 /language/en_UK | |
parent | 50cd8ed52300a8613971f0d9bc0e66f4ca293b7b (diff) |
merge r6402 from trunk
removed unnecessary language key (Controversy) and potential sql fatal error in admin photo rating page
git-svn-id: http://piwigo.org/svn/branches/2.1@6403 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | language/en_UK/admin.lang.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 3b4b5643f..630fa9dda 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -71,7 +71,6 @@ $lang['Category elements associated to the following categories: %s'] = "Categor $lang['Check for upgrade failed for unknown reasons.'] = "Check for upgrade failed for unknown reasons."; $lang['Check for upgrade'] = "Check for upgrade"; $lang['Comments for all'] = "Comments for all"; -$lang['Controversy'] = "Controversy"; $lang['Current name'] = "Current name"; $lang['Database'] = "Database"; $lang['Deactivate'] = "Deactivate"; @@ -769,4 +768,4 @@ $lang['Add another set of photos'] = 'Add another set of photos'; $lang['Order of menubar items has been updated successfully.'] = 'Order of menubar items has been updated successfully.'; $lang['This theme was not designed to be directly activated'] = 'This theme was not designed to be directly activated'; $lang['Pending Comments'] = 'Pending Comments'; -?> +?>
\ No newline at end of file |