- Added Norwegian translation

Changelog

@@ -12,6 +12,7 @@
     - FEATURE: Rewritten search engine plugin (by fab31)
     - FEATURE: Rewritten parts of the download/search lists to improve performance
     - FEATURE: Individual share ratio is now displayed in each torrent properties.
+    - I18N: Added Norwegian translation
     - BUGFIX: Fixed a memory leak when pressing OK in torrent properties
     - BUGFIX: Improved code so that GUI never freeze during downloading from an url
     - BUGFIX: Forgot to remove torrent file from scanned directory when "Clear Finished torrents" is enabled

INSTALL

@@ -16,7 +16,7 @@ will install and execute qBittorrent hopefully without any problems.
 Dependencies:
 - Qt >= 4.1 (libqt-devel, libqtxml, libqtgui, libqtcore, libqtnetwork)
 
-- rb_libtorrent by Arvid Norberg (>= v0.10 REQUIRED)
+- rb_libtorrent by Arvid Norberg (>= v0.11 REQUIRED)
     -> http://libtorrent.sf.net
     Be carefull: another library (the one used by rtorrent) use the same name.
     These are TWO different libraries and qBittorrent will only work with the one provided

src/icons.qrc

@@ -1,25 +1,45 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>Icons/home.png</file>
-  <file>Icons/log.png</file>
+  <file>Icons/encrypted.png</file>
+  <file>Icons/locale.png</file>
   <file>Icons/style.png</file>
   <file>Icons/wizard.png</file>
   <file>Icons/button_cancel.png</file>
+  <file>Icons/button_ok.png</file>
   <file>Icons/smile.png</file>
-  <file>Icons/qbittorrent16.png</file>
   <file>Icons/stare.png</file>
-  <file>Icons/filter.png</file>
-  <file>Icons/encrypted.png</file>
-  <file>Icons/locale.png</file>
+  <file>Icons/qbittorrent22.png</file>
   <file>Icons/proxy.png</file>
+  <file>Icons/log.png</file>
+  <file>Icons/qbittorrent32.png</file>
+  <file>Icons/qbittorrent16.png</file>
   <file>Icons/systemtray.png</file>
-  <file>Icons/button_ok.png</file>
   <file>Icons/unhappy.png</file>
-  <file>Icons/qbittorrent22.png</file>
+  <file>Icons/filter.png</file>
   <file>Icons/splash.jpg</file>
-  <file>Icons/qbittorrent32.png</file>
-  <file>Icons/skin/url.png</file>
-  <file>Icons/skin/pause_all.png</file>
+  <file>Icons/home.png</file>
+  <file>Icons/flags/netherlands.png</file>
+  <file>Icons/flags/portugal.png</file>
+  <file>Icons/flags/france.png</file>
+  <file>Icons/flags/ukraine.png</file>
+  <file>Icons/flags/germany.png</file>
+  <file>Icons/flags/united_kingdom.png</file>
+  <file>Icons/flags/russia.png</file>
+  <file>Icons/flags/south_korea.png</file>
+  <file>Icons/flags/slovakia.png</file>
+  <file>Icons/flags/spain.png</file>
+  <file>Icons/flags/poland.png</file>
+  <file>Icons/flags/spain_catalunya.png</file>
+  <file>Icons/flags/china_hong_kong.png</file>
+  <file>Icons/flags/italy.png</file>
+  <file>Icons/flags/china.png</file>
+  <file>Icons/flags/norway.png</file>
+  <file>Icons/flags/turkey.png</file>
+  <file>Icons/flags/sweden.png</file>
+  <file>Icons/flags/romania.png</file>
+  <file>Icons/flags/bulgaria.png</file>
+  <file>Icons/flags/greece.png</file>
+  <file>Icons/skin/properties.png</file>
   <file>Icons/skin/play_all.png</file>
   <file>Icons/skin/remove.png</file>
   <file>Icons/skin/settings.png</file>
@@ -27,8 +47,9 @@
   <file>Icons/skin/disconnected.png</file>
   <file>Icons/skin/delete.png</file>
   <file>Icons/skin/connected.png</file>
+  <file>Icons/skin/url.png</file>
   <file>Icons/skin/play.png</file>
-  <file>Icons/skin/properties.png</file>
+  <file>Icons/skin/pause_all.png</file>
   <file>Icons/skin/downloading.png</file>
   <file>Icons/skin/search.png</file>
   <file>Icons/skin/exit.png</file>
@@ -36,32 +57,12 @@
   <file>Icons/skin/firewalled.png</file>
   <file>Icons/skin/seeding.png</file>
   <file>Icons/skin/paused.png</file>
+  <file>Icons/skin/preview.png</file>
   <file>Icons/skin/connecting.png</file>
   <file>Icons/skin/add.png</file>
   <file>Icons/skin/stalled.png</file>
   <file>Icons/skin/new.png</file>
   <file>Icons/skin/delete_all.png</file>
   <file>Icons/skin/info.png</file>
-  <file>Icons/skin/preview.png</file>
-  <file>Icons/flags/netherlands.png</file>
-  <file>Icons/flags/china.png</file>
-  <file>Icons/flags/bulgaria.png</file>
-  <file>Icons/flags/china_hong_kong.png</file>
-  <file>Icons/flags/france.png</file>
-  <file>Icons/flags/germany.png</file>
-  <file>Icons/flags/greece.png</file>
-  <file>Icons/flags/south_korea.png</file>
-  <file>Icons/flags/poland.png</file>
-  <file>Icons/flags/portugal.png</file>
-  <file>Icons/flags/slovakia.png</file>
-  <file>Icons/flags/sweden.png</file>
-  <file>Icons/flags/turkey.png</file>
-  <file>Icons/flags/italy.png</file>
-  <file>Icons/flags/united_kingdom.png</file>
-  <file>Icons/flags/romania.png</file>
-  <file>Icons/flags/russia.png</file>
-  <file>Icons/flags/spain.png</file>
-  <file>Icons/flags/ukraine.png</file>
-  <file>Icons/flags/spain_catalunya.png</file>
 </qresource>
 </RCC>

src/lang.qrc

@@ -1,24 +1,25 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>lang/qbittorrent_fr.qm</file>
-  <file>lang/qbittorrent_zh.qm</file>
-  <file>lang/qbittorrent_en.qm</file>
   <file>lang/qbittorrent_es.qm</file>
-  <file>lang/qbittorrent_pl.qm</file>
   <file>lang/qbittorrent_ko.qm</file>
-  <file>lang/qbittorrent_de.qm</file>
+  <file>lang/qbittorrent_sk.qm</file>
+  <file>lang/qbittorrent_uk.qm</file>
+  <file>lang/qbittorrent_ro.qm</file>
   <file>lang/qbittorrent_ru.qm</file>
-  <file>lang/qbittorrent_ca.qm</file>
+  <file>lang/qbittorrent_el.qm</file>
+  <file>lang/qbittorrent_en.qm</file>
+  <file>lang/qbittorrent_fr.qm</file>
   <file>lang/qbittorrent_nl.qm</file>
-  <file>lang/qbittorrent_uk.qm</file>
+  <file>lang/qbittorrent_pl.qm</file>
+  <file>lang/qbittorrent_it.qm</file>
+  <file>lang/qbittorrent_zh.qm</file>
+  <file>lang/qbittorrent_pt.qm</file>
+  <file>lang/qbittorrent_ca.qm</file>
   <file>lang/qbittorrent_tr.qm</file>
   <file>lang/qbittorrent_sv.qm</file>
-  <file>lang/qbittorrent_el.qm</file>
   <file>lang/qbittorrent_bg.qm</file>
-  <file>lang/qbittorrent_sk.qm</file>
-  <file>lang/qbittorrent_ro.qm</file>
-  <file>lang/qbittorrent_it.qm</file>
+  <file>lang/qbittorrent_de.qm</file>
   <file>lang/qbittorrent_zh_HK.qm</file>
-  <file>lang/qbittorrent_pt.qm</file>
+  <file>lang/qbittorrent_nb.qm</file>
 </qresource>
 </RCC>

src/lang/qbittorrent_bg.ts

@@ -1620,5 +1620,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_ca.ts

@@ -1668,5 +1668,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_de.ts

@@ -1617,5 +1617,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_el.ts

@@ -1660,5 +1660,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_en.ts

@@ -1269,5 +1269,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_es.ts

@@ -1641,5 +1641,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_fr.ts

@@ -1749,5 +1749,9 @@ Veuillez d&apos;abord le quitter.</translation>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation>Télécharger dans le bon ordre (plus lent mais bon pour la prévisualisation)</translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_it.ts

@@ -1481,5 +1481,9 @@ hours</comment>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_ko.ts

@@ -1638,5 +1638,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_nl.ts

@@ -1598,5 +1598,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_pl.ts

@@ -1643,5 +1643,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_pt.ts

@@ -1461,5 +1461,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_ro.ts

@@ -1462,5 +1462,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_ru.ts

@@ -1550,5 +1550,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_sk.ts

@@ -1520,5 +1520,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_sv.ts

@@ -1327,5 +1327,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_tr.ts

@@ -1652,5 +1652,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_uk.ts

@@ -1566,5 +1566,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_zh.ts

@@ -1543,5 +1543,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/lang/qbittorrent_zh_HK.ts

@@ -1433,5 +1433,9 @@ Please close the other one first.</source>
         <source>Download in correct order (slower but good for previewing)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share Ratio:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

src/options_imp.cpp

@@ -71,6 +71,8 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
   locales << "el_GR";
   combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/sweden.png"))), QString::fromUtf8("  Svenska"));
   locales << "sv_SE";
+  combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/norway.png"))), QString::fromUtf8("  Norsk"));
+  locales << "nb_NO";
   combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/bulgaria.png"))), QString::fromUtf8("  Български"));
   locales << "bg_BG";
   combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/ukraine.png"))), QString::fromUtf8("  Українська"));

src/src.pro

@@ -34,9 +34,9 @@ contains(DEBUG_MODE, 0){
 
 # Includes
 include($$TRAYICON_CPP/trayicon.pri)
-exists(../conf.pri) {
-        include(../conf.pri)
-}
+#exists(../conf.pri) {
+#       include(../conf.pri)
+#}
 
 # Install
 unix {
@@ -81,7 +81,8 @@ TRANSLATIONS = $$LANG_PATH/qbittorrent_fr.ts \
 	       $$LANG_PATH/qbittorrent_zh_HK.ts \
 	       $$LANG_PATH/qbittorrent_sk.ts \
                $$LANG_PATH/qbittorrent_ro.ts \
-               $$LANG_PATH/qbittorrent_pt.ts
+               $$LANG_PATH/qbittorrent_pt.ts \
+	       $$LANG_PATH/qbittorrent_nb.ts
 
 # Source code
 HEADERS += GUI.h misc.h options_imp.h about_imp.h \