diff --git a/header.php b/header.php
index 6832a0a..6b75c67 100644
--- a/header.php
+++ b/header.php
@@ -9,8 +9,7 @@ class ISQ { public static $general = array(), $links = array(), $social = array(
 
 // Load translations
 function isq_load_textdomain() {
-    yourls_load_custom_textdomain( 'isq_translation', $site . '/public/languages' );
-    $site = YOURLS_SITE;
+    yourls_load_custom_textdomain( 'isq_translation', '/public/languages' );
 }
 isq_load_textdomain();
 ?>
diff --git a/index.php b/index.php
index f1147e6..4e4c52d 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
-<?php include('header.php'); 
+<?php include('header.php');
 
-$url     = yourls_sanitize_url( $_REQUEST['url'] );
-$keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ;
+$url     = isset( $_REQUEST['url'] ) ? yourls_sanitize_url( $_REQUEST['url'] ) : '' ;
+$keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ) : '' ;
 $title   = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ;
 
 ?>
diff --git a/public/languages/isq_translation-ru_RU.mo b/public/languages/isq_translation-ru_RU.mo
new file mode 100644
index 0000000..ec86113
Binary files /dev/null and b/public/languages/isq_translation-ru_RU.mo differ
diff --git a/result.php b/result.php
index d713aaa..bf021d7 100644
--- a/result.php
+++ b/result.php
@@ -1,11 +1,27 @@
 <?php
 include('header.php');
 
+<<<<<<< HEAD
 $url     = yourls_sanitize_url( $_REQUEST['url'] );
 $keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ;
+=======
+$resp = recaptcha_check_answer (ISQ::$recaptcha['private'],
+								$_SERVER["REMOTE_ADDR"],
+								isset($_POST["recaptcha_challenge_field"]) ? $_POST["recaptcha_challenge_field"] : '',
+								isset($_POST["recaptcha_response_field"]) ? $_POST["recaptcha_response_field"] : '');
+
+if (!$resp->is_valid) {
+	// What happens when the CAPTCHA was entered incorrectly
+	die ( '<p class="error" title="' . $resp->error . '">' . yourls__( 'The reCAPTCHA wasn\'t entered correctly. Go back and try it again.', 'isq_translation' ) . '</p></div></div>' );
+}
+
+$url     = isset( $_REQUEST['url'] ) ? yourls_sanitize_url( $_REQUEST['url'] ) : '';
+$keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ) : '' ;
+>>>>>>> ff9d158626e1981bd381cda4e9ccf791b75d4dc0
 $title   = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ;
 $return  = yourls_add_new_link( $url, $keyword, $title );
 		
+
 $shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : '';
 $message  = isset( $return['message'] ) ? $return['message'] : '';
 $title    = isset( $return['title'] ) ? $return['title'] : '';
@@ -29,7 +45,7 @@ $qrCode = QRcode::svg($url, $qrContainerId, $saveToFile, QR_ECLEVEL_L, $imageWid
 ?>
 
 <!-- Error reporting -->
-<?php echo $error; ?>
+<?php isset( $error ) ? $error : ''; ?>
 
 <!-- Default output -->
 <h2><?php yourls_e( 'Results', 'isq_translation'); ?></h2>