Merge branch 'develop' into aleksei_kanash_dev

12 years ago · 0fce6a42c6
parent 925efac633 ffc4f1a0bd
commit 0fce6a42c6
41 changed files with 1098 additions and 416 deletions
--- a/JournalDesModifications.pdf
+++ b/JournalDesModifications.pdf
--- a/ReleaseNotes.pdf
+++ b/ReleaseNotes.pdf
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@ -11,7 +11,7 @@ CONFIG += debug_and_release \
 VERSION_MAJ = 2
 VERSION_MIN = 00 
 VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
-VERSION_PATCH = 07
+VERSION_PATCH = 08

 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")
--- a/resources/i18n/sankore_ar.ts
+++ b/resources/i18n/sankore_ar.ts
@ -1511,6 +1511,21 @@
        <translation type="unfinished">سلة المهملات</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">إلغاء </translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2096,6 +2111,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>تخزين مؤقت</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_bg.ts
+++ b/resources/i18n/sankore_bg.ts
@ -1503,6 +1503,21 @@
        <translation type="unfinished">Кошче</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Отмени</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2094,6 +2109,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>Кеш</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_ca.ts
+++ b/resources/i18n/sankore_ca.ts
@ -1504,6 +1504,21 @@
        <translation type="unfinished">Paperera</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancel·la</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2090,6 +2105,10 @@ Voleu ignorar aquests errors per a aquest amfitrió?</translation>
        <source>Cache</source>
        <translation>Memòria cau</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_cs.ts
+++ b/resources/i18n/sankore_cs.ts
@ -1506,6 +1506,21 @@
        <translation type="unfinished">Koš</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Zrušit</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2097,6 +2112,10 @@ Chcete ignorovat tyto chyby na tomto serveru?</translation>
        <source>Magnifier</source>
        <translation>Lupa</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_da.ts
+++ b/resources/i18n/sankore_da.ts
@ -1502,6 +1502,21 @@
        <translation type="unfinished">Papirkurv</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuller</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>Cache</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_de.ts
+++ b/resources/i18n/sankore_de.ts
@ -1502,6 +1502,21 @@
        <translation type="unfinished">Papierkorb</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2101,6 +2116,10 @@ Möchten Sie diese Fehler auf diesem Computer ignorieren?</translation>
        <source>Cache</source>
        <translation>Zwischenspeicher</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_el.ts
+++ b/resources/i18n/sankore_el.ts
@ -1502,6 +1502,21 @@
        <translation type="unfinished">Κάδος ανακύκλωσης</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Άκυρο</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>Προβολέας</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_en.ts
+++ b/resources/i18n/sankore_en.ts
@ -1500,6 +1500,21 @@
        <translation type="unfinished"></translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_en_UK.ts
+++ b/resources/i18n/sankore_en_UK.ts
@ -1500,6 +1500,21 @@
        <translation type="unfinished"></translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_es.ts
+++ b/resources/i18n/sankore_es.ts
@ -1502,6 +1502,21 @@
        <translation type="unfinished">Papelera</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2087,6 +2102,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>Caché</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_fr.ts
+++ b/resources/i18n/sankore_fr.ts
--- a/resources/i18n/sankore_fr_CH.ts
+++ b/resources/i18n/sankore_fr_CH.ts
--- a/resources/i18n/sankore_it.ts
+++ b/resources/i18n/sankore_it.ts
@ -1504,6 +1504,21 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento &apos;%1&apos; selezion
        <translation type="unfinished">Cestino</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Annulla</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2098,6 +2113,10 @@ risorsa multimediale ...</translation>
        <source>Cache</source>
        <translation>Cache</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_iw.ts
+++ b/resources/i18n/sankore_iw.ts
@ -1499,6 +1499,21 @@
    </message>
    <message>
        <source>Trash</source>
+        <translation type="unfinished">סל</translation>
+    </message>
+</context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">בטל</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@ -2088,6 +2103,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>מטמון</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_ja.ts
+++ b/resources/i18n/sankore_ja.ts
@ -1500,6 +1500,21 @@
        <translation type="unfinished">ゴミ箱</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">キャンセル</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2092,6 +2107,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>キャッシュ</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_ko.ts
+++ b/resources/i18n/sankore_ko.ts
@ -1500,6 +1500,21 @@
        <translation type="unfinished">휴지통</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">취소</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>캐시</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_mg.ts
+++ b/resources/i18n/sankore_mg.ts
@ -1502,6 +1502,21 @@
        <translation type="unfinished">Daba</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Ajanony</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2093,6 +2108,10 @@ Tena tsy te hiraharaha an&apos;ireo tsy mety ho an&apos;ilay milina ve ianao?</t
        <source>Cache</source>
        <translation>Tahiry</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_nb.ts
+++ b/resources/i18n/sankore_nb.ts
@ -1505,6 +1505,21 @@
        <translation type="unfinished">Søppel</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Avbryt</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>Skjul</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_nl.ts
+++ b/resources/i18n/sankore_nl.ts
@ -1502,6 +1502,21 @@
        <translation type="unfinished">Prullenbak</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuleren</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2087,6 +2102,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>Cache</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_pl.ts
+++ b/resources/i18n/sankore_pl.ts
@ -1509,6 +1509,21 @@
        <translation type="unfinished">Kosz</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Anuluj</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2100,6 +2115,10 @@ Czy chcesz ignorować te błędy dla tego hosta?</translation>
        <source>Cache</source>
        <translation>Pamięć podręczna</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_pt.ts
+++ b/resources/i18n/sankore_pt.ts
@ -1505,6 +1505,21 @@
        <translation type="unfinished">Lixo</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2092,6 +2107,10 @@ Quer ignorar estes erros, deste servidor?</translation>
        <source>Cache</source>
        <translation>Cache</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_rm.ts
+++ b/resources/i18n/sankore_rm.ts
@ -1500,6 +1500,21 @@
        <translation type="unfinished"></translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_ro.ts
+++ b/resources/i18n/sankore_ro.ts
@ -1502,6 +1502,21 @@
        <translation type="unfinished">Coş de gunoi</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Anulare</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2093,6 +2108,10 @@ Doriţi să ignoraţi aceste erori pentru acest host?</translation>
        <source>Cache</source>
        <translation>Cache</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_ru.ts
+++ b/resources/i18n/sankore_ru.ts
@ -1502,6 +1502,21 @@
        <translation type="unfinished">Корзина</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Отмена</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>Кэш</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_sk.ts
+++ b/resources/i18n/sankore_sk.ts
@ -1506,6 +1506,21 @@
        <translation type="unfinished">Kôš</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Zrušiť</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2097,6 +2112,10 @@ Chcete ignorovať tieto chyby na tomto serveri?</translation>
        <source>Magnifier</source>
        <translation>Lupa</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_sv.ts
+++ b/resources/i18n/sankore_sv.ts
@ -1502,6 +1502,21 @@
        <translation type="unfinished">Papperskorg</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Avsluta</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2093,6 +2108,10 @@ Vill du ignorera felen för den här värden?</translation>
        <source>Cache</source>
        <translation>Cache</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_tr.ts
+++ b/resources/i18n/sankore_tr.ts
@ -1501,6 +1501,21 @@
        <translation type="unfinished">Çöp</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">İptal</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2091,6 +2106,10 @@ Bu host için yukarıdaki hatalar yok sayılsın mı?</translation>
        <source>Cache</source>
        <translation>Gizli Yer</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/resources/i18n/sankore_zh.ts
+++ b/resources/i18n/sankore_zh.ts
@ -1500,6 +1500,21 @@
        <translation type="unfinished">回收站</translation>
    </message>
 </context>
+<context>
+    <name>UBFeaturesNewFolderDialog</name>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">取消</translation>
+    </message>
+    <message>
+        <source>Enter a new folder name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>UBFeaturesProgressInfo</name>
    <message>
@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host?</source>
        <source>Cache</source>
        <translation>高级缓存</translation>
    </message>
+    <message>
+        <source>Aristo</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>UBTrapFlashController</name>
--- a/src/adaptors/UBImportDocument.cpp
+++ b/src/adaptors/UBImportDocument.cpp
@ -171,8 +171,11 @@ UBDocumentProxy* UBImportDocument::importFile(const QFile& pFile, const QString&
 		return NULL;
 	}

+    bool addTitlePage = false;
+    if(UBSettings::settings()->teacherGuidePageZeroActivated->get().toBool() && !QFile(documentRootFolder+"/page000.svg").exists())
+        addTitlePage=true;

-	UBDocumentProxy* newDocument = UBPersistenceManager::persistenceManager()->createDocumentFromDir(documentRootFolder, pGroup);
+    UBDocumentProxy* newDocument = UBPersistenceManager::persistenceManager()->createDocumentFromDir(documentRootFolder, pGroup, "", false, addTitlePage);
 	UBApplication::showMessage(tr("Import successful."));
 	return newDocument;
 }
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@ -308,7 +308,6 @@ UBBoardView::event (QEvent * e)
      if (gestureEvent)
        {
          QSwipeGesture* swipe = dynamic_cast<QSwipeGesture*> (gestureEvent->gesture (Qt::SwipeGesture));
-
          if (swipe)
            {
              if (swipe->horizontalDirection () == QSwipeGesture::Left)
@ -363,9 +362,7 @@ void UBBoardView::tabletEvent (QTabletEvent * event)
    QPointF scenePos = viewportTransform ().inverted ().map (tabletPos);

    qreal pressure = 1.0;
-    if (((currentTool == UBStylusTool::Pen || currentTool == UBStylusTool::Line)
-         && mPenPressureSensitive)
-            || (currentTool == UBStylusTool::Marker && mMarkerPressureSensitive))
+    if (((currentTool == UBStylusTool::Pen || currentTool == UBStylusTool::Line) && mPenPressureSensitive) || (currentTool == UBStylusTool::Marker && mMarkerPressureSensitive))
        pressure = event->pressure ();


--- a/src/core/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
@ -130,6 +130,8 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing
        || args.contains("log");


+    setupTranslators(args);
+
    UBResources::resources();

    if (!undoStack)
@ -139,8 +141,6 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing

    UBSettings *settings = UBSettings::settings();

-    setupTranslators(args);
-
    connect(settings->appToolBarPositionedAtTop, SIGNAL(changed(QVariant)), this, SLOT(toolBarPositionChanged(QVariant)));
    connect(settings->appToolBarDisplayText, SIGNAL(changed(QVariant)), this, SLOT(toolBarDisplayTextChanged(QVariant)));
    updateProtoActionsState();
--- a/src/core/UBPersistenceManager.cpp
+++ b/src/core/UBPersistenceManager.cpp
@ -265,7 +265,7 @@ UBDocumentProxy* UBPersistenceManager::createDocument(const QString& pGroupName,
    return doc;
 }

-UBDocumentProxy* UBPersistenceManager::createDocumentFromDir(const QString& pDocumentDirectory, const QString& pGroupName, const QString& pName, bool withEmptyPage)
+UBDocumentProxy* UBPersistenceManager::createDocumentFromDir(const QString& pDocumentDirectory, const QString& pGroupName, const QString& pName, bool withEmptyPage, bool addTitlePage)
 {
    checkIfDocumentRepositoryExists();

@ -280,7 +280,8 @@ UBDocumentProxy* UBPersistenceManager::createDocumentFromDir(const QString& pDoc
    {
        doc->setMetaData(UBSettings::documentName, pName);
    }
-    if (withEmptyPage) createDocumentSceneAt(doc, 0);
+    if(withEmptyPage) createDocumentSceneAt(doc, 0);
+    if(addTitlePage) persistDocumentScene(doc, mSceneCache.createScene(doc, 0, false), 0);

    QMap<QString, QVariant> metadatas = UBMetadataDcSubsetAdaptor::load(pDocumentDirectory);

--- a/src/core/UBPersistenceManager.h
+++ b/src/core/UBPersistenceManager.h
@ -47,7 +47,7 @@ class UBPersistenceManager : public QObject
        static void destroy();

        virtual UBDocumentProxy* createDocument(const QString& pGroupName = "", const QString& pName = "", bool withEmptyPage = true);
-        virtual UBDocumentProxy* createDocumentFromDir(const QString& pDocumentDirectory, const QString& pGroupName = "", const QString& pName = "", bool withEmptyPage = false);
+        virtual UBDocumentProxy* createDocumentFromDir(const QString& pDocumentDirectory, const QString& pGroupName = "", const QString& pName = "", bool withEmptyPage = false, bool addTitlePage = false);

        virtual UBDocumentProxy* persistDocumentMetadata(UBDocumentProxy* pDocumentProxy);

--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@ -129,7 +129,7 @@ int main(int argc, char *argv[])

    QObject::connect(&app, SIGNAL(messageReceived(const QString&)), &app, SLOT(handleOpenMessage(const QString&)));

-    qDebug() << fileToOpen;
+    qDebug() << "file name argument" << fileToOpen;
    int result = app.exec(fileToOpen);

    app.cleanup();
--- a/src/domain/UBGraphicsScene.cpp
+++ b/src/domain/UBGraphicsScene.cpp
@ -582,8 +582,8 @@ bool UBGraphicsScene::inputDeviceRelease()
                addItem(pStrokes);
                mDrawWithCompass = false;

-        }else if (mCurrentStroke)
-        {
+        }
+        else if (mCurrentStroke){
                UBGraphicsStrokesGroup* pStrokes = new UBGraphicsStrokesGroup();

                // Remove the strokes that were just drawn here and replace them by a stroke item
@ -629,8 +629,8 @@ bool UBGraphicsScene::inputDeviceRelease()

    if (mCurrentStroke && mCurrentStroke->polygons().empty()){
        delete mCurrentStroke;
+        mCurrentStroke = NULL;
    }
-    mCurrentStroke = NULL;

    return accepted;
 }
@ -2302,10 +2302,12 @@ void UBGraphicsScene::setToolCursor(int tool)

    if (mCurrentStroke && mCurrentStroke->polygons().empty()){
        delete mCurrentStroke;
+        mCurrentStroke = NULL;
    }
-    mCurrentStroke = NULL;
+
 }

-void UBGraphicsScene::initStroke(){
+void UBGraphicsScene::initStroke()
+{
 	mCurrentStroke = new UBGraphicsStroke();
 }
--- a/src/domain/UBGraphicsWidgetItem.cpp
+++ b/src/domain/UBGraphicsWidgetItem.cpp
@ -563,7 +563,8 @@ void UBGraphicsWidgetItem::injectInlineJavaScript()

 void UBGraphicsWidgetItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    if (scene()->renderingContext() != UBGraphicsScene::Screen)
+
+    if (scene() && scene()->renderingContext() != UBGraphicsScene::Screen)
    {
        painter->drawPixmap(0, 0, snapshot());
    }
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
@ -12,10 +12,6 @@
 const char *UBFeaturesWidget::objNamePathList = "PathList";
 const char *UBFeaturesWidget::objNameFeatureList = "FeatureList";

-const QString UBFeaturesNewFolderDialog::acceptText = tr("Accept");
-const QString UBFeaturesNewFolderDialog::cancelText = tr("Cancel");
-const QString UBFeaturesNewFolderDialog::labelText =  tr("Enter a new folder name");
-
 const QMargins FeatureListMargins(0, 0, 0, 30);
 const int FeatureListBorderOffset = 10;
 const char featureTypeSplitter = ':';
@ -198,7 +194,6 @@ void UBFeaturesWidget::lockIt(bool pLock)
    mActionBar->setEnabled(!pLock);
    pathListView->setEnabled(!pLock);
    centralWidget->setLockedExcludingAdditional(pLock);
-//    pathListView->setLocked(true);
 }

 void UBFeaturesWidget::addToFavorite( const UBFeaturesMimeData * mimeData )
@ -578,6 +573,9 @@ void UBFeaturesCentralWidget::scanFinished()
 }

 UBFeaturesNewFolderDialog::UBFeaturesNewFolderDialog(QWidget *parent) : QWidget(parent)
+  , acceptText(tr("Accept"))
+  , cancelText(tr("Cancel"))
+  , labelText(tr("Enter a new folder name"))
 {
    this->setStyleSheet("background:white;");

--- a/src/gui/UBFeaturesWidget.h
+++ b/src/gui/UBFeaturesWidget.h
@ -193,9 +193,9 @@ public:
    void setLockedExcludingAdditional(bool pLock);

    QStackedWidget *mStackedWidget;
-        UBFeaturesNavigatorWidget *mNavigator;
-        UBFeatureProperties *mFeatureProperties;
-        UBFeaturesWebView *webView;
+    UBFeaturesNavigatorWidget *mNavigator;
+    UBFeatureProperties *mFeatureProperties;
+    UBFeaturesWebView *webView;

    QStackedWidget *mAdditionalDataContainer;

@ -226,10 +226,6 @@ class UBFeaturesNewFolderDialog : public QWidget
    Q_OBJECT

 public:
-    static const QString acceptText;
-    static const QString cancelText;
-    static const QString labelText;
-
    UBFeaturesNewFolderDialog(QWidget *parent = 0);
    void setRegexp(const QRegExp pRegExp);
    bool validString(const QString &pStr);
@ -249,7 +245,9 @@ private:
    QRegExpValidator *mValidator;
    QStringList mFileNameList;
    QPushButton *acceptButton;
-
+    const QString acceptText;
+    const QString cancelText;
+    const QString labelText;
 };

 class UBFeaturesProgressInfo: public QWidget {