Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Add Qvfb hungarian translation
  Add Qtconfig hungarian translation
  Add Linguist hungarian translation
  Add Designer hungarian translation
  Add Qt help hungarian translation
  Add Assistant hungarian translation
  Add Qt base hungarian translation

6 files changed, 9 insertions, 3 deletions

diff --git a/tools/assistant/translations/qt_help.pro b/tools/assistant/translations/qt_help.pro
index db54ae6..a641069 100644
--- a/tools/assistant/translations/qt_help.pro
+++ b/tools/assistant/translations/qt_help.pro
@@ -43,6 +43,7 @@ TR_DIR = $$PWD/../../../translations
 TRANSLATIONS = \
     $$TR_DIR/qt_help_da.ts \
     $$TR_DIR/qt_help_de.ts \
+    $$TR_DIR/qt_help_hu.ts \
     $$TR_DIR/qt_help_ja.ts \
     $$TR_DIR/qt_help_pl.ts \
     $$TR_DIR/qt_help_ru.ts \
diff --git a/tools/assistant/translations/translations.pro b/tools/assistant/translations/translations.pro
index 95501ab..16d2010 100644
--- a/tools/assistant/translations/translations.pro
+++ b/tools/assistant/translations/translations.pro
@@ -45,6 +45,7 @@ TRANSLATIONS = \
     $$TR_DIR/assistant_da.ts \
     $$TR_DIR/assistant_de.ts \
     $$TR_DIR/assistant_fr.ts \
+    $$TR_DIR/assistant_hu.ts \
     $$TR_DIR/assistant_ja.ts \
     $$TR_DIR/assistant_pl.ts \
     $$TR_DIR/assistant_ru.ts \
diff --git a/tools/designer/translations/translations.pro b/tools/designer/translations/translations.pro
index 03c1415..279b322 100644
--- a/tools/designer/translations/translations.pro
+++ b/tools/designer/translations/translations.pro
@@ -131,6 +131,7 @@ TR_DIR = $$PWD/../../../translations
 TRANSLATIONS = \
     $$TR_DIR/designer_de.ts \
     $$TR_DIR/designer_fr.ts \
+    $$TR_DIR/designer_hu.ts \
     $$TR_DIR/designer_ja.ts \
     $$TR_DIR/designer_pl.ts \
     $$TR_DIR/designer_ru.ts \
diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro
index c902aeb..67bcda8 100644
--- a/tools/linguist/linguist/linguist.pro
+++ b/tools/linguist/linguist/linguist.pro
@@ -9,7 +9,7 @@ CONFIG += qt \
     uitools
 
 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-build_all:!build_pass { 
+build_all:!build_pass {
     CONFIG -= build_all
     CONFIG += release
 }
@@ -42,7 +42,7 @@ SOURCES += \
     statistics.cpp \
     translatedialog.cpp \
     translationsettingsdialog.cpp \
-    ../shared/simtexth.cpp 
+    ../shared/simtexth.cpp
 
 HEADERS += \
     batchtranslationdialog.h \
@@ -71,7 +71,7 @@ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
 DEFINES += QT_KEYWORDS
 TARGET = linguist
 win32:RC_FILE = linguist.rc
-mac { 
+mac {
     static:CONFIG -= global_init_link_order
     ICON = linguist.icns
     TARGET = Linguist
@@ -99,6 +99,7 @@ TR_DIR = $$PWD/../../../translations
 TRANSLATIONS = \
     $$TR_DIR/linguist_de.ts \
     $$TR_DIR/linguist_fr.ts \
+    $$TR_DIR/linguist_hu.ts \
     $$TR_DIR/linguist_ja.ts \
     $$TR_DIR/linguist_pl.ts \
     $$TR_DIR/linguist_ru.ts \
diff --git a/tools/qtconfig/translations/translations.pro b/tools/qtconfig/translations/translations.pro
index bf8a1da..5d35b6a 100644
--- a/tools/qtconfig/translations/translations.pro
+++ b/tools/qtconfig/translations/translations.pro
@@ -9,6 +9,7 @@ FORMS        = ../mainwindowbase.ui ../paletteeditoradvancedbase.ui ../previewwi
 
 TR_DIR = $$PWD/../../../translations
 TRANSLATIONS = \
+    $$TR_DIR/qtconfig_hu.ts \
     $$TR_DIR/qtconfig_pl.ts \
     $$TR_DIR/qtconfig_ru.ts \
     $$TR_DIR/qtconfig_zh_CN.ts \
diff --git a/tools/qvfb/translations/translations.pro b/tools/qvfb/translations/translations.pro
index ef42063..b0b1af4 100644
--- a/tools/qvfb/translations/translations.pro
+++ b/tools/qvfb/translations/translations.pro
@@ -28,6 +28,7 @@ SOURCES =  ../qvfb.cpp \
 
 TR_DIR = $$PWD/../../../translations
 TRANSLATIONS = \
+    $$TR_DIR/qvfb_hu.ts \
     $$TR_DIR/qvfb_pl.ts \
     $$TR_DIR/qvfb_ru.ts \
     $$TR_DIR/qvfb_zh_CN.ts \