Merge branch 'master' of git://github.com/asalthobaity/Tiny-Tiny-RSS into asalthobait...

diff --combined include/functions.php
index a8fc9fbe511d10e1aa1ca15e966792c43a763465,c16172856bfd8a742aa195ee3f3a1464cd65316a..ee061eca7131b7eaa12bacab58875da4f6e074cb
--- 1/include/functions.php
--- 2/include/functions.php
+++ b/include/functions.php
@@@ -10,7 -10,6 +10,7 @@@
        $fetch_last_error = false;
        $fetch_last_error_code = false;
        $fetch_last_content_type = false;
 +      $fetch_last_error_content = false; // curl only for the time being
        $fetch_curl_used = false;
        $suppress_debugging = false;
  
@@@ -64,6 -63,7 +64,7 @@@
        function get_translations() {
                $tr = array(
                                        "auto"  => "Detect automatically",
+                                       "ar_SA" => "العربيّة",
                                        "da_DA" => "Dansk",
                                        "ca_CA" => "Català",
                                        "cs_CZ" => "Česky",
@@@ -349,7 -349,6 +350,7 @@@
  
                global $fetch_last_error;
                global $fetch_last_error_code;
 +              global $fetch_last_error_content;
                global $fetch_last_content_type;
                global $fetch_curl_used;
  
@@@ -432,7 -431,6 +433,7 @@@
                                } else {
                                        $fetch_last_error = "HTTP Code: $http_code";
                                }
 +                              $fetch_last_error_content = $contents;
                                curl_close($ch);
                                return false;
                        }
@@@ -1975,6 -1973,8 +1976,6 @@@
        function getFeedTitle($id, $cat = false) {
                if ($cat) {
                        return getCategoryTitle($id);
 -              } else if ($id == 0) {
 -                      return __("All feeds");
                } else if ($id == -1) {
                        return __("Starred articles");
                } else if ($id == -2) {