Stefano Verzegnassi has proposed merging lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-update-emptystate-string-sdcard into lp:ubuntu-docviewer-app/reboot.
Commit message: Updated empty state strings in DocumentsPage Requested reviews: Ubuntu Document Viewer Developers (ubuntu-docviewer-dev) For more details, see: https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/reboot-update-emptystate-string-sdcard/+merge/270564 Updated empty state strings in DocumentsPage -- Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-update-emptystate-string-sdcard into lp:ubuntu-docviewer-app/reboot.
=== modified file 'po/com.ubuntu.docviewer.pot' --- po/com.ubuntu.docviewer.pot 2015-08-04 16:01:37 +0000 +++ po/com.ubuntu.docviewer.pot 2015-09-09 17:07:39 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-12 21:23+0200\n" +"POT-Creation-Date: 2015-09-09 19:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -33,7 +33,7 @@ msgstr "" #: ../src/app/docviewer-application.cpp:171 -#: /home/stefano/Progetti/docviewer/Libreoffice/build-lo-tiled-rendering-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 +#: /tmp/build-reboot-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1 msgid "Document Viewer" msgstr "" @@ -149,32 +149,33 @@ msgid "%1 byte" msgstr "" -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:28 +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 msgid "Delete file" msgstr "" -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:29 +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:37 #, qt-format msgid "Delete %1 file" msgid_plural "Delete %1 files" msgstr[0] "" msgstr[1] "" -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:30 -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:31 +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:38 +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:39 msgid "Are you sure you want to permanently delete this file?" msgid_plural "Are you sure you want to permanently delete these files?" msgstr[0] "" msgstr[1] "" -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:36 +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:44 #: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:27 #: ../src/app/qml/loView/LOViewGotoDialog.qml:52 #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:52 msgid "Cancel" msgstr "" -#: ../src/app/qml/documentPage/DeleteFileDialog.qml:41 +#: ../src/app/qml/documentPage/DeleteFileDialog.qml:49 +#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:82 msgid "Delete" msgstr "" @@ -183,55 +184,43 @@ msgid "No document found" msgstr "" -#: ../src/app/qml/documentPage/DocumentEmptyState.qml:28 +#: ../src/app/qml/documentPage/DocumentEmptyState.qml:25 msgid "" "Connect your device to any computer and simply drag files to the Documents " -"folder." +"folder or insert removable media with documents." msgstr "" #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:35 +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:32 +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:37 #, qt-format msgid "Today, %1" msgstr "" #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:40 +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:37 +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 #, qt-format msgid "Yesterday, %1" msgstr "" #. TRANSLATORS: this is a datetime formatting string, #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:45 +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:42 #: ../src/app/qml/documentPage/DocumentListDelegate.qml:58 msgid "dddd, hh:mm" msgstr "" #. TRANSLATORS: this is a datetime formatting string, #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. -#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:49 +#: ../src/app/qml/documentPage/DocumentGridDelegate.qml:46 #: ../src/app/qml/documentPage/DocumentListDelegate.qml:47 #: ../src/app/qml/documentPage/DocumentListDelegate.qml:63 msgid "dd-MM-yyyy hh:mm" msgstr "" -#. TRANSLATORS: this is a datetime formatting string, and the -#. singlequote is an escape character. -#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:36 -msgid "'Today', hh:mm" -msgstr "" - -#. TRANSLATORS: this is a datetime formatting string, and the -#. singlequote is an escape character. -#. See http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:42 -msgid "'Yesterday', hh:mm" -msgstr "" - #: ../src/app/qml/documentPage/DocumentListView.qml:157 msgid "Today" msgstr "" @@ -414,6 +403,6 @@ msgid "Open" msgstr "" -#: /home/stefano/Progetti/docviewer/Libreoffice/build-lo-tiled-rendering-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 +#: /tmp/build-reboot-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2 msgid "documents;viewer;pdf;reader;" msgstr "" === modified file 'src/app/qml/documentPage/DocumentEmptyState.qml' --- src/app/qml/documentPage/DocumentEmptyState.qml 2015-02-26 20:16:32 +0000 +++ src/app/qml/documentPage/DocumentEmptyState.qml 2015-09-09 17:07:39 +0000 @@ -22,10 +22,7 @@ EmptyState { title: i18n.tr("No document found") - - // TODO: Add "or insert removable media with documents." to subTitle when - // the support for SD card will be implemented. - subTitle: i18n.tr("Connect your device to any computer and simply drag files to the Documents folder.") + subTitle: i18n.tr("Connect your device to any computer and simply drag files to the Documents folder or insert removable media with documents.") iconName: "edit-copy" anchors.centerIn: parent
-- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
