From 4b3d5c768bc0c1db2d5f1c986027dc2ec0ca3f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 1 Nov 2010 10:05:21 +0100
Subject: [PATCH 1/3] Update from master.

---
 lang/slovenian-utf-8.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php
index 793334e00..982db1a68 100644
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -8,7 +8,7 @@ $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';
 // shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa
-$byteUnits = array('Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB');
+$byteUnits = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB');
 
 $day_of_week = array('Ned', 'Pon', 'Tor', 'Sre', 'Čet', 'Pet', 'Sob');
 $month = array('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Avg', 'Sep', 'Okt', 'Nov', 'Dec');

From 7393468b126dbf20e1e4ef4cdf9d3dd330332de2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 1 Nov 2010 10:16:14 +0100
Subject: [PATCH 2/3] Drop documentation version.

---
 Documentation.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index cb21dfc6d..885a6e267 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -53,9 +53,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
             <li>License: <a href="license.php">LICENSE</a></li>
         </ul>
     </li>
-    <li><div class="l10n">Documentation version:</div>
-        <i>$Id$</i>
-    </li>
 </ul>
 
 <!-- REQUIREMENTS -->

From 848989bdb6da22d99b5a5b04ad83964db973df43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 1 Nov 2010 10:18:17 +0100
Subject: [PATCH 3/3] Fix markup.

---
 Documentation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation.html b/Documentation.html
index 885a6e267..fb2c22687 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2797,7 +2797,7 @@ setfacl -d -m "g:www-data:rwx" tmp
 </p>
 
 <h4 id="faq1_18">
-    <a href="#faq1_18">1.18 (withdrawn).
+    <a href="#faq1_18">1.18 (withdrawn).</a></h4>
 
 <h4 id="faq1_19">
     <a href="#faq1_19">1.19 I can't run the &quot;display relations&quot; feature because the