[Merge] lp:~phablet-team/gallery-app/gallery-app-desktop-translations into lp:gallery-app

David Planella david.planella at ubuntu.com
Wed Jun 11 17:45:51 UTC 2014 

Review: Approve

Looks good to me, although I've added an inline comment about a possible improvement.

I've not been able to test the actual build, as building the app in a chroot seems to fail for me: http://pastebin.ubuntu.com/7629407/

Diff comments:

> === modified file '.bzrignore'
> --- .bzrignore	2013-06-18 07:56:00 +0000
> +++ .bzrignore	2014-06-11 17:40:40 +0000
> @@ -1,6 +1,8 @@
>  /CMakeLists.txt.user
>  /gallery-app.qmlproject.user
>  /desktop/gallery-app.desktop
> +/desktop/gallery-app.desktop.in
> +/desktop/gallery-app.desktop.in.in.h
>  /src/config.h
>  /src/gallery-app
>  /tests/unittests/command-line-parser/command-line-parser
> 
> === modified file 'CMakeLists.txt'
> --- CMakeLists.txt	2014-05-06 18:52:41 +0000
> +++ CMakeLists.txt	2014-06-11 17:40:40 +0000
> @@ -2,6 +2,9 @@
>  cmake_minimum_required(VERSION 2.8.9)
>  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
>  
> +find_program(INTLTOOL_MERGE intltool-merge)
> +find_program(INTLTOOL_EXTRACT intltool-extract)
> +
>  # Find includes in corresponding build directories
>  set(CMAKE_INCLUDE_CURRENT_DIR ON)
>  
> @@ -74,8 +77,10 @@
>  
>  file(GLOB_RECURSE I18N_SRC_FILES
>       RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}

I'd make it RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po - not a big deal, but traditionally the entries for the location of the source file that are added in the final .pot file are always relative to the po/ folder

> -     rc/**.qml desktop/**.desktop.in)
> +     rc/**.qml)
> +list(APPEND I18N_SRC_FILES desktop/${DESKTOP_FILE}.in.in)
>  list(SORT I18N_SRC_FILES)
> +message("Found ${I18N_SRC_FILES}")
>  
>  # Tests
>  enable_testing()
> 
> === modified file 'desktop/CMakeLists.txt'
> --- desktop/CMakeLists.txt	2014-01-11 22:06:28 +0000
> +++ desktop/CMakeLists.txt	2014-06-11 17:40:40 +0000
> @@ -10,13 +10,11 @@
>  	set(ICON "${GALLERY}")
>  endif(CLICK_MODE)
>  
> -file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
> -file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
> -foreach(LINE ${DESKTOP_FILE_CONTENTS})
> -    string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
> -    string(CONFIGURE "${LINE}" LINE)
> -    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
> -endforeach(LINE)
> +configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
> +add_custom_target(${DESKTOP_FILE} ALL
> +         COMMENT "Merging translations into ${DESKTOP_FILE}"
> +         COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
> +        )
>  
>  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
>          DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
> 
> === renamed file 'desktop/gallery-app.desktop.in' => 'desktop/gallery-app.desktop.in.in'
> --- desktop/gallery-app.desktop.in	2014-02-20 17:53:20 +0000
> +++ desktop/gallery-app.desktop.in.in	2014-06-11 17:40:40 +0000
> @@ -1,9 +1,10 @@
>  [Desktop Entry]
>  Version=1.0
> -Name=tr("Gallery")
> -GenericName=tr("Ubuntu Photo Viewer")
> -X-GNOME-Fullname=tr("Ubuntu Photo Viewer")
> -Comment=tr("Browse your photographs")
> +_Name=Gallery
> +_Comment=Browse your photographs
> +_Keywords=photos;photographs;pictures;images
> +_GenericName=Ubuntu Photo Viewer
> +_X-GNOME-Fullname=Ubuntu Photo Viewer
>  Exec=@APP_EXEC@ %u
>  Icon=@ICON@
>  StartupNotify=true
> @@ -13,5 +14,4 @@
>  Categories=Graphics;Photography;RasterGraphics;Viewer;
>  X-Ayatana-Appmenu-Show-Stubs=false
>  X-Ubuntu-Touch=true
> -X-Ubuntu-Gettext-Domain=@GETTEXT_PACKAGE@
>  X-Ubuntu-Single-Instance=true
> 
> === modified file 'po/CMakeLists.txt'
> --- po/CMakeLists.txt	2014-05-09 19:52:57 +0000
> +++ po/CMakeLists.txt	2014-06-11 17:40:40 +0000
> @@ -7,7 +7,11 @@
>  set(POT_FILE ${DOMAIN}.pot)
>  file(GLOB PO_FILES *.po)
>  
> -add_custom_target(${POT_FILE}
> +add_custom_target(${POT_FILE} ALL
> +                  COMMENT "Generating translation template"
> +                  COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
> +                          --srcdir=${CMAKE_SOURCE_DIR} desktop/${DESKTOP_FILE}.in.in
> +
>                    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${CMAKE_SOURCE_DIR}/po/${POT_FILE}
>                            -D ${CMAKE_SOURCE_DIR}
>                            --from-code=UTF-8
> 
> === modified file 'po/gallery-app.pot'
> --- po/gallery-app.pot	2014-05-09 19:52:57 +0000
> +++ po/gallery-app.pot	2014-06-11 17:40:40 +0000
> @@ -8,7 +8,7 @@
>  msgstr ""
>  "Project-Id-Version: gallery-app\n"
>  "Report-Msgid-Bugs-To: \n"
> -"POT-Creation-Date: 2014-05-09 16:45-0300\n"
> +"POT-Creation-Date: 2014-06-11 19:38+0200\n"
>  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
>  "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
>  "Language-Team: LANGUAGE <LL at li.org>\n"
> @@ -17,33 +17,21 @@
>  "Content-Type: text/plain; charset=UTF-8\n"
>  "Content-Transfer-Encoding: 8bit\n"
>  
> -#: desktop/gallery-app.desktop.in:3 rc/qml/MediaViewer/PopupPhotoViewer.qml:65
> -msgid "Gallery"
> -msgstr ""
> -
> -#: desktop/gallery-app.desktop.in:4 desktop/gallery-app.desktop.in:5
> -msgid "Ubuntu Photo Viewer"
> -msgstr ""
> -
> -#: desktop/gallery-app.desktop.in:6
> -msgid "Browse your photographs"
> -msgstr ""
> -
>  #: rc/qml/AlbumEditor/AlbumEditMenu.qml:43
>  msgid "Edit album"
>  msgstr ""
>  
>  #: rc/qml/AlbumEditor/AlbumEditMenu.qml:50
> -#: rc/qml/AlbumViewer/AlbumViewer.qml:439
> +#: rc/qml/AlbumViewer/AlbumViewer.qml:380
>  #: rc/qml/MediaViewer/MediaViewer.qml:488
>  #: rc/qml/MediaViewer/MediaViewer.qml:494
> -#: rc/qml/MediaViewer/MediaViewer.qml:548 rc/qml/Utility/EditingHUD.qml:67
> +#: rc/qml/MediaViewer/MediaViewer.qml:547 rc/qml/Utility/EditingHUD.qml:67
>  #: rc/qml/Utility/SelectionToolbarAction.qml:51
>  msgid "Delete"
>  msgstr ""
>  
>  #: rc/qml/AlbumEditor/AlbumEditor.qml:40
> -#: rc/qml/Components/MediaSelector.qml:90 rc/qml/PickerScreen.qml:114
> +#: rc/qml/Components/MediaSelector.qml:93 rc/qml/PickerScreen.qml:114
>  #: rc/qml/Utility/SelectionToolbarAction.qml:66
>  msgid "Cancel"
>  msgstr ""
> @@ -68,32 +56,32 @@
>  msgid "Red"
>  msgstr ""
>  
> -#: rc/qml/AlbumViewer/AlbumViewer.qml:84
> +#: rc/qml/AlbumViewer/AlbumViewer.qml:116
>  msgid "Album"
>  msgstr ""
>  
> -#: rc/qml/AlbumViewer/AlbumViewer.qml:428
> +#: rc/qml/AlbumViewer/AlbumViewer.qml:369
>  msgid "Add to album"
>  msgstr ""
>  
> -#: rc/qml/AlbumViewer/AlbumViewer.qml:434
> +#: rc/qml/AlbumViewer/AlbumViewer.qml:375
>  #: rc/qml/MediaViewer/MediaViewer.qml:483
> -#: rc/qml/MediaViewer/MediaViewer.qml:538 rc/qml/Utility/EditingHUD.qml:77
> +#: rc/qml/MediaViewer/MediaViewer.qml:537 rc/qml/Utility/EditingHUD.qml:77
>  #: rc/qml/Utility/SelectionToolbarAction.qml:44
>  msgid "Add"
>  msgstr ""
>  
> -#: rc/qml/AlbumViewer/AlbumViewer.qml:448
> -#: rc/qml/MediaViewer/MediaViewer.qml:512
> -#: rc/qml/MediaViewer/MediaViewer.qml:567
> +#: rc/qml/AlbumViewer/AlbumViewer.qml:389
> +#: rc/qml/MediaViewer/MediaViewer.qml:511
> +#: rc/qml/MediaViewer/MediaViewer.qml:566
>  msgid "Back"
>  msgstr ""
>  
> -#: rc/qml/AlbumsOverview.qml:186 rc/qml/Components/PopupAlbumPicker.qml:91
> +#: rc/qml/AlbumsOverview.qml:226 rc/qml/Components/PopupAlbumPicker.qml:91
>  msgid "Add new album"
>  msgstr ""
>  
> -#: rc/qml/AlbumsOverview.qml:204 rc/qml/Utility/PhotosToolbarActions.qml:46
> +#: rc/qml/AlbumsOverview.qml:244 rc/qml/Utility/PhotosToolbarActions.qml:46
>  msgid "Camera"
>  msgstr ""
>  
> @@ -115,8 +103,8 @@
>  msgid "Delete album + contents"
>  msgstr ""
>  
> -#: rc/qml/Components/MediaSelector.qml:56
> -#: rc/qml/Components/MediaSelector.qml:78
> +#: rc/qml/Components/MediaSelector.qml:59
> +#: rc/qml/Components/MediaSelector.qml:80
>  msgid "Add to Album"
>  msgstr ""
>  
> @@ -128,21 +116,21 @@
>  msgid "Loading…"
>  msgstr ""
>  
> -#: rc/qml/MainScreen.qml:80
> +#: rc/qml/MainScreen.qml:96
>  msgid "Albums"
>  msgstr ""
>  
> -#: rc/qml/MainScreen.qml:97 rc/qml/MainScreen.qml:120
> +#: rc/qml/MainScreen.qml:113 rc/qml/MainScreen.qml:136
>  #: rc/qml/PickerScreen.qml:54
>  msgid "Events"
>  msgstr ""
>  
> -#: rc/qml/MainScreen.qml:118 rc/qml/MainScreen.qml:162
> +#: rc/qml/MainScreen.qml:134 rc/qml/MainScreen.qml:178
>  #: rc/qml/Utility/PhotosToolbarActions.qml:33
>  msgid "Select"
>  msgstr ""
>  
> -#: rc/qml/MainScreen.qml:130 rc/qml/MainScreen.qml:164
> +#: rc/qml/MainScreen.qml:146 rc/qml/MainScreen.qml:180
>  #: rc/qml/PickerScreen.qml:74
>  msgid "Photos"
>  msgstr ""
> @@ -193,19 +181,23 @@
>  msgstr ""
>  
>  #: rc/qml/MediaViewer/MediaViewer.qml:507
> -#: rc/qml/MediaViewer/MediaViewer.qml:558 rc/qml/Utility/EditingHUD.qml:72
> +#: rc/qml/MediaViewer/MediaViewer.qml:557 rc/qml/Utility/EditingHUD.qml:72
>  #: rc/qml/Utility/SelectionToolbarAction.qml:58
>  msgid "Share"
>  msgstr ""
>  
> -#: rc/qml/MediaViewer/MediaViewer.qml:525
> +#: rc/qml/MediaViewer/MediaViewer.qml:524
>  msgid "Pause"
>  msgstr ""
>  
> -#: rc/qml/MediaViewer/MediaViewer.qml:525
> +#: rc/qml/MediaViewer/MediaViewer.qml:524
>  msgid "Play"
>  msgstr ""
>  
> +#: rc/qml/MediaViewer/PopupPhotoViewer.qml:56
> +msgid "Gallery"
> +msgstr ""
> +
>  #: rc/qml/PhotosOverview.qml:74
>  msgid "Delete photos"
>  msgstr ""
> 


-- 
https://code.launchpad.net/~phablet-team/gallery-app/gallery-app-desktop-translations/+merge/222847
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~phablet-team/gallery-app/gallery-app-desktop-translations into lp:gallery-app.

More information about the Ubuntu-reviews mailing list