diff --git a/corona.h b/corona.h
index 4f8307e57..3184fd22c 100644
--- a/corona.h
+++ b/corona.h
@@ -103,6 +103,27 @@ public:
      */
     Containment *addContainment(const QString &name, const QVariantList &args = QVariantList());
 
+    /**
+     * Loads a containment with delayed initialization, primarily useful
+     * for implementations of loadDefaultLayout. The caller is responsible
+     * for all initializating, saving and notification of a new containment.
+     *
+     * @param name the plugin name for the containment, as given by
+     *        KPluginInfo::pluginName(). If an empty string is passed in, the defalt
+     *        containment plugin will be used (usually DesktopContainment). If the
+     *        string literal "null" is passed in, then no plugin will be loaded and
+     *        a simple Containment object will be created instead.
+     * @param args argument list to pass to the containment
+     *
+     * @return a pointer to the containment on success, or 0 on failure. Failure can
+     * be caused by the Immutability type being too restrictive, as containments can't be added
+     * when widgets are locked, or if the requested containment plugin can not be located
+     * or successfully loaded.
+     * @see addContainment
+     **/
+    Containment *addContainmentDelayed(const QString &name,
+                                       const QVariantList &args = QVariantList());
+
     /**
      * Returns the Containment, if any, for a given physical screen and desktop
      *
@@ -415,25 +436,22 @@ protected:
     virtual void loadDefaultLayout();
 
     /**
-     * Loads a containment with delayed initialization, primarily useful
-     * for implementations of loadDefaultLayout. The caller is responsible
-     * for all initializating, saving and notification of a new containment.
-     *
-     * @param name the plugin name for the containment, as given by
-     *        KPluginInfo::pluginName(). If an empty string is passed in, the defalt
-     *        containment plugin will be used (usually DesktopContainment). If the
-     *        string literal "null" is passed in, then no plugin will be loaded and
-     *        a simple Containment object will be created instead.
-     * @param args argument list to pass to the containment
-     *
-     * @return a pointer to the containment on success, or 0 on failure. Failure can
-     * be caused by the Immutability type being too restrictive, as containments can't be added
-     * when widgets are locked, or if the requested containment plugin can not be located
-     * or successfully loaded.
-     * @see addContainment
-     **/
-    Containment *addContainmentDelayed(const QString &name,
-                                       const QVariantList &args = QVariantList());
+     * Maps a stock animation to one of the semantic animations. Used to control things such
+     * as what animation is used to make a Plasma::Appear appear in a containment.
+     * @param from the animation to map a new value to
+     * @param to the animation value to map to from
+     * @since 4.5
+     */
+    void mapAnimation(Animator::Animation from, Animator::Animation to);
+
+    /**
+     * Maps a loadable animation to one of the semantic animations. Used to control things such
+     * as what animation is used to make a Plasma::Appear appear in a containment.
+     * @param from the animation to map a new value to
+     * @param to the animation value to map to from; this must map to a Javascript animation
+     * @since 4.5
+     */
+    void mapAnimation(Animator::Animation from, const QString &to);
 
     /**
      * @return The preferred toolbox plugin name for a given containment type.
diff --git a/data/services/plasma.protocol b/data/services/plasma.protocol
index 1cb84bd84..f95baf84d 100644
--- a/data/services/plasma.protocol
+++ b/data/services/plasma.protocol
@@ -20,6 +20,7 @@ Description[et]=Plasma teenuste protokoll
 Description[eu]=Plasma zerbitzuentzako protokolo bat
 Description[fi]=Plasma-palvelujen yhteyskäytäntö
 Description[fr]=Un protocole pour les services Plasma
+Description[gl]=Un protocolo para servizos do Plasma
 Description[hr]=Protokol za servise u Plasmi
 Description[hu]=Protokoll a Plazma-szolgáltatáshoz
 Description[ia]=un protocollo per servicios de Plasma
@@ -46,10 +47,10 @@ Description[sr@ijekavian]=Протокол за плазма сервисе
 Description[sr@ijekavianlatin]=Protokol za plasma servise
 Description[sr@latin]=Protokol za plasma servise
 Description[sv]=Ett protokoll för Plasma-tjänster
-Description[th]=โพรโทคอลสำหรับใช้กับบริการของพลาสมา
 Description[tr]=Plasma servisleri için bir protokol
 Description[ug]=پلازما(Plasma) مۇلازىمىتىنىڭ كېلىشىمى
 Description[uk]=Протокол для служб Плазми
+Description[vi]=Một giao thức cho các dịch vụ Plasma
 Description[x-test]=xxA protocol for Plasma servicesxx
 Description[zh_CN]=Plasma 服务协议
 Description[zh_TW]=Plasma 服務協定
diff --git a/data/servicetypes/plasma-animator.desktop b/data/servicetypes/plasma-animator.desktop
index 44fe07ea3..45b475c58 100644
--- a/data/servicetypes/plasma-animator.desktop
+++ b/data/servicetypes/plasma-animator.desktop
@@ -72,6 +72,7 @@ Comment[th]=กลไกแสดงความเคลื่อนไหว
 Comment[tr]=Plasma Canlandırma Motoru
 Comment[ug]=Plasma جانلاندۇرۇم ماتورى
 Comment[uk]=Рушій анімації Плазми
+Comment[vi]=Cơ chế hoạt ảnh Plasma
 Comment[wa]=Moteur d' animåcion di Plasma
 Comment[x-test]=xxPlasma Animation Enginexx
 Comment[zh_CN]=Plasma 动画引擎
diff --git a/data/servicetypes/plasma-applet.desktop b/data/servicetypes/plasma-applet.desktop
index ed73c409b..d733d0fe0 100644
--- a/data/servicetypes/plasma-applet.desktop
+++ b/data/servicetypes/plasma-applet.desktop
@@ -73,6 +73,7 @@ Comment[th]=แอพเพล็ตของพลาสมา
 Comment[tr]=Plasma programcığı
 Comment[ug]=Plasma قوللانچاق
 Comment[uk]=Аплет Плазми
+Comment[vi]=Tiểu dụng Plasma
 Comment[wa]=Aplikete di Plasma
 Comment[x-test]=xxPlasma appletxx
 Comment[zh_CN]=Plasma 小程序
diff --git a/data/servicetypes/plasma-dataengine.desktop b/data/servicetypes/plasma-dataengine.desktop
index ab82e66a3..13e85544e 100644
--- a/data/servicetypes/plasma-dataengine.desktop
+++ b/data/servicetypes/plasma-dataengine.desktop
@@ -71,8 +71,9 @@ Comment[ta]=பிளாஸ்மா தரவு இயந்திரம்
 Comment[tg]=Системаи маълумотии Plasma
 Comment[th]=กลไกข้อมูลของพลาสมา
 Comment[tr]=Plasma Veri Motoru
-Comment[ug]=Plasma سانلىق-مەلۇمات ماتورى
+Comment[ug]=Plasma سانلىق مەلۇمات ماتورى
 Comment[uk]=Рушій даних Плазми
+Comment[vi]=Cơ chế dữ liệu Plasma
 Comment[wa]=Moteur di dnêyes di Plasma
 Comment[x-test]=xxPlasma Data Enginexx
 Comment[zh_CN]=Plasma 数据引擎
diff --git a/data/servicetypes/plasma-packagestructure.desktop b/data/servicetypes/plasma-packagestructure.desktop
index 10b2f256e..e3bd43d10 100644
--- a/data/servicetypes/plasma-packagestructure.desktop
+++ b/data/servicetypes/plasma-packagestructure.desktop
@@ -1,3 +1,84 @@
 [Desktop Entry]
 Type=ServiceType
 X-KDE-ServiceType=Plasma/PackageStructure
+Comment=Plasma package structure definition
+Comment[ar]=تعريف بنية حزمة بلازما
+Comment[as]=Plasma সৰঞ্জাম আকাৰৰ সংজ্ঞা
+Comment[ast]=Definición d'estructura de paquete Plasma
+Comment[be@latin]=Aznačeńnie struktury pakunka „Plasma”
+Comment[bg]=Структурно определение на пакет на Plasma
+Comment[bs]=Definicija strukture plazma paketa
+Comment[ca]=Definició de l'estructura d'un paquet Plasma
+Comment[ca@valencia]=Definició de l'estructura d'un paquet Plasma
+Comment[cs]=Definice struktury Plasma balíčku
+Comment[da]=Definition af pakkestruktur til Plasma
+Comment[de]=Plasma-Paket-Struktur-Definition
+Comment[el]=Ορισμός δομής πακέτου του Plasma
+Comment[en_GB]=Plasma package structure definition
+Comment[es]=Definición de estructura de paquete para Plasma
+Comment[et]=Plasma paketi struktuuri definitsioon
+Comment[eu]=Plasma paketearen egituraren definizioa
+Comment[fi]=Plasma-pakettirakenteen määritelmä
+Comment[fr]=Définition de la structure des paquetages Plasma
+Comment[fy]=Plasma pakket sstruktuer defenysje
+Comment[ga]=Sainmhíniú ar struchtúr pacáiste Plasma
+Comment[gl]=Definición da estrutura do paquete de Plasma
+Comment[gu]=પ્લાઝમા પેકેજ માળખાંની વ્યાખ્યા
+Comment[he]=הגדרת מבנה של חבילת Plasma
+Comment[hne]=प्लाज्मा पैकेज स्ट्रक्चर परिभासा
+Comment[hr]=Plasmina definicija strukture paketa
+Comment[hsb]=Strukturna definicija Plasma-pakćika
+Comment[hu]=Struktúraleíró Plasma-csomagokhoz
+Comment[ia]=Definition del structura de pacchetto de Plasma
+Comment[id]=Definisi struktur paket Plasma
+Comment[is]=Skilgreiningar Plasma pakkauppbyggingar
+Comment[it]=Definizione struttura pacchetto Plasma
+Comment[ja]=Plasma パッケージ構造の定義
+Comment[kk]=Plasma дестесінің құрамынын анықтауы
+Comment[km]=កា​រកំណត់​រចនាសម្ព័ន្ធ​កញ្ចប់​របស់​ប្លាស្មា
+Comment[kn]=ಪ್ಲಾಸ್ಮಾ  ಕಂತೆ (ಪ್ಯಾಕೇಜ್) ರಚನಾ ಲಕ್ಷಣ (ಡೆಫೆನಿಶನ್)
+Comment[ko]=Plasma 패키지 구조 정의
+Comment[ku]=Daxuyaniya çêbûna pakêta Plasma
+Comment[lt]=Plasma paketo struktūros aprašymas
+Comment[lv]=Plasma pakotņu struktūras definīcija
+Comment[mai]=प्लाजमा पैकेज संरचनाक परिभाषा
+Comment[ml]=പ്ലാസ്മ പാക്കേജ് സ്ട്രക്ചര്‍ ഡെഫനിഷന്‍
+Comment[nb]=Definisjon av Plasma pakkestruktur
+Comment[nds]=Paketstruktuur-Fastleggen vun Plasma
+Comment[nl]=Structuurdefinitie van plasmapakket
+Comment[nn]=Pakkestrukturdefinisjon for Plasma
+Comment[pa]=ਪਲਾਜ਼ਮਾ ਪੈਕੇਜ ਢਾਂਚਾ ਪਰਿਭਾਸ਼ਾ
+Comment[pl]=Definicja struktury pakietu Plazmy
+Comment[pt]=Definição da estrutura de pacotes do Plasma
+Comment[pt_BR]=Definição de estrutura de pacote do Plasma
+Comment[ro]=Definiție de structură a pachetului Plasma
+Comment[ru]=Определение структуры пакета Plasma
+Comment[se]=Plasma-páhkkaráhkadusdefinišuvdna
+Comment[sk]=Definícia štruktúry Plasma balíčkov
+Comment[sl]=Definicija strukture paketa za Plasmo
+Comment[sr]=Дефиниција структуре плазма пакета
+Comment[sr@ijekavian]=Дефиниција структуре плазма пакета
+Comment[sr@ijekavianlatin]=Definicija strukture plasma paketa
+Comment[sr@latin]=Definicija strukture plasma paketa
+Comment[sv]=Strukturdefinition av Plasma-paket
+Comment[ta]=பிளாஸ்மா பொதி வடிவமைப்பு வரையறை
+Comment[tg]=Барномаи муайянкунии сохтори Plasma
+Comment[th]=นิยามโครงสร้างแพกเกจของพลาสมา
+Comment[tr]=Plasma paketi yapı tanımlaması
+Comment[ug]=Plasma بوغچا قۇرۇلما ئېنىقلىمىسى
+Comment[uk]=Опис структури пакунка плазми
+Comment[vi]=Định nghĩa cấu trúc gói Plasma
+Comment[wa]=Definixha del sitructeure do pacaedje di Plasma
+Comment[x-test]=xxPlasma package structure definitionxx
+Comment[zh_CN]=Plasma 包结构定义
+Comment[zh_TW]=Plasma 套件結構定義
+
+[PropertyDef::X-Plasma-PackageFileFilter]
+Type=QString
+
+[PropertyDef::X-Plasma-PackageFileMimetypes]
+Type=QStringList
+
+[PropertyDef::X-Plasma-ProvidesWidgetBrowser]
+Type=bool
+
diff --git a/data/servicetypes/plasma-runner.desktop b/data/servicetypes/plasma-runner.desktop
index 79148221f..2ca88a865 100644
--- a/data/servicetypes/plasma-runner.desktop
+++ b/data/servicetypes/plasma-runner.desktop
@@ -22,6 +22,7 @@ Comment[en_GB]=KRunner plugin
 Comment[es]=Complemento para KRunner
 Comment[et]=KRunneri plugin
 Comment[eu]=KRnner plugin-a
+Comment[fa]=وصله KRunner
 Comment[fi]=KRunner-liitännäinen
 Comment[fr]=Module KRunner
 Comment[fy]=KRunner plugin
@@ -74,6 +75,7 @@ Comment[th]=โปรแกรมเสริมของ KRunner
 Comment[tr]=KRunner eklentisi
 Comment[ug]=KRunner قىستۇرما
 Comment[uk]=Додаток до KRunner
+Comment[vi]=Phần bổ sung KRunner
 Comment[wa]=Tchôke-divins KRunner
 Comment[x-test]=xxKRunner pluginxx
 Comment[zh_CN]=KRunner 插件
diff --git a/data/servicetypes/plasma-scriptengine.desktop b/data/servicetypes/plasma-scriptengine.desktop
index 97e3210ef..02b7819cf 100644
--- a/data/servicetypes/plasma-scriptengine.desktop
+++ b/data/servicetypes/plasma-scriptengine.desktop
@@ -70,6 +70,7 @@ Comment[th]=ส่วนเสริมภาษาสคริปต์สำ
 Comment[tr]=Plasma için betik dili eklentisi
 Comment[ug]=Plasma نىڭ قوليازما تىل كېڭەيتىلمىسى
 Comment[uk]=Розширення скриптових мов для Плазми
+Comment[vi]=Phần mở rộng ngôn ngữ lệnh cho Plasma
 Comment[wa]=Rawete di lingaedje di scriptaedje po Plasma
 Comment[x-test]=xxScripting language extension for Plasmaxx
 Comment[zh_CN]=Plasma 的脚本语言扩展
diff --git a/data/servicetypes/plasma-service.desktop b/data/servicetypes/plasma-service.desktop
index db21604e7..e04e3b437 100644
--- a/data/servicetypes/plasma-service.desktop
+++ b/data/servicetypes/plasma-service.desktop
@@ -50,6 +50,7 @@ Comment[th]=บริการของพลาสมา
 Comment[tr]=Plasma servisi
 Comment[ug]=Plasma مۇلازىمىتى
 Comment[uk]=Служба Плазми
+Comment[vi]=Dịch vụ Plasma
 Comment[wa]=Siervice di Plasma
 Comment[x-test]=xxPlasma servicexx
 Comment[zh_CN]=Plasma 服务
diff --git a/data/servicetypes/plasma-toolbox.desktop b/data/servicetypes/plasma-toolbox.desktop
index 92a5bffaa..308ff77e8 100644
--- a/data/servicetypes/plasma-toolbox.desktop
+++ b/data/servicetypes/plasma-toolbox.desktop
@@ -52,6 +52,7 @@ Comment[th]=กล่องเครื่องมือของพลาส
 Comment[tr]=Plasma araç kutusu
 Comment[ug]=Plasma قورال ساندۇقى
 Comment[uk]=Набір інструментів Плазми
+Comment[vi]=Hộp công cụ Plasma
 Comment[wa]=Boesse ås usteyes di Plasma
 Comment[x-test]=xxPlasma toolboxxx
 Comment[zh_CN]=Plasma 工具箱
diff --git a/data/servicetypes/plasma-wallpaper.desktop b/data/servicetypes/plasma-wallpaper.desktop
index 09acfeec4..28707a6fd 100644
--- a/data/servicetypes/plasma-wallpaper.desktop
+++ b/data/servicetypes/plasma-wallpaper.desktop
@@ -71,6 +71,7 @@ Comment[th]=ภาพพื้นหลังของพลาสมา
 Comment[tr]=Plasma duvar kağıdı
 Comment[ug]=Plasma تام قەغىزى
 Comment[uk]=Тло стільниці Плазми
+Comment[vi]=Hình nền Plasma
 Comment[wa]=Tapisreye di Plasma
 Comment[x-test]=xxPlasma wallpaperxx
 Comment[zh_CN]=Plasma 壁纸
diff --git a/popupapplet.cpp b/popupapplet.cpp
index abe554b6f..9fce479d8 100644
--- a/popupapplet.cpp
+++ b/popupapplet.cpp
@@ -843,15 +843,14 @@ void PopupAppletPrivate::updateDialogPosition(bool move)
 
     const QPoint appletPos = view->mapToGlobal(view->mapFromScene(q->scenePos()));
 
-    QPoint dialogPos;
-    if (!q->containment() || view == q->containment()->view()) {
-        kDebug() << "requesting with" << q->scenePos();
-        dialogPos = corona->popupPosition(q, dialog->size(), popupAlignment);
-    } else {
-        kDebug() << "requesting with" << q->parentItem();
-        dialogPos = corona->popupPosition(q->parentItem(), dialog->size(), popupAlignment);
+    QPoint dialogPos = dialog->pos();
+    if (move) {
+        if (!q->containment() || view == q->containment()->view()) {
+            dialogPos = corona->popupPosition(q, dialog->size(), popupAlignment);
+        } else {
+            dialogPos = corona->popupPosition(q->parentItem(), dialog->size(), popupAlignment);
+        }
     }
-    kDebug() << "dialog position is" << dialogPos <<" with location" << q->location() << "<<<<<<<<<<<<<<<<<<<<<<<<";
 
     bool reverse = false;
     if (q->formFactor() == Plasma::Vertical) {
diff --git a/tests/packagemetadatatest.desktop b/tests/packagemetadatatest.desktop
index 069943718..793f65ca0 100644
--- a/tests/packagemetadatatest.desktop
+++ b/tests/packagemetadatatest.desktop
@@ -64,8 +64,9 @@ Name[ta]=பொதியின் மூலத்தரவு சோதனைக
 Name[tg]=Файли санҷишии стсетмаи metadata
 Name[th]=แฟ้มทดสอบข้อมูลกำกับแพกเกจ
 Name[tr]=Paket metadata test dosyası
-Name[ug]=بوغچا مېتا سانلىق-مەلۇمات سىناق ھۆججەت
+Name[ug]=بوغچا مېتا سانلىق مەلۇمات سىناق ھۆججەت
 Name[uk]=Файл перевірки метаданих пакунка
+Name[vi]=Tập tin kiểm tra dữ liệu lý lịch Plasma
 Name[wa]=Fitchî d' asprouvaedje des meta-dnêyes do pacaedje
 Name[x-test]=xxPackage metadata test filexx
 Name[zh_CN]=工具包元数据测试文件
@@ -137,6 +138,7 @@ Comment[th]=แฟ้มทดสอบพื้นที่ทำงาน ส
 Comment[tr]=PackageMetaData sınıfını test etmek için bir desktop dosyası.
 Comment[ug]=PackageMetaData خىلىدىكى سىناشقا ئىشلىتىدىغان desktop تىپىدىكى ھۆججەت.
 Comment[uk]=Тестовий стільничний файл для перевірки класу PackageMetaData.
+Comment[vi]=Một tập tin thử để kiểm tra lớp PackageMetaData.
 Comment[wa]=On fitchî desktop di saye pos asprouver l' classe PackageMetaData.
 Comment[x-test]=xxA test desktop file to test the PackageMetaData class.xx
 Comment[zh_CN]=用于测试 PackageMetaData 类的 desktop 类型文件。
diff --git a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
index 87582b8d9..6d12204b8 100644
--- a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
+++ b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
@@ -47,8 +47,9 @@ Name[sr@latin]=Proba
 Name[sv]=Test
 Name[th]=ทดสอบ
 Name[tr]=Deneme
-Name[ug]=سىناق
+Name[ug]=سىنا
 Name[uk]=Тест
+Name[vi]=Kiểm tra
 Name[wa]=Sayî
 Name[x-test]=xxTestxx
 Name[zh_CN]=测试
@@ -101,6 +102,7 @@ Comment[th]=โปรแกรมเสริมเทียมสำหรั
 Comment[tr]=Denemek için sahte bir eklenti
 Comment[ug]=سىناشقا ئىشلىتىدىغان قىستۇرما
 Comment[uk]=Додаток для тестування
+Comment[vi]=Một phần bổ sung giả để kiểm thử
 Comment[wa]=On fås tchôke-divins po l' asprouvaedje
 Comment[x-test]=xxA dummy plugin for testingxx
 Comment[zh_CN]=测试用插件
diff --git a/tests/testengine/plasma-dataengine-testengine.desktop b/tests/testengine/plasma-dataengine-testengine.desktop
index 734aadfe6..feadb0ade 100644
--- a/tests/testengine/plasma-dataengine-testengine.desktop
+++ b/tests/testengine/plasma-dataengine-testengine.desktop
@@ -69,6 +69,7 @@ Name[th]=กลไกทดสอบข้อมูล
 Name[tr]=Test Veri Motoru
 Name[ug]=سىناققا ئىشلىتىدىغان ماتور
 Name[uk]=Перевірка рушія даних
+Name[vi]=Cơ chế kiểm tra dữ liệu
 Name[wa]=Moteur di dnêyes d' asprouvaedje
 Name[x-test]=xxTest Data Enginexx
 Name[zh_CN]=测试用数据引擎