diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/CMakeLists.txt gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/CMakeLists.txt
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/CMakeLists.txt	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/CMakeLists.txt	2013-05-31 10:43:02.000000000 +0000
@@ -49,6 +49,7 @@
 enable_testing()
 
 add_subdirectory(desktop)
+add_subdirectory(po)
 add_subdirectory(rc)
 add_subdirectory(src)
 add_subdirectory(tests)
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/debian/changelog gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/debian/changelog
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/debian/changelog	2013-05-31 13:24:30.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/debian/changelog	2013-05-31 13:24:31.000000000 +0000
@@ -1,4 +1,32 @@
-gallery-app (0.0.67daily13.05.10ubuntu.unity.next-0ubuntu1) raring; urgency=low
+gallery-app (0.0.67daily13.05.31.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
+
+  [ Ken VanDine ]
+  * Use UOA to populate share menu
+
+  [ Guenter Schwann ]
+  * First german translation, and everything needed to make it work.
+  * Support orientation change.
+  * Fixes sharing functionality (LP: 1183460). (LP: #1183460)
+  * Remove old unused files.
+
+  [ Omer Akram ]
+  * Fix autopilot test: wait for the edit dialog to fully appear before
+    moving towards it.
+  * Fix failing tests on touch devices.
+
+  [ Olivier Tilloy ]
+  * Add missing runtime dependency on qtdeclarative5-accounts-plugin.
+    Merging manually as the jenkins CI job is busted, it installs the
+    wrong version of the app and its dependencies (see
+    https://code.launchpad.net/~osomon/gallery-app/missing-uoa-
+    dep/+merge/166552).
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 677 (ubuntu-unity/next)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Fri, 31 May 2013 10:43:43 +0000
+
+gallery-app (0.0.67daily13.05.22ubuntu.unity.next-0ubuntu1) raring; urgency=low
 
   [ Didier Roche ]
   * Automatic snapshot from revision 654 (bootstrap)
@@ -15,17 +43,27 @@
   * Fix gallery startup on device (LP: #1173286)
   * Speed up thumbnail creation, and limit number of thumbnails on startup
 
+  [ Michael Terry ]
+  * Port to HUD 1.0.
+
+  [ Omer Akram ]
+  * port gallery-app to ap 1.3.
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * libhud-qt-qml has been renamed to qtdeclarative5-hud1.0.
+
   [ Renato Araujo Oliveira Filho ]
-  * Album table grows with every start (LP: #1163353)
+  * Fixed duplicate entries in Media Album Table;. (LP: #1163353)
 
   [ Guenter Schwann ]
-  * gallery does not start up on device because of shader issue (LP:
-    #1175260)
+  * Use Components and PopupUtils for the edit and share Popover.
+  * Update Toolbar API.
+  * Use SDK Popover for cover image menu.
 
   [ Ubuntu daily release ]
-  * Automatic snapshot from revision 665 (ubuntu-unity/next)
+  * Automatic snapshot from revision 668 (ubuntu-unity/next)
 
- -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Fri, 10 May 2013 05:00:53 +0000
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 22 May 2013 05:01:53 +0000
 
 gallery-app (0.0.67) quantal; urgency=low
 
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/debian/control gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/debian/control
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/debian/control	2013-05-31 13:24:30.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/debian/control	2013-05-31 13:24:31.000000000 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Build-Depends: debhelper (>= 9),
                cmake,
+               gettext,
                libexiv2-dev,
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev,
@@ -25,6 +26,7 @@
 Conflicts: ubuntu-gallery
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         qtdeclarative5-accounts-plugin,
          qtdeclarative5-hud1.0,
          libqt5sql5-sqlite,
          qtdeclarative5-qtquick2-plugin,
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/debian/gallery-app.install gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/debian/gallery-app.install
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/debian/gallery-app.install	2013-05-31 13:24:30.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/debian/gallery-app.install	2013-05-31 13:24:31.000000000 +0000
@@ -2,3 +2,4 @@
 usr/share/applications
 usr/share/gallery-app
 usr/share/icons
+usr/share/locale/*/LC_MESSAGES/gallery-app.mo
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/po/CMakeLists.txt gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/po/CMakeLists.txt
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/po/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/po/CMakeLists.txt	2013-05-31 10:43:02.000000000 +0000
@@ -0,0 +1,16 @@
+project(gallery-translations)
+
+include(FindGettext)
+
+set(DOMAIN gallery-app)
+set(POT_FILE ${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+
+foreach(PO_FILE ${PO_FILES})
+    get_filename_component(LANG ${PO_FILE} NAME_WE)
+    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
+    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+            DESTINATION ${INSTALL_DIR}
+            RENAME ${DOMAIN}.mo)
+endforeach(PO_FILE)
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/po/de.po gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/po/de.po
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/po/de.po	1970-01-01 00:00:00.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/po/de.po	2013-05-31 10:43:02.000000000 +0000
@@ -0,0 +1,264 @@
+# Ubuntu gallery app translation.
+# Copyright 2013 Canonical Ltd.
+# This file is distributed under the same license as the gallery-app package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gallery-app VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-23 06:59+0000\n"
+"PO-Revision-Date: 2013-05-22 18:22-0000\n"
+"Last-Translator: Guenter Schwann <guenter.schwann@canonical.com>\n"
+"Language-Team: German\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: rc/qml/Utility/SelectionToolbarAction.qml:42
+#: rc/qml/Utility/EditingHUD.qml:77 rc/qml/AlbumViewer.qml:466
+#: rc/qml/GalleryPhotoViewer.qml:206 rc/qml/AlbumsOverview.qml:177
+msgid "Add"
+msgstr ""
+
+#: rc/qml/Utility/SelectionToolbarAction.qml:48
+#: rc/qml/Utility/EditingHUD.qml:67 rc/qml/AlbumViewer.qml:473
+#: rc/qml/GalleryPhotoViewer.qml:214 rc/qml/Widgets/AlbumEditMenu.qml:59
+msgid "Delete"
+msgstr ""
+
+#: rc/qml/Utility/SelectionToolbarAction.qml:54
+#: rc/qml/Utility/EditingHUD.qml:72 rc/qml/AlbumViewer.qml:483
+#: rc/qml/GalleryPhotoViewer.qml:221 rc/qml/Widgets/AlbumEditMenu.qml:52
+msgid "Share"
+msgstr "Freigeben"
+
+#: rc/qml/Utility/SelectionToolbarAction.qml:61 rc/qml/MediaSelector.qml:94
+#: rc/qml/AlbumEditor.qml:40
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: rc/qml/Utility/PhotosToolbarActions.qml:32 rc/qml/MainScreen.qml:92
+#: rc/qml/MainScreen.qml:124
+msgid "Select"
+msgstr ""
+
+#: rc/qml/Utility/PhotosToolbarActions.qml:38
+msgid "Import"
+msgstr ""
+
+#: rc/qml/Utility/PhotosToolbarActions.qml:43 rc/qml/AlbumsOverview.qml:185
+msgid "Camera"
+msgstr "Kamera"
+
+#: rc/qml/Utility/EditingHUD.qml:68
+msgid "Trash;Erase"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:73
+msgid "Post;Upload;Attach"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:78 rc/qml/Widgets/PopupAlbumPicker.qml:113
+msgid "Add Photo to Album"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:82 rc/qml/Widgets/EditPopover.qml:63
+msgid "Undo"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:83
+msgid "Cancel Action;Backstep"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:87 rc/qml/Widgets/EditPopover.qml:72
+msgid "Redo"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:88
+msgid "Reapply;Make Again"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:92
+msgid "Auto Enhance"
+msgstr "Automatisch verbessern"
+
+#: rc/qml/Utility/EditingHUD.qml:93
+msgid "Adjust the image automatically"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:94
+msgid "Automatically Adjust Photo"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:99 rc/qml/Widgets/EditPopover.qml:39
+msgid "Rotate"
+msgstr "Drehen"
+
+#: rc/qml/Utility/EditingHUD.qml:100
+msgid "Turn Clockwise"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:101
+msgid "Rotate the image clockwise"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:106 rc/qml/Utility/CropOverlay.qml:355
+#: rc/qml/Widgets/EditPopover.qml:47
+msgid "Crop"
+msgstr "Ausschneiden"
+
+#: rc/qml/Utility/EditingHUD.qml:107
+msgid "Trim;Cut"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:108
+msgid "Crop the image"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:113
+msgid "Revert to Original"
+msgstr "Original wiederherstellen"
+
+#: rc/qml/Utility/EditingHUD.qml:114
+msgid "Discard Changes"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:115
+msgid "Discard all changes"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:119
+msgid "Exposure"
+msgstr "Belichtung"
+
+#: rc/qml/Utility/EditingHUD.qml:120
+msgid "Adjust the exposure"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:121
+msgid "Underexposed;Overexposed"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:123 rc/qml/Utility/EditingHUD.qml:165
+msgid "Confirm"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:127
+msgid "Compensation"
+msgstr "Farbabgleich"
+
+#: rc/qml/Utility/EditingHUD.qml:161
+msgid "Color Balance"
+msgstr "Farbabgleich"
+
+#: rc/qml/Utility/EditingHUD.qml:162
+#, fuzzy
+msgid "Adjust color balance"
+msgstr "Farbabgleich"
+
+#: rc/qml/Utility/EditingHUD.qml:163
+msgid "Saturation;Hue"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:169
+msgid "Brightness"
+msgstr "Helligkeit"
+
+#: rc/qml/Utility/EditingHUD.qml:181
+msgid "Contrast"
+msgstr "Kontrast"
+
+#: rc/qml/Utility/EditingHUD.qml:193
+msgid "Saturation"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:205
+msgid "Hue"
+msgstr "Farbton"
+
+#: rc/qml/Utility/AlbumCoverList.qml:113
+msgid "Default"
+msgstr "Standard"
+
+#: rc/qml/Utility/AlbumCoverList.qml:114
+msgid "Blue"
+msgstr "Blau"
+
+#: rc/qml/Utility/AlbumCoverList.qml:115
+msgid "Green"
+msgstr ""
+
+#: rc/qml/Utility/AlbumCoverList.qml:116
+msgid "Pattern"
+msgstr "Muster"
+
+#: rc/qml/Utility/AlbumCoverList.qml:117
+msgid "Red"
+msgstr "Rot"
+
+#: rc/qml/AlbumViewer.qml:488 rc/qml/GalleryPhotoViewer.qml:229
+msgid "Back"
+msgstr ""
+
+#: rc/qml/PhotosOverview.qml:148
+msgid "Delete photos"
+msgstr ""
+
+#: rc/qml/PhotosOverview.qml:149 rc/qml/GalleryPhotoViewer.qml:264
+msgid "Delete a photo"
+msgstr ""
+
+#: rc/qml/MainScreen.qml:56
+msgid "Albums"
+msgstr "Alben"
+
+#: rc/qml/MainScreen.qml:72 rc/qml/MainScreen.qml:94
+msgid "Events"
+msgstr "Ereignisse"
+
+#: rc/qml/MainScreen.qml:104 rc/qml/MainScreen.qml:126
+msgid "Photos"
+msgstr "Fotos"
+
+#: rc/qml/GalleryPhotoViewer.qml:199
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: rc/qml/GalleryPhotoViewer.qml:275 rc/qml/Widgets/DeleteDialog.qml:36
+msgid "Yes"
+msgstr "Ja"
+
+#: rc/qml/GalleryPhotoViewer.qml:286 rc/qml/Widgets/DeleteDialog.qml:45
+msgid "No"
+msgstr "Nein"
+
+#: rc/qml/MediaSelector.qml:56 rc/qml/MediaSelector.qml:82
+msgid "Add to Album"
+msgstr ""
+
+#: rc/qml/LoadingScreen.qml:36
+msgid "Loading…"
+msgstr "Laden…"
+
+#: rc/qml/Widgets/AlbumEditMenu.qml:45
+msgid "Edit album"
+msgstr "Album bearbeiten"
+
+#: rc/qml/Widgets/DeleteOrDeleteWithContentsDialog.qml:51
+msgid "Delete album"
+msgstr ""
+
+#: rc/qml/Widgets/DeleteOrDeleteWithContentsDialog.qml:60
+msgid "Delete album + contents"
+msgstr ""
+
+#: rc/qml/Widgets/EditPopover.qml:55
+msgid "Auto enhance"
+msgstr "Automatisch verbessern"
+
+#: rc/qml/Widgets/EditPopover.qml:81
+msgid "Revert to original"
+msgstr "Original wiederherstellen"
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/po/gallery-app.pot gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/po/gallery-app.pot
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/po/gallery-app.pot	1970-01-01 00:00:00.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/po/gallery-app.pot	2013-05-31 10:43:02.000000000 +0000
@@ -0,0 +1,262 @@
+# Ubuntu gallery app translation.
+# Copyright 2013 Canonical Ltd.
+# This file is distributed under the same license as the gallery-app package.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: gallery-app\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-23 06:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: rc/qml/Utility/SelectionToolbarAction.qml:42
+#: rc/qml/Utility/EditingHUD.qml:77 rc/qml/AlbumViewer.qml:466
+#: rc/qml/GalleryPhotoViewer.qml:206 rc/qml/AlbumsOverview.qml:177
+msgid "Add"
+msgstr ""
+
+#: rc/qml/Utility/SelectionToolbarAction.qml:48
+#: rc/qml/Utility/EditingHUD.qml:67 rc/qml/AlbumViewer.qml:473
+#: rc/qml/GalleryPhotoViewer.qml:214 rc/qml/Widgets/AlbumEditMenu.qml:59
+msgid "Delete"
+msgstr ""
+
+#: rc/qml/Utility/SelectionToolbarAction.qml:54
+#: rc/qml/Utility/EditingHUD.qml:72 rc/qml/AlbumViewer.qml:483
+#: rc/qml/GalleryPhotoViewer.qml:221 rc/qml/Widgets/AlbumEditMenu.qml:52
+msgid "Share"
+msgstr ""
+
+#: rc/qml/Utility/SelectionToolbarAction.qml:61 rc/qml/MediaSelector.qml:94
+#: rc/qml/AlbumEditor.qml:40
+msgid "Cancel"
+msgstr ""
+
+#: rc/qml/Utility/PhotosToolbarActions.qml:32 rc/qml/MainScreen.qml:92
+#: rc/qml/MainScreen.qml:124
+msgid "Select"
+msgstr ""
+
+#: rc/qml/Utility/PhotosToolbarActions.qml:38
+msgid "Import"
+msgstr ""
+
+#: rc/qml/Utility/PhotosToolbarActions.qml:43 rc/qml/AlbumsOverview.qml:185
+msgid "Camera"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:68
+msgid "Trash;Erase"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:73
+msgid "Post;Upload;Attach"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:78 rc/qml/Widgets/PopupAlbumPicker.qml:113
+msgid "Add Photo to Album"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:82 rc/qml/Widgets/EditPopover.qml:63
+msgid "Undo"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:83
+msgid "Cancel Action;Backstep"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:87 rc/qml/Widgets/EditPopover.qml:72
+msgid "Redo"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:88
+msgid "Reapply;Make Again"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:92
+msgid "Auto Enhance"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:93
+msgid "Adjust the image automatically"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:94
+msgid "Automatically Adjust Photo"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:99 rc/qml/Widgets/EditPopover.qml:39
+msgid "Rotate"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:100
+msgid "Turn Clockwise"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:101
+msgid "Rotate the image clockwise"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:106 rc/qml/Utility/CropOverlay.qml:355
+#: rc/qml/Widgets/EditPopover.qml:47
+msgid "Crop"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:107
+msgid "Trim;Cut"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:108
+msgid "Crop the image"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:113
+msgid "Revert to Original"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:114
+msgid "Discard Changes"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:115
+msgid "Discard all changes"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:119
+msgid "Exposure"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:120
+msgid "Adjust the exposure"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:121
+msgid "Underexposed;Overexposed"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:123 rc/qml/Utility/EditingHUD.qml:165
+msgid "Confirm"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:127
+msgid "Compensation"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:161
+msgid "Color Balance"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:162
+msgid "Adjust color balance"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:163
+msgid "Saturation;Hue"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:169
+msgid "Brightness"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:181
+msgid "Contrast"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:193
+msgid "Saturation"
+msgstr ""
+
+#: rc/qml/Utility/EditingHUD.qml:205
+msgid "Hue"
+msgstr ""
+
+#: rc/qml/Utility/AlbumCoverList.qml:113
+msgid "Default"
+msgstr ""
+
+#: rc/qml/Utility/AlbumCoverList.qml:114
+msgid "Blue"
+msgstr ""
+
+#: rc/qml/Utility/AlbumCoverList.qml:115
+msgid "Green"
+msgstr ""
+
+#: rc/qml/Utility/AlbumCoverList.qml:116
+msgid "Pattern"
+msgstr ""
+
+#: rc/qml/Utility/AlbumCoverList.qml:117
+msgid "Red"
+msgstr ""
+
+#: rc/qml/AlbumViewer.qml:488 rc/qml/GalleryPhotoViewer.qml:229
+msgid "Back"
+msgstr ""
+
+#: rc/qml/PhotosOverview.qml:148
+msgid "Delete photos"
+msgstr ""
+
+#: rc/qml/PhotosOverview.qml:149 rc/qml/GalleryPhotoViewer.qml:264
+msgid "Delete a photo"
+msgstr ""
+
+#: rc/qml/MainScreen.qml:56
+msgid "Albums"
+msgstr ""
+
+#: rc/qml/MainScreen.qml:72 rc/qml/MainScreen.qml:94
+msgid "Events"
+msgstr ""
+
+#: rc/qml/MainScreen.qml:104 rc/qml/MainScreen.qml:126
+msgid "Photos"
+msgstr ""
+
+#: rc/qml/GalleryPhotoViewer.qml:199
+msgid "Edit"
+msgstr ""
+
+#: rc/qml/GalleryPhotoViewer.qml:275 rc/qml/Widgets/DeleteDialog.qml:36
+msgid "Yes"
+msgstr ""
+
+#: rc/qml/GalleryPhotoViewer.qml:286 rc/qml/Widgets/DeleteDialog.qml:45
+msgid "No"
+msgstr ""
+
+#: rc/qml/MediaSelector.qml:56 rc/qml/MediaSelector.qml:82
+msgid "Add to Album"
+msgstr ""
+
+#: rc/qml/LoadingScreen.qml:36
+msgid "Loading…"
+msgstr ""
+
+#: rc/qml/Widgets/AlbumEditMenu.qml:45
+msgid "Edit album"
+msgstr ""
+
+#: rc/qml/Widgets/DeleteOrDeleteWithContentsDialog.qml:51
+msgid "Delete album"
+msgstr ""
+
+#: rc/qml/Widgets/DeleteOrDeleteWithContentsDialog.qml:60
+msgid "Delete album + contents"
+msgstr ""
+
+#: rc/qml/Widgets/EditPopover.qml:55
+msgid "Auto enhance"
+msgstr ""
+
+#: rc/qml/Widgets/EditPopover.qml:81
+msgid "Revert to original"
+msgstr ""
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/SlidingPane.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/SlidingPane.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/SlidingPane.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/SlidingPane.qml	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2011-2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Charles Lindsay <chaz@yorba.org>
- */
-
-import QtQuick 2.0
-
-// An Item that animates back and forth between two positions, normal ("out",
-// given in the normal QML Item properties) and an alternate ("in", given in
-// inX and inY).
-Item {
-    id: slidingPane
-
-    /*!
-    */
-    property real inX
-    /*!
-    */
-    property real inY
-    /*!
-    */
-    property int duration: 200
-
-    // readonly
-    /*!
-    */
-    property bool isIn: (state == "in")
-    /*!
-    */
-    property bool animationRunning: slideX.running || slideY.running
-
-    /*!
-    */
-    function slideIn() {
-        state = "in";
-    }
-
-    /*!
-    */
-    function slideOut() {
-        state = "";
-    }
-
-    states: [
-        State {
-            name: "in"
-            PropertyChanges { target: slidingPane; x: inX; y: inY; }
-        }
-    ]
-
-    Behavior on x {
-        animation: NumberAnimation {
-            id: slideX
-            easing.type: Easing.OutQuad
-            duration: slidingPane.duration
-        }
-    }
-    Behavior on y {
-        animation: NumberAnimation {
-            id: slideY
-            easing.type: Easing.OutQuad
-            duration: slidingPane.duration
-        }
-    }
-}
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/MenuItem.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/MenuItem.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/MenuItem.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/MenuItem.qml	1970-01-01 00:00:00.000000000 +0000
@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2011-2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Lucas Beeler <lucas@yorba.org>
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-/*!
-*/
-Rectangle {
-    id: menuItem
-
-    /*!
-    */
-    property bool isSeparator: false
-    /*!
-    */
-    property alias title: menuItemCaption.text
-    /*!
-    */
-    property bool hasBottomBorder: true
-    /*!
-    */
-    property alias iconFilename: iconImage.source
-    /*!
-    */
-    property alias hasCueRectangle: cueRectangle.visible
-    /*!
-    */
-    property string action: ""
-    /*!
-    */
-    property Item hostMenu
-
-    /*!
-    */
-    signal actionInvoked(string name)
-    /*!
-    */
-    signal popupInteractionCompleted()
-
-    states: [
-        State {
-            name: "normal";
-
-            PropertyChanges {
-                target: menuItem;
-                color: (!menuItem.isSeparator) ? "white" : "#bcbdc0";
-            }
-
-            PropertyChanges {
-                target: menuItemCaption;
-                color: (!menuItem.isSeparator) ? "#818285" : "white"
-            }
-        },
-
-        State {
-            name: "highlight";
-
-            PropertyChanges {
-                target: menuItem;
-                color: (!menuItem.isSeparator) ? "#bcbdc0" : "white"
-            }
-
-            PropertyChanges {
-                target: menuItemCaption;
-                color: "white" }
-        }]
-
-    state: "normal"
-
-    /*!
-    */
-    function dispatchAction() {
-        acknowledgeItemPressTimer.restart();
-        clearHighlightTimer.restart();
-        actionDispatchTimer.restart();
-    }
-
-    Timer {
-        id: clearHighlightTimer;
-
-        interval: 650
-
-        onTriggered: {
-            menuItem.state = "normal"
-        }
-    }
-
-    Timer {
-        id: actionDispatchTimer
-
-        interval: clearHighlightTimer.interval
-
-        onTriggered: {
-            if (menuItem.action != "")
-                menuItem.actionInvoked(menuItem.action);
-        }
-    }
-
-    Timer {
-        id: acknowledgeItemPressTimer
-
-        interval: 300
-
-        onTriggered: popupInteractionCompleted()
-    }
-
-    height: {
-        if (isSeparator)
-            return (title != "") ? units.gu(3) : units.gu(1)
-        else
-            return units.gu(6)
-    }
-
-    width: units.gu(40)
-
-    clip: true;
-
-    Image {
-        id: iconImage
-
-        visible: (iconFilename != "") ? true : false
-
-        cache: true
-
-        width: 36
-        height: 36
-        anchors.left: parent.left
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.leftMargin: units.gu(1)
-    }
-
-    Rectangle {
-        id: cueRectangle
-
-        width: units.gu(3);
-        height: units.gu(3);
-
-        anchors.right: parent.right
-        anchors.rightMargin: units.gu(1.5)
-        anchors.verticalCenter: parent.verticalCenter
-
-        color: "#bcbdc0"
-        border.color: "#818285"
-        border.width: 1
-        radius: 4
-    }
-
-    Text {
-        id: menuItemCaption
-
-        anchors.left: (iconFilename != "") ? iconImage.right : parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-
-        horizontalAlignment: (isSeparator || iconFilename != "") ? Text.AlignLeft :
-                                                                   Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-        font.family: "Ubuntu"
-        font.weight: (isSeparator) ? Font.Bold : Font.Normal
-        font.pixelSize: (isSeparator) ? units.gu(1.75) : units.gu(2)
-
-        anchors.leftMargin: (isSeparator || iconFilename != "") ? units.gu(1) : 0
-
-        visible: (text) ? true : false
-    }
-
-    Rectangle {
-        width: parent.width
-        height: 1
-        anchors.bottom: parent.bottom
-
-        visible: !menuItem.isSeparator && menuItem.hasBottomBorder
-
-        color: "#bcbdc0"
-    }
-
-    MouseArea {
-        anchors.fill: parent;
-
-        onClicked: {
-            if (!menuItem.isSeparator)
-                menuItem.state = "highlight"
-
-            dispatchAction();
-        }
-    }
-}
-
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/PopupBox.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/PopupBox.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/PopupBox.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/PopupBox.qml	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2011-2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Lucas Beeler <lucas@yorba.org>
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import ".."
-
-/*!
-*/
-Rectangle {
-    id: popupBox
-
-    /*!
-    */
-    signal popupInteractionCompleted();
-
-    /*!
-    */
-    property int contentLeft: 1
-    /*!
-    */
-    property int contentTop: 1
-    /*!
-    */
-    property alias contentWidth: contentArea.width
-    /*!
-    */
-    property alias contentHeight: contentArea.height
-
-    /*!
-    */
-    property int originCueX
-    /*!
-    */
-    property alias originCueHeight: originCueImage.height
-    /*!
-    */
-    property alias originCueWidth: originCueImage.width
-
-    /*!
-    */
-    property int popupOriginX: 0
-    /*!
-    */
-    property int popupOriginY: 0
-    /*!
-    */
-    property int fadeDuration: 300
-
-    // readonly
-    /*!
-    */
-    property int cueArrowOffset: Math.floor(originCueWidth / 2)
-    /*!
-    */
-    property int boundingOffset: units.gu(0.5)
-
-    /*!
-    */
-    function flipVisibility() {
-        state = (state == "shown" ? "hidden" : "shown");
-    }
-
-    color: "transparent"
-
-    x: {
-        var result = (popupOriginX >= 0) ? popupOriginX - cueArrowOffset : (parent.width + popupOriginX) - width - cueArrowOffset;
-        if (result < boundingOffset)
-            result = boundingOffset;
-        else if (result + width > parent.width - boundingOffset)
-            result = parent.width - width - boundingOffset;
-
-        return result;
-    }
-    y: {
-        var result = (popupOriginY >= 0) ? popupOriginY : (parent.height + popupOriginY) - height;
-        if (result < 0)
-            result = boundingOffset;
-        else if (result + height > parent.height)
-            result = parent.height - height - originCueHeight;
-
-        return result;
-    }
-
-    z: 32
-
-    originCueX: {
-        var result = (popupOriginX >= 0) ? x : width - originCueWidth;
-        if (result < 0)
-            result = 0;
-        else if (result > width - originCueWidth)
-            result = width - cueArrowOffset;
-
-        return result;
-    }
-
-    state: "hidden"
-
-    states: [
-        State { name: "shown"; },
-        State { name: "hidden"; }
-    ]
-
-    transitions: [
-        Transition { from: "shown"; to: "hidden";
-            FadeOutAnimation { target: popupBox; duration: fadeDuration;
-                easingType: Easing.InQuint; }
-        },
-        Transition { from: "hidden"; to: "shown";
-            FadeInAnimation { target: popupBox; duration: fadeDuration;
-                easingType: Easing.InQuint; }
-        }
-    ]
-
-    Rectangle {
-        id: contentArea
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        width: parent.width
-        height: parent.height - originCueHeight;
-
-        color: "#bcbdc0"
-        border.color: "#a7a9ac"
-        border.width: 1
-    }
-
-    Image {
-        id: originCueImage
-
-        x: originCueX
-        anchors.top: contentArea.bottom
-        width: 39
-        height: 25
-
-        source: "img/popup-arrow.png"
-        cache: true
-    }
-}
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/PopupMenu.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/PopupMenu.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/PopupMenu.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/PopupMenu.qml	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2011-2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Lucas Beeler <lucas@yorba.org>
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-/*!
-*/
-PopupBox {
-    id: popupMenu
-
-    // public
-    /*!
-    */
-    property alias model: menuItemList.model
-
-    /*!
-    */
-    signal actionInvoked(string name);
-
-    width: units.gu(40)
-    height: menuItemColumn.height + originCueHeight
-
-    color: "transparent"
-
-    Column {
-        id: menuItemColumn
-
-        Repeater {
-            id: menuItemList
-
-            x: popupMenu.contentLeft
-            y: popupMenu.contentTop
-            width: popupMenu.width
-
-            delegate: MenuItem {
-                title: (model.title) ? model.title : ""
-                isSeparator: (model.isSeparator) ? model.isSeparator : false
-                hasBottomBorder: (model.hasBottomBorder) ? model.hasBottomBorder : false
-                iconFilename: (model.iconFilename) ? model.iconFilename : ""
-                hasCueRectangle: (model.hasCueRectangle) ? model.hasCueRectangle : false
-                action: (model.action) ? model.action : ""
-                hostMenu: popupMenu
-
-                onActionInvoked: {
-                    popupMenu.actionInvoked(name);
-                }
-
-                onPopupInteractionCompleted: {
-                    popupMenu.popupInteractionCompleted();
-                }
-            }
-        }
-    }
-
-    Rectangle {
-        id: overstroke
-
-        width: parent.width
-        height: parent.height - parent.originCueHeight
-
-        color: "transparent"
-
-        border.color: "#a7a9ac"
-        border.width: 1
-    }
-}
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/ShareMenu.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/ShareMenu.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/ShareMenu.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/ShareMenu.qml	2013-05-31 10:43:02.000000000 +0000
@@ -17,6 +17,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.OnlineAccounts 0.1
 import Gallery 1.0
 
 /*!
@@ -33,6 +34,12 @@
 
     height: childrenRect.height
 
+    AccountServiceModel {
+        id: accounts
+        serviceType: "microblogging"
+        includeDisabled: true
+    }
+
     ListView {
         anchors {
             top: parent.top
@@ -42,28 +49,30 @@
         height: childrenRect.height
 
         interactive: false
-        model: ListModel {
-            ListElement { service: "Facebook"; user: "lolachang2010@yahoo.co.uk"; iconPath: "img/facebook.png" }
-            ListElement { service: "Twitter"; user: "@lola_chang"; iconPath: "img/twitter.png" }
-            ListElement { service: "Ubuntu One"; user: "lolachang"; iconPath: "img/ubuntuone.png" }
-            ListElement { service: "Gmail"; user: "lolachang2010@gmail.com"; iconPath: "img/gmail.png" }
-            ListElement { service: "Pinterest"; user: "lolachang2010@yahoo.co.uk"; iconPath: "img/pinterest.png" }
-        }
-
-        delegate: ListItem.Subtitled {
-            text: service
-            subText: user
-            icon: Qt.resolvedUrl(iconPath)
-            __iconHeight: units.gu(5)
-            __iconWidth: units.gu(5)
-
-            onClicked: {
-                sharemenu.selected()
-                if (service == "Facebook") {
-                    shareFile.writeShareFile(shareMenu.picturePath);
-                    appManager.switchToShareApplication();
-                } else {
-                    console.log("Sharing to this service is not supported yet.")
+        model: accounts
+        delegate: Item {
+            width: parent.width
+            height: childrenRect.height
+            visible: serviceName == "Facebook"
+            AccountService {
+                id: accts
+                objectHandle: accountService
+            }
+            ListItem.Subtitled {
+                text: accts.provider.displayName
+                subText: displayName
+                icon: "image://gicon/"+accts.provider.iconName
+                __iconHeight: units.gu(5)
+                __iconWidth: units.gu(5)
+
+                onClicked: {
+                    sharemenu.selected()
+                    if (accts.provider.displayName == "Facebook") {
+                        shareFile.writeShareFile(accountId, shareMenu.picturePath);
+                        appManager.switchToShareApplication();
+                    } else {
+                        console.log("Sharing to this service is not supported yet.")
+                    }
                 }
             }
         }
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/UbuntuApplicationCaller.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/UbuntuApplicationCaller.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/UbuntuApplicationCaller.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/UbuntuApplicationCaller.qml	2013-05-31 10:43:02.000000000 +0000
@@ -23,8 +23,8 @@
 Item {
     /// Opens the share application
     function switchToShareApplication() {
-        if (loader.status === Loader.Ready) {
-            loader.item.switchToShareApplication();
+        if (appManager.status === Loader.Ready) {
+            appManager.item.switchToShareApplication();
         } else {
             console.log("Application launching not available on this platform");
         }
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/img/toolbar-background-bottom.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/img/toolbar-background-bottom.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/img/toolbar-background-top.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/img/toolbar-background-top.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/img/toolbar-shadow-above.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/img/toolbar-shadow-above.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/Capetown/Widgets/img/toolbar-shadow-below.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/Capetown/Widgets/img/toolbar-shadow-below.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-grid-view-active@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-grid-view-active@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-grid-view-inactive@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-grid-view-inactive@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-more-active@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-more-active@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-more-inactive@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-more-inactive@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-plus-active@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-plus-active@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-plus-inactive@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-plus-inactive@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-redo@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-redo@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-revert@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-revert@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-rotate@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-rotate@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-share-active@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-share-active@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-share-inactive@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-share-inactive@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-trash-active@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-trash-active@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-trash-inactive@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-trash-inactive@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-undo@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-undo@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-white-album-active@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-white-album-active@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-white-album-inactive@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-white-album-inactive@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-white-back-active@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-white-back-active@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-white-back-inactive@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-white-back-inactive@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-white-more-active@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-white-more-active@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-white-more-inactive@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-white-more-inactive@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-white-share-active@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-white-share-active@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-white-share-inactive@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-white-share-inactive@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-white-trash-active@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-white-trash-active@8.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/img/icon-white-trash-inactive@8.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/img/icon-white-trash-inactive@8.png differ
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/AlbumEditor.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/AlbumEditor.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/AlbumEditor.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/AlbumEditor.qml	2013-05-31 10:43:02.000000000 +0000
@@ -92,14 +92,14 @@
     */
     function editNewAlbum() {
         albumEditor.album = albumModel.createOrphan();
-        coverMenu.state = "hidden"
+        coverMenu.hide()
     }
 
     /*!
     */
     function editAlbum(album) {
         albumEditor.album = album;
-        coverMenu.state = "hidden"
+        coverMenu.hide()
     }
 
     /*!
@@ -144,7 +144,7 @@
         acceptedButtons: Qt.LeftButton | Qt.RightButton
         anchors.fill: parent
         onPressed: {
-            coverMenu.state = "hidden";
+            coverMenu.hide();
             cover.editingDone();
             closeAlbum();
 
@@ -177,7 +177,7 @@
             onPressed: {
                 mouse.accepted = true;
                 if (!isTextEditing) {
-                    coverMenu.flipVisibility();
+                    coverMenu.show();
                 } else {
                     cover.editingDone()
                 }
@@ -185,8 +185,8 @@
 
             onIsTextEditingChanged: {
                 // Hide menu when we start editing text.
-                if (isTextEditing && coverMenu.state !== "hidden")
-                    coverMenu.state = "hidden";
+                if (isTextEditing && coverMenu.visible)
+                    coverMenu.hide();
             }
 
             onAddPhotos: mediaSelector.show();
@@ -196,16 +196,7 @@
     // Cover picker
     AlbumCoverMenu {
         id: coverMenu
-
-        visible: false
-        state: "hidden"
-        popupOriginX: -units.gu(3)
-        popupOriginY: -units.gu(15)
-
-        onActionInvoked: {
-            albumEditor.album.coverNickname = name
-            state = "hidden"
-        }
+        onNewCoverSelected: albumEditor.album.coverNickname = coverName;
     }
 
     MediaSelector {
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Components/AlbumCover.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Components/AlbumCover.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Components/AlbumCover.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Components/AlbumCover.qml	2013-05-31 10:43:02.000000000 +0000
@@ -106,7 +106,7 @@
     /*!
   */
     property variant coverElement: album !== null ?
-                                       coverList.elementForActionName(album.coverNickname) : coverList.getDefault();
+                                       coverList.elementForCoverName(album.coverNickname) : coverList.getDefault();
 
     // Read-only
     property bool isTextEditing: title.isEditing || subtitle.isEditing
@@ -176,6 +176,7 @@
 
         Image {
             id: coverImageFull
+            objectName: "albumCoverImage"
 
             source: coverElement.imageFull
             visible: !isPreview
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/GalleryApplication.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/GalleryApplication.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/GalleryApplication.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/GalleryApplication.qml	2013-05-31 10:43:02.000000000 +0000
@@ -35,6 +35,8 @@
     */
     property bool isPortrait: (height > width)
 
+    property bool automaticOrientation: true
+
     // Big list of form factor-specific values.  'default' is used if the key
     // can't be found under any other form_factor (otherwise, form_factors should
     // match the FORM_FACTOR values passed from main.cpp).  Just add Portrait to
@@ -190,4 +192,8 @@
             }
         }
     }
+
+    Component.onCompleted: {
+        i18n.domain = "gallery-app";
+    }
 }
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/GalleryPhotoViewer.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/GalleryPhotoViewer.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/GalleryPhotoViewer.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/GalleryPhotoViewer.qml	2013-05-31 10:43:02.000000000 +0000
@@ -199,8 +199,7 @@
                 text: i18n.tr("Edit")
                 iconSource: "../img/edit.png"
                 onTriggered: {
-                    editPopover.caller = caller;
-                    editPopover.show();
+                    PopupUtils.open(editPopoverComponent, caller)
                 }
             }
             Action {
@@ -222,9 +221,7 @@
                 text: i18n.tr("Share")
                 iconSource: "../img/share.png"
                 onTriggered: {
-                    sharePopover.picturePath = viewerWrapper.photo.path;
-                    sharePopover.caller = caller;
-                    sharePopover.show();
+                    PopupUtils.open(sharePopoverComponent, caller)
                 }
             }
 
@@ -238,18 +235,25 @@
             }
         }
 
-        SharePopover {
-            id: sharePopover
-            objectName: "sharePopover"
-            visible: false
+        Component {
+            id: sharePopoverComponent
+            SharePopover {
+                id: sharePopover
+                objectName: "sharePopover"
+                visible: false
+                picturePath: viewerWrapper.photo.path
+            }
         }
 
-        EditPopover {
-            id: editPopover
-            objectName: "editPopover"
-            visible: false
-            photo: galleryPhotoViewer.photo
-            cropper: viewerWrapper.cropper
+        Component {
+            id: editPopoverComponent
+            EditPopover {
+                id: editPopover
+                objectName: "editPopover"
+                visible: false
+                photo: galleryPhotoViewer.photo
+                cropper: viewerWrapper.cropper
+            }
         }
 
         Component {
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/LoadingScreen.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/LoadingScreen.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/LoadingScreen.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/LoadingScreen.qml	2013-05-31 10:43:02.000000000 +0000
@@ -33,7 +33,7 @@
 
     Text {
         anchors.centerIn: parent
-        text: i18n.tr("Loading...")
+        text: i18n.tr("Loading…")
         font.pointSize: pointUnits(20)
     }
 }
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/MainScreen.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/MainScreen.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/MainScreen.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/MainScreen.qml	2013-05-31 10:43:02.000000000 +0000
@@ -30,6 +30,8 @@
     objectName: "overview"
 
     anchors.fill: parent
+    applicationName: "gallery-app"
+    automaticOrientation: application.automaticOrientation
 
     Tabs {
         id: tabs
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/MediaSelector.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/MediaSelector.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/MediaSelector.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/MediaSelector.qml	2013-05-31 10:43:02.000000000 +0000
@@ -98,8 +98,8 @@
                 }
             }
         }
-        active: true
-        lock: true
+        opened: true
+        locked: true
     }
 
     PropertyAnimation {
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Utility/AlbumCoverList.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Utility/AlbumCoverList.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Utility/AlbumCoverList.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Utility/AlbumCoverList.qml	2013-05-31 10:43:02.000000000 +0000
@@ -26,10 +26,10 @@
     id: albumCoverList
 
     // Returns an element given the nickname.
-    function elementForActionName(name) {
+    function elementForCoverName(name) {
         // TODO: optimize.
         for (var i = 0; i < albumCoverList.count; i++) {
-            if (albumCoverList.get(i).action === name)
+            if (albumCoverList.get(i).coverName === name)
                 return albumCoverList.get(i);
         }
 
@@ -56,7 +56,7 @@
     // First item in the list must be the default.
     ListElement {
         title: ""
-        action: "default"
+        coverName: "default"
         imageFull: "img/album-cover-default-large.png"
         imagePreview: "img/album-cover-default.png"
         iconFilename: "../../img/album-cover-default-icon.png"
@@ -66,7 +66,7 @@
 
     ListElement {
         title: ""
-        action: "blue"
+        coverName: "blue"
         imageFull: "img/album-cover-blue-large.png"
         imagePreview: "img/album-cover-blue.png"
         iconFilename: "../../img/album-cover-blue-icon.png"
@@ -76,7 +76,7 @@
 
     ListElement {
         title: ""
-        action: "green"
+        coverName: "green"
         imageFull: "img/album-cover-green-large.png"
         imagePreview: "img/album-cover-green.png"
         iconFilename: "../../img/album-cover-green-icon.png"
@@ -86,7 +86,7 @@
 
     ListElement {
         title: ""
-        action: "pattern"
+        coverName: "pattern"
         imageFull: "img/album-cover-pattern-large.png"
         imagePreview: "img/album-cover-pattern.png"
         iconFilename: "../../img/album-cover-pattern-icon.png"
@@ -96,7 +96,7 @@
 
     ListElement {
         title: ""
-        action: "red"
+        coverName: "red"
         imageFull: "img/album-cover-red-large.png"
         imagePreview: "img/album-cover-red.png"
         iconFilename: "../../img/album-cover-red-icon.png"
@@ -115,7 +115,7 @@
             case 2: elem.title = i18n.tr("Green"); break;
             case 3: elem.title = i18n.tr("Pattern"); break;
             case 4: elem.title = i18n.tr("Red"); break;
-            default: elem.title = i18n.tr("");
+            default: elem.title = "";
             }
             albumCoverList.set(i, elem);
         }
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Utility/EditingHUD.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Utility/EditingHUD.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Utility/EditingHUD.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Utility/EditingHUD.qml	2013-05-31 10:43:02.000000000 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import Gallery 1.0
+import Ubuntu.Components 0.1
 import Ubuntu.HUD 1.0 as HUD
 
 /*!
@@ -64,62 +65,62 @@
     HUD.Action {
         id: deleteAction
         label: i18n.tr("Delete")
-        keywords: "Trash;Erase"
+        keywords: i18n.tr("Trash;Erase")
     }
     HUD.Action {
         id: shareAction
         label: i18n.tr("Share")
-        keywords: "Post;Upload;Attach"
+        keywords: i18n.tr("Post;Upload;Attach")
     }
     HUD.Action {
         id: addAction
         label: i18n.tr("Add")
-        keywords: "Add Photo to Album"
+        keywords: i18n.tr("Add Photo to Album")
     }
     HUD.Action {
         id: undoAction
         label: i18n.tr("Undo")
-        keywords: "Cancel Action;Backstep"
+        keywords: i18n.tr("Cancel Action;Backstep")
     }
     HUD.Action {
         id: redoAction
         label: i18n.tr("Redo")
-        keywords: "Reapply;Make Again"
+        keywords: i18n.tr("Reapply;Make Again")
     }
     HUD.Action {
         id: autoEnhanceAction
         label: i18n.tr("Auto Enhance")
-        description: "Adjust the image automatically"
-        keywords: "Automatically Adjust Photo"
+        description: i18n.tr("Adjust the image automatically")
+        keywords: i18n.tr("Automatically Adjust Photo")
         onTriggered: photo.autoEnhance()
     }
     HUD.Action {
         id: rotateAction
         label: i18n.tr("Rotate")
-        keywords: "Turn Clockwise"
-        description: "Rotate the image clockwise"
+        keywords: i18n.tr("Turn Clockwise")
+        description: i18n.tr("Rotate the image clockwise")
         onTriggered: photo.rotateRight()
     }
     HUD.Action {
         id: cropAction
         label: i18n.tr("Crop")
-        keywords: "Trim;Cut"
-        description: "Crop the image"
+        keywords: i18n.tr("Trim;Cut")
+        description: i18n.tr("Crop the image")
         onTriggered: cropper.show(photo)
     }
     HUD.Action {
         id: revertAction
         label: i18n.tr("Revert to Original")
-        keywords: "Discard Changes"
-        description: "Discard all changes"
+        keywords: i18n.tr("Discard Changes")
+        description: i18n.tr("Discard all changes")
     }
     HUD.Action {
         id: exposureAction
         label: i18n.tr("Exposure")
-        description: "Adjust the exposure"
-        keywords: "Underexposed;Overexposed"
+        description: i18n.tr("Adjust the exposure")
+        keywords: i18n.tr("Underexposed;Overexposed")
         hasLivePreview: true
-        commitLabel: "Confirm" // string to show in the confirm button
+        commitLabel: i18n.tr("Confirm") // string to show in the confirm button
 
         HUD.SliderParameter {
             id: compensationParam
@@ -158,10 +159,10 @@
     HUD.Action {
         id: colorBalanceAction
         label: i18n.tr("Color Balance")
-        description: "Adjust color balance"
-        keywords: "Saturation;Hue"
+        description: i18n.tr("Adjust color balance")
+        keywords: i18n.tr("Saturation;Hue")
         hasLivePreview: true
-        commitLabel: "Confirm"
+        commitLabel: i18n.tr("Confirm")
 
         HUD.SliderParameter {
             id: brightnessParam
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Utility/SelectionToolbarAction.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Utility/SelectionToolbarAction.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Utility/SelectionToolbarAction.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Utility/SelectionToolbarAction.qml	2013-05-31 10:43:02.000000000 +0000
@@ -35,8 +35,8 @@
     signal deleteClicked()
 
     // in selection mode, never hide the toolbar:
-    active: true
-    lock: true
+    opened: true
+    locked: true
 
     Action {
         text: i18n.tr("Add")
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Widgets/AlbumCoverMenu.qml gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Widgets/AlbumCoverMenu.qml
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Widgets/AlbumCoverMenu.qml	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Widgets/AlbumCoverMenu.qml	2013-05-31 10:43:02.000000000 +0000
@@ -18,17 +18,37 @@
  */
 
 import QtQuick 2.0
-import "../../Capetown/Widgets"
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
 import "../Utility"
 
 /*!
+  Menu to select the album cover
 */
-PopupMenu {
+Popover {
     id: albumCoverMenu
 
-    model: coverList
+    signal newCoverSelected(string coverName)
 
-    AlbumCoverList {
-        id: coverList
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+
+        Repeater {
+            model: AlbumCoverList {}
+
+            delegate: ListItem.Standard {
+                objectName: "albumCoverMenuItem"
+                text: title
+                icon: Qt.resolvedUrl(iconFilename)
+                onClicked: {
+                    albumCoverMenu.newCoverSelected(coverName);
+                    hide();
+                }
+            }
+        }
     }
 }
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Widgets/img/confirm-check.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Widgets/img/confirm-check.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Widgets/img/icon-camera-active.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Widgets/img/icon-camera-active.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Widgets/img/icon-camera-inactive.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Widgets/img/icon-camera-inactive.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Widgets/img/selection-operations-icon.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Widgets/img/selection-operations-icon.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Widgets/img/viewer-back.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Widgets/img/viewer-back.png differ
Binary files /tmp/jMo0VMp2m6/gallery-app-0.0.67daily13.05.10ubuntu.unity.next/rc/qml/Widgets/img/viewer-forward.png and /tmp/1p96NdkZ2f/gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/rc/qml/Widgets/img/viewer-forward.png differ
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/src/util/sharefile.cpp gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/src/util/sharefile.cpp
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/src/util/sharefile.cpp	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/src/util/sharefile.cpp	2013-05-31 10:43:02.000000000 +0000
@@ -41,14 +41,17 @@
 
 /*!
  * \brief ShareFile::writeShareFile
+ * \param id
  * \param path
  */
-void ShareFile::writeShareFile(const QString &path)
+void ShareFile::writeShareFile(const QString &id, const QString &path)
 {
     QFileInfo imageFilePath(QDir::tempPath() + QDir::separator() + "sharelocation");
     QFile imageFile(imageFilePath.absoluteFilePath());
     if (imageFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
         QTextStream stream(&imageFile);
+        stream << id;
+        stream << "\n";
         stream << path;
         imageFile.close();
     } else {
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/src/util/sharefile.h gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/src/util/sharefile.h
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/src/util/sharefile.h	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/src/util/sharefile.h	2013-05-31 10:43:02.000000000 +0000
@@ -32,7 +32,7 @@
     static void RegisterType();
 
 public Q_SLOTS:
-    void writeShareFile(const QString& path);
+    void writeShareFile(const QString& id, const QString& path);
 };
 
 #endif // SHAREFILE_H
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/emulators/album_editor.py gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/emulators/album_editor.py
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/emulators/album_editor.py	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/emulators/album_editor.py	2013-05-31 10:43:02.000000000 +0000
@@ -44,3 +44,13 @@
         return self.app.select_single("QQuickImage",
                                       objectName="albumCoverAddPhotosImage",
                                       visible=True)
+
+    def get_album_cover_image(self):
+        """Returns the album editor."""
+        return self.app.select_many("QQuickImage",
+                                    objectName="albumCoverImage")[0]
+
+    def get_cover_menu_item(self, idx):
+        """Returns the item of the cover menu with index idx"""
+        return self.app.select_many("Standard", 
+                                    objectName="albumCoverMenuItem")[idx]
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/emulators/album_view.py gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/emulators/album_view.py
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/emulators/album_view.py	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/emulators/album_view.py	2013-05-31 10:43:02.000000000 +0000
@@ -29,7 +29,8 @@
 
     def get_first_photo(self):
         """Returns the first photo in a newly opened album"""
-        return self.app.select_many("FramePortrait")[0]
+        return self.app.select_many("FramePortrait",
+                                      visible=True, isLoaded=True)[0]
 
     def get_album_photo_view(self):
         """Returns the photo view of the album viewer"""
@@ -39,7 +40,7 @@
     def number_of_photos(self):
         """Returns the numer of visible photos"""
         return len(self.app.select_many("FramePortrait",
-                                        isPreview=False, isLoaded=True))
+                                        visible=True, isLoaded=True))
 
     def media_selector_loader(self):
         """Returns the loader for the media selector"""
@@ -48,4 +49,5 @@
 
     def get_plus_icon_empty_album(self):
         """Returns the plus icon visible in empty albums"""
-        return self.app.select_many("QQuickImage", objectName="addButton")[0]
+        return self.app.select_single("QQuickImage",
+                                      objectName="addButton", visible=True)
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/tests/__init__.py gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/tests/__init__.py
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/tests/__init__.py	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/tests/__init__.py	2013-05-31 10:43:02.000000000 +0000
@@ -100,17 +100,25 @@
         """ Gives the program the time to update the UI"""
         sleep(0.1)
 
-    def click_item(self, item):
+    def click_item(self, item, delay=0.1):
         """Does a mouse click on the passed item, and moved the mouse there
            before"""
+        #In jenkins test may fail because we don't wait before clicking the target
+        #so we add a little delay before click.
+        if model() == 'Desktop' and delay <= 0.25:
+            delay = 0.25
+
         self.pointing_device.move_to_object(item)
+        sleep(delay)
         self.pointing_device.click()
 
     def tap_item(self, item):
         """Does a long mouse press on the passed item, and moved the mouse
            there before"""
         self.pointing_device.move_to_object(item)
-        self.pointing_device.click(1, self.tap_press_time)
+        self.pointing_device.press()
+        sleep(1)
+        self.pointing_device.release()
 
     def reveal_toolbar(self):
         toolbar = self.gallery_utils.get_toolbar()
@@ -147,7 +155,7 @@
         # earlier. Even though the tab item is not fully visible, hence the tab
         # does not activate.
         self.assertThat(albums_tab_button.opacity,
-                        Eventually(GreaterThan(0.2)))
+                        Eventually(GreaterThan(0.35)))
         self.click_item(albums_tab_button)
 
         albums_loader = self.gallery_utils.get_albums_viewer_loader()
@@ -173,3 +181,7 @@
         self.assertThat(view.visible, Eventually(Equals(True)))
         self.assertThat(animated_view.animationRunning,
                         Eventually(Equals(False)))
+
+    def ensure_edit_dialog_visible(self):
+        edit_dialog = self.photo_viewer.get_photo_edit_dialog()
+        self.assertThat(edit_dialog.opacity, (Eventually(Equals(1))))
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_album_editor.py gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_album_editor.py
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_album_editor.py	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_album_editor.py	2013-05-31 10:43:02.000000000 +0000
@@ -18,6 +18,8 @@
 from gallery_app.emulators.media_selector import MediaSelector
 from gallery_app.tests import GalleryTestCase
 
+from time import sleep
+
 
 class TestAlbumEditor(GalleryTestCase):
     """Tests the album editor of the gallery app"""
@@ -84,10 +86,10 @@
         subtitle_field = self.album_editor.get_album_subtitle_entry_field()
 
         text = "My Photo Album"
-        self.assertThat(title_field.text, Equals(text))
+        self.assertThat(title_field.text, Eventually(Equals(text)))
 
         text = "Ubuntu"
-        self.assertThat(subtitle_field.text, Equals(text))
+        self.assertThat(subtitle_field.text, Eventually(Equals(text)))
 
         self.click_title_field()
         self.keyboard.press_and_release("Ctrl+a")
@@ -101,14 +103,14 @@
         #due to some reason the album title is not updated unless it loses the
         #focus. So we click on the subtitle field.
         self.click_subtitle_field()
-        self.assertThat(title_field.text, Equals(text))
+        self.assertThat(title_field.text, Eventually(Equals(text)))
 
         self.keyboard.press_and_release("Ctrl+a")
         self.keyboard.press_and_release("U")
         self.keyboard.press_and_release("1")
         text = "U1"
         self.click_title_field()
-        self.assertThat(subtitle_field.text, Equals(text))
+        self.assertThat(subtitle_field.text, Eventually(Equals(text)))
 
     def test_add_photo(self):
         """Tests adding a photo using the media selector"""
@@ -144,3 +146,20 @@
         self.open_first_album()
         num_photos = self.album_view.number_of_photos()
         self.assertThat(num_photos, Equals(num_photos_start + 1))
+
+    def test_cover_image(self):
+        """Test to change the album cover image"""
+        cover_image = self.album_editor.get_album_cover_image()
+        self.assertThat(cover_image.source.endswith("album-cover-default-large.png"),
+                        Equals(True))
+
+        # click somewhere rather at the bottom of the cover
+        x, y, w, h = cover_image.globalRect
+        self.pointing_device.move(x + int(w/2), y + h - int(h/10) )
+        self.pointing_device.click()
+
+        green_item = self.album_editor.get_cover_menu_item(2)
+        self.click_item(green_item)
+
+        self.assertThat(cover_image.source.endswith("album-cover-green-large.png"),
+                        Equals(True))
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_album_view.py gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_album_view.py
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_album_view.py	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_album_view.py	2013-05-31 10:43:02.000000000 +0000
@@ -18,6 +18,8 @@
 from gallery_app.emulators.media_selector import MediaSelector
 from gallery_app.tests import GalleryTestCase
 
+from time import sleep
+
 
 class TestAlbumView(GalleryTestCase):
     """Tests the album view of the gallery app"""
@@ -83,8 +85,8 @@
         add_button = self.media_selector.get_toolbar_add_button()
         self.click_item(add_button)
 
-        num_photos = self.album_view.number_of_photos()
-        self.assertThat(num_photos, Equals(num_photos_start + 1))
+        self.assertThat(lambda: self.album_view.number_of_photos(),
+            Eventually(Equals(num_photos_start + 1)))
 
     def test_add_photo_to_new_album(self):
         self.reveal_toolbar()
@@ -103,7 +105,7 @@
         photo = self.media_selector.get_second_photo()
         self.click_item(photo)
         add_button = self.media_selector.get_toolbar_add_button()
-        self.click_item(add_button)
+        self.click_item(add_button, delay=0.5)
 
-        num_photos = self.album_view.number_of_photos()
-        self.assertThat(num_photos, Equals(num_photos_start + 1))
+        self.assertThat(lambda: self.album_view.number_of_photos(),
+            Eventually(Equals(num_photos_start + 1)))
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_photo_viewer.py gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_photo_viewer.py
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_photo_viewer.py	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_photo_viewer.py	2013-05-31 10:43:02.000000000 +0000
@@ -102,21 +102,19 @@
     def test_nav_bar_share_button(self):
         """Clicking the share button must show the share dialog."""
         share_button = self.photo_viewer.get_toolbar_share_button()
-        share_menu = self.photo_viewer.get_share_dialog()
 
-        self.pointing_device.move_to_object(share_button)
-        self.pointing_device.click()
+        self.click_item(share_button)
 
+        share_menu = self.photo_viewer.get_share_dialog()
         self.assertThat(share_menu.visible, Eventually(Equals(True)))
 
     def test_nav_bar_edit_button(self):
         """Clicking the edit button must show the edit dialog."""
         edit_button = self.photo_viewer.get_toolbar_edit_button()
-        edit_dialog = self.photo_viewer.get_photo_edit_dialog()
 
-        self.pointing_device.move_to_object(edit_button)
-        self.pointing_device.click()
+        self.click_item(edit_button)
 
+        edit_dialog = self.photo_viewer.get_photo_edit_dialog()
         self.assertThat(edit_dialog.visible, Eventually(Equals(True)))
 
     def test_double_click_zoom(self):
@@ -140,6 +138,7 @@
     def setUp(self):
         super(TestPhotoEditor, self).setUp()
         self.click_edit_button()
+        self.ensure_edit_dialog_visible()
 
     def click_edit_button(self):
         edit_button = self.photo_viewer.get_toolbar_edit_button()
@@ -273,12 +272,16 @@
         self.click_edit_button()
         self.click_undo_item()
 
+        self.reveal_toolbar()
+        self.click_edit_button()
+        undo_item = self.photo_viewer.get_undo_menu_item()
+        redo_item = self.photo_viewer.get_redo_menu_item()
+        revert_item = self.photo_viewer.get_revert_menu_item()
+
         self.assertThat(undo_item.enabled, Eventually(Equals(False)))
         self.assertThat(redo_item.enabled, Eventually(Equals(True)))
         self.assertThat(revert_item.enabled, Eventually(Equals(False)))
 
-        self.reveal_toolbar()
-        self.click_edit_button()
         self.click_redo_item()
 
         self.assertThat(undo_item.enabled, Eventually(Equals(True)))
@@ -289,6 +292,12 @@
         self.click_edit_button()
         self.click_revert_item()
 
+        self.reveal_toolbar()
+        self.click_edit_button()
+        undo_item = self.photo_viewer.get_undo_menu_item()
+        redo_item = self.photo_viewer.get_redo_menu_item()
+        revert_item = self.photo_viewer.get_revert_menu_item()
+
         self.assertThat(undo_item.enabled, Eventually(Equals(True)))
         self.assertThat(redo_item.enabled, Eventually(Equals(False)))
         self.assertThat(revert_item.enabled, Eventually(Equals(False)))
diff -Nru gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_photos_view.py gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_photos_view.py
--- gallery-app-0.0.67daily13.05.10ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_photos_view.py	2013-05-10 05:00:44.000000000 +0000
+++ gallery-app-0.0.67daily13.05.31.1ubuntu.unity.next/tests/autopilot/gallery_app/tests/test_photos_view.py	2013-05-31 10:43:02.000000000 +0000
@@ -88,7 +88,7 @@
         self.click_delete_action()
 
         delete_dialog = self.photos_view.get_delete_dialog()
-        self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
+        self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
 
         cancel_item = self.photos_view.get_delete_dialog_cancel_button()
         self.click_item(cancel_item)
@@ -102,7 +102,7 @@
         self.click_delete_action()
 
         delete_dialog = self.photos_view.get_delete_dialog()
-        self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
+        self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
 
         delete_item = self.photos_view.get_delete_dialog_delete_button()
         self.click_item(delete_item)