Merge

main/cron/lang/list_undefined_langvars.php

@@ -6,7 +6,7 @@
 /**
  * Includes and declarations
  */
-//if (PHP_SAPI!='cli') { die('Run this script through the command line or comment this line in the code'); }
+if (PHP_SAPI!='cli') { die('Run this script through the command line or comment this line in the code'); }
 require_once '../../inc/global.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'admin/sub_language.class.php';
 $path = api_get_path(SYS_LANG_PATH).'english';

main/reservation/m_item_origineel.php

@@ -281,7 +281,7 @@ switch ($_GET['action']) {
 			case 'delete' :
 				Rsys :: delete_item_right($_GET['item_id'], $_GET['class_id']);
 				ob_start();
-				Display :: display_normal_message(get_lang('itemRightDeleted'),false);
+				Display :: display_normal_message(get_lang('ItemRightDeleted'),false);
 				$msg = ob_get_contents();
 				ob_end_clean();
 			case 'switch' :
@@ -394,7 +394,7 @@ switch ($_GET['action']) {
 		$msg = ob_get_contents();
 		ob_end_clean();
 	default :
-		$NoSearchResults = get_lang('noItems');
+		$NoSearchResults = get_lang('NoItem');
 		Display :: display_header($tool_name);
 		api_display_tool_title($tool_name);
 

main/upload/upload.document.php

@@ -214,7 +214,7 @@ if(api_get_setting('use_document_title')=='true')
 </tr>
 </table>
 
-<input type="submit" value="<?php echo(get_lang('Oki'));?>">
+<input type="submit" value="<?php echo(get_lang('Ok'));?>">
 </form>
 <!-- end upload form -->