diff --git a/.arcconfig b/.arcconfig
new file mode 100644
index 0000000..377c7ec
--- /dev/null
+++ b/.arcconfig
@@ -0,0 +1,3 @@
+{
+  "phabricator.uri" : "https://phabricator.kde.org/"
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 369699a..00e1413 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,17 @@
 cmake_minimum_required(VERSION 2.8.12)
 
 find_package(ECM 5.14 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 include(FeatureSummary)
 include(ECMInstallIcons)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMQtDeclareLoggingCategory)
 
+# Required for ki18n_install(po) added on tarball generation
+find_package(KF5 REQUIRED COMPONENTS I18n)
+
 add_subdirectory(kpartloader)
 add_subdirectory(kuiviewer)
diff --git a/kpartloader/CMakeLists.txt b/kpartloader/CMakeLists.txt
index 4e54d94..1fe4136 100644
--- a/kpartloader/CMakeLists.txt
+++ b/kpartloader/CMakeLists.txt
@@ -1,27 +1,26 @@
 project(kpartloader)
 ########### kpartloader ###############
 
 set(QT_MIN_VERSION "5.5.0")
 
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE
     COMPONENTS
     Core
 )
 
 find_package(KF5 REQUIRED
     COMPONENTS
     CoreAddons
-    I18n
     Parts
     WidgetsAddons
 )
 
 set(kpartloader_SRCS
     kpartloader.cpp
 )
 
 add_executable(kpartloader ${kpartloader_SRCS})
 target_link_libraries(kpartloader KF5::Parts)
 install(TARGETS kpartloader ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES kpartloaderui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kpartloader)
 
diff --git a/kuiviewer/CMakeLists.txt b/kuiviewer/CMakeLists.txt
index fa72c59..3fe987e 100644
--- a/kuiviewer/CMakeLists.txt
+++ b/kuiviewer/CMakeLists.txt
@@ -1,96 +1,95 @@
 project(kuiviewer)
 
 set(QT_MIN_VERSION "5.5.0")
 
 include(ECMAddAppIcon)
 
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE
     COMPONENTS
     Core
     Designer
     UiTools
 )
 
 find_package(KF5 REQUIRED
     COMPONENTS
     CoreAddons
     KIO
-    I18n
     Parts
 )
 
 add_definitions(
     -DQT_DEPRECATED_WARNINGS
     -DQT_DISABLE_DEPRECATED_BEFORE=0x050500
     -DQT_NO_SIGNALS_SLOTS_KEYWORDS
     -DQT_STRICT_ITERATORS
     -DQT_USE_QSTRINGBUILDER
     -DQT_NO_CAST_TO_ASCII
     -DQT_NO_CAST_FROM_ASCII
     -DQT_NO_CAST_FROM_BYTEARRAY
     -DQT_NO_URL_CAST_FROM_STRING
 )
 
 ########### next target ###############
 
 set(kuiviewer_SRCS main.cpp kuiviewer.cpp )
 
 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-kuiviewer.png")
 ecm_add_app_icon(kuiviewer_SRCS ICONS ${ICONS_SRCS})
 
 add_executable(kuiviewer ${kuiviewer_SRCS})
 
 target_link_libraries(kuiviewer  KF5::Parts  )
 
 install(TARGETS kuiviewer  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### next target ###############
 
 set(kuiviewerpart_PART_SRCS kuiviewer_part.cpp )
 
 ecm_qt_declare_logging_category(kuiviewerpart_PART_SRCS
     HEADER kuiviewer_part_debug.h
     IDENTIFIER KUIVIEWERPART
     CATEGORY_NAME "kuiviewerpart"
 )
 
 add_library(kuiviewerpart MODULE ${kuiviewerpart_PART_SRCS})
 
 target_link_libraries(kuiviewerpart  KF5::Parts Qt5::Designer Qt5::UiTools)
 
 install(TARGETS kuiviewerpart  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 
 ########### next target ###############
 
 set(quithumbnail_PART_SRCS quicreator.cpp )
 
 add_library(quithumbnail MODULE ${quithumbnail_PART_SRCS})
 
 target_link_libraries(quithumbnail
     KF5::KIOWidgets
     Qt5::Designer
     Qt5::UiTools
 )
 
 install(TARGETS quithumbnail  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 
 ########### install files ###############
 
 install( PROGRAMS org.kde.kuiviewer.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
 install( FILES designerthumbnail.desktop kuiviewer_part.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 install( FILES kuiviewer_part.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/kuiviewerpart )
 install( FILES kuiviewerui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/kuiviewer )
 
 ecm_install_icons(ICONS
     16-apps-kuiviewer.png
     32-apps-kuiviewer.png
     48-apps-kuiviewer.png
     64-apps-kuiviewer.png
     128-apps-kuiviewer.png
     sc-apps-kuiviewer.svg
     DESTINATION ${KDE_INSTALL_ICONDIR}
     THEME hicolor
 )
diff --git a/kuiviewer/org.kde.kuiviewer.desktop b/kuiviewer/org.kde.kuiviewer.desktop
index 9dbac01..f286a2d 100755
--- a/kuiviewer/org.kde.kuiviewer.desktop
+++ b/kuiviewer/org.kde.kuiviewer.desktop
@@ -1,149 +1,149 @@
 [Desktop Entry]
 Name=KUIViewer
 Name[ast]=KUIViewer
 Name[bg]=KUIViewer
 Name[br]=KUIViewer
 Name[bs]=KUIViewer
 Name[ca]=KUIViewer
 Name[ca@valencia]=KUIViewer
 Name[cs]=KUIViewer
 Name[cy]=KUIGwelydd
 Name[da]=KUIViewer
 Name[de]=KUIViewer
 Name[el]=KUIViewer
 Name[en_GB]=KUIViewer
 Name[es]=KUIViewer
 Name[et]=KUIViewer
 Name[eu]=KUIViewer
 Name[fi]=KUIViewer
 Name[fr]=KUIViewer
 Name[ga]=KUIViewer
 Name[gl]=KUIViewer
 Name[he]=KUIViewer
 Name[hu]=KUIViewer
 Name[is]=KUIViewer
 Name[it]=KUIViewer
 Name[ja]=KUI ビューア
 Name[kk]=KUIViewer
 Name[km]=KUIViewer
 Name[ko]=KUIViewer
 Name[lt]=KUIViewer
 Name[lv]=KUIViewer
 Name[mr]=केयुआय-व्ह्युअर
 Name[nb]=KUIViewer
 Name[nds]=KUIViewer
 Name[ne]=KUIViewer
 Name[nl]=KUIViewer
 Name[nn]=KUIViewer
 Name[pa]=KUIViewer
 Name[pl]=KUIViewer
 Name[pt]=KUIViewer
 Name[pt_BR]=KUIViewer
 Name[ro]=KUIViewer
 Name[ru]=KUIViewer
 Name[sk]=KUIViewer
 Name[sl]=KUIViewer
 Name[sr]=К‑УИ‑приказивач
 Name[sr@ijekavian]=К‑УИ‑приказивач
 Name[sr@ijekavianlatin]=K‑UI‑prikazivač
 Name[sr@latin]=K‑UI‑prikazivač
 Name[sv]=KUIviewer
 Name[ta]=KUIவியூவர்
 Name[tg]=KUIViewer
 Name[tr]=KUIViewer
 Name[ug]=KUIViewer
 Name[uk]=KUIViewer
 Name[x-test]=xxKUIViewerxx
 Name[zh_CN]=KUIViewer
 Name[zh_TW]=KUIViewer
 Exec=kuiviewer -qwindowtitle %c %u
 Icon=kuiviewer
 Type=Application
 GenericName=Qt Designer UI File Viewer
 GenericName[ast]=Visor de ficheros d'IU de Qt Designer
 GenericName[bg]=Преглед на файлове на Qt Designer
 GenericName[br]=Ur gweler restr UI Ergrafer Qt
 GenericName[bs]=Preglednik datoteka Qt dizajnera
 GenericName[ca]=Visor de fitxer UI de Qt Designer
 GenericName[ca@valencia]=Visor de fitxer UI de Qt Designer
 GenericName[cs]=Prohlížeč UI souborů z Qt Designeru
 GenericName[cy]=Gwelydd Ffeiliau UI Qt Designer
 GenericName[da]=Qt Designer UI filviser
 GenericName[de]=Betrachter für UI-Dateien des Qt Designer
 GenericName[el]=Προβολέας αρχείων Qt Designer UI
 GenericName[en_GB]=Qt Designer UI File Viewer
 GenericName[es]=Visor de archivos UI de Qt Designer
 GenericName[et]=Qt Designeri UI-failide näitaja
 GenericName[eu]=Qt Designer UI fitxartegi ikusgailua
 GenericName[fa]=مشاهده‌گر پرونده واسط نگاره‌ای طراح Qt
 GenericName[fi]=Qt Designerin UI-tiedostojen katselin
 GenericName[fr]=Afficheur de fichiers d'interface graphique « Qt Designer »
 GenericName[ga]=Amharcán Comhad Qt Designer
 GenericName[gl]=Visor de ficheiros de Qt Designer
 GenericName[hu]=Qt Designer UI-fájlnézegető
 GenericName[is]=Qt Designer UI skráaskoðari
 GenericName[it]=Visualizzatore per file UI di Qt Designer
 GenericName[ja]=Qt デザイナー UI ファイルビューア
 GenericName[kk]=Qt Designer UI файлын қарау құралы
 GenericName[km]=កម្មវិធី​មើល​​ឯកសារ​របស់​ UI ​កម្មវិធី​រចនា​របស់​ Qt
 GenericName[ko]=Qt 디자이너 UI 파일 뷰어
 GenericName[lt]=Qt Designer naudotojo sąsajos failų žiūryklė
 GenericName[lv]=Qt dizainera UI failu skatītājs
 GenericName[mr]=Qt डिजाइनर UI फाईल प्रदर्शक
 GenericName[nb]=Qt Designer UI-filviser
 GenericName[nds]=Kieker för Qt-Designer sien UI-Dateien
 GenericName[ne]=Qt डिजाइनर यूआई फाइल दर्शक
 GenericName[nl]=Weergave van QT Designer UI-bestanden
 GenericName[nn]=Qt Designer UI-filvisar
 GenericName[pl]=Przeglądarka plików interfejsu użytkownika Qt Designera
 GenericName[pt]=Visualizador de Ficheiros UI do Qt Designer
 GenericName[pt_BR]=Visualizador de arquivos UI do Qt Designer
 GenericName[ro]=Vizualizator de fișiere Qt Designer UI
 GenericName[ru]=Просмотрщик UI-файлов Qt Designer
 GenericName[sk]=Prehliadač súborov UI pre Qt Designer
 GenericName[sl]=Pregledovalnik datotek UI Qt Designer-ja
 GenericName[sr]=Приказивач УИ фајлова КуТ‑дизајнера
 GenericName[sr@ijekavian]=Приказивач УИ фајлова КуТ‑дизајнера
 GenericName[sr@ijekavianlatin]=Prikazivač UI fajlova QtDesignera
 GenericName[sr@latin]=Prikazivač UI fajlova QtDesignera
 GenericName[sv]=Qt-designer UI-filvisning
 GenericName[ta]=Qt  வடிவமைப்பவர் UI கோப்புகள் காட்சியகம்
 GenericName[tg]=Намоишгари UI-файлҳо Qt Designer
 GenericName[tr]=Qt Tasarımcı UI Dosya Göstericisi
 GenericName[ug]=Qt Designer UI  ھۆججەت كۆرگۈچ
 GenericName[uk]=Переглядач UI-файлів Qt Designer
 GenericName[x-test]=xxQt Designer UI File Viewerxx
 GenericName[zh_CN]=Qt 设计师 UI 文件查看器
 GenericName[zh_TW]=Qt Designer UI 檔案檢視器
 Comment=A quick viewer for Qt Designer UI File
 Comment[ast]=Un visor rápidu pa ficheros d'IU de Qt Designer
 Comment[ca]=Un visor ràpid de fitxer UI de Qt Designer
 Comment[ca@valencia]=Un visor ràpid de fitxer UI de Qt Designer
 Comment[cs]=Rychlý prohlížeč souborů UI programu Qt Designer
 Comment[de]=Schnelle Anzeige von UI-Dateien des Qt Designer
 Comment[el]=Ένας γρήγορος προβολέας αρχείων Qt Designer UI
 Comment[en_GB]=A quick viewer for Qt Designer UI File
 Comment[es]=Un rápido visor para archivos de interfaz de usuario de Qt Designer
 Comment[fr]=Un afficheur rapide de fichiers d'interface graphique « Qt Designer »
 Comment[gl]=Un visor rápido para ficheiros de interface gráfica de Qt Designer.
 Comment[it]=Un visualizzatore veloce per i file UI di Qt Designer
 Comment[ko]=Qt 디자이너 UI 파일 뷰어
 Comment[nl]=Een snelle viewer voor Qt Designer UI bestand
 Comment[pl]=Szybka przeglądarka dla plików UI Qt Designera
 Comment[pt]=Um visualizador rápido para os ficheiros UI do Qt Designer
 Comment[sk]=Rýchly prehliadač pre súbor UI Qt Designer
 Comment[sl]=Hitri pregledovalnik datotek UI Qt Designer-ja
 Comment[sr]=Брзи приказивач за УИ фајлове КуТ‑дизајнера
 Comment[sr@ijekavian]=Брзи приказивач за УИ фајлове КуТ‑дизајнера
 Comment[sr@ijekavianlatin]=Brzi prikazivač za UI fajlove QtDesignera
 Comment[sr@latin]=Brzi prikazivač za UI fajlove QtDesignera
 Comment[sv]=En snabbvisning av en Qt Designer UI-fil
 Comment[tr]=QT Tasarım UI dosyası için hızlı görüntüleyici
 Comment[uk]=Швидкий засіб перегляду для файлів UI Qt Designer
 Comment[x-test]=xxA quick viewer for Qt Designer UI Filexx
 Comment[zh_CN]=Qt 设计师 UI 文件快速查看器
-Comment[zh_TW]=一個 QT Designer UI 檔案的快速瀏覽器
+Comment[zh_TW]=Qt Designer 介面檔案的簡易檢視器
 MimeType=application/x-designer;
 Terminal=false
 Categories=Qt;KDE;Development;
 InitialPreference=10