Merge remote-tracking branch 'origin/master' into video-audio

Conflicts:
	inc/parser/xhtml.php

1 files changed, 0 insertions, 21 deletions

diff --git a/inc/lang/ku/lang.php b/inc/lang/ku/lang.php
index 51ed6c8bf..b6287806d 100644
--- a/inc/lang/ku/lang.php
+++ b/inc/lang/ku/lang.php
@@ -33,7 +33,6 @@ $lang['btn_back']   = 'Paş';
 $lang['btn_backlink']    = 'Girêdanên paş';
 $lang['btn_backtomedia'] = 'Back to Mediafile Selection';
 $lang['btn_subscribe']   = 'Subscribe Changes';
-$lang['btn_unsubscribe'] = 'Unsubscribe Changes';
 $lang['btn_register'] = 'Register';
 
 $lang['loggedinas'] = 'Logged in as';
@@ -123,22 +122,8 @@ $lang['qb_sig']     = 'Insert Signature';
 
 $lang['js']['del_confirm']= 'Delete this entry?';
 
-$lang['admin_acl']  = 'Access Control List Management...';
 $lang['admin_register']= 'Add new user...';
 
-$lang['acl_group']  = 'Group';
-$lang['acl_user']   = 'User';
-$lang['acl_perms']  = 'Permissions for';
-$lang['page']       = 'Rûpel';
-$lang['namespace']  = 'Namespace';
-
-$lang['acl_perm1']  = 'Bixwîne';
-$lang['acl_perm2']  = 'Biguherîne';
-$lang['acl_perm4']  = 'Biafirîne';
-$lang['acl_perm8']  = 'Upload';
-$lang['acl_perm16'] = 'Jê bibe';
-$lang['acl_new']    = 'Add new Entry';
-
 $lang['metaedit']    = 'Edit Metadata';
 $lang['metasaveerr'] = 'Writing metadata failed';
 $lang['metasaveok']  = 'Metadata saved';
@@ -154,10 +139,4 @@ $lang['img_format']  = 'Format';
 $lang['img_camera']  = 'Camera';
 $lang['img_keywords']= 'Keywords';
 
-$lang['subscribe_success']  = 'Added %s to subscription list for %s';
-$lang['subscribe_error']    = 'Error adding %s to subscription list for %s';
-$lang['subscribe_noaddress']= 'There is no address associated with your login, you cannot be added to the subscription list';
-$lang['unsubscribe_success']= 'Removed %s from subscription list for %s';
-$lang['unsubscribe_error']  = 'Error removing %s from subscription list for %s';
-
 //Setup VIM: ex: et ts=2 :