From 5be7de14ba857dd67ed711b62f1a2fa2cff3bce3 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Fri, 7 Oct 2016 18:47:27 +0300 Subject: [PATCH] [app] Prefixed all string ids with harbour-books- --- app/qml/BooksBookView.qml | 12 +++--- app/qml/BooksImport.qml | 16 +++++--- app/qml/BooksMain.qml | 4 +- app/qml/BooksShelfFooter.qml | 2 +- app/qml/BooksShelfTitle.qml | 3 +- app/qml/BooksShelfView.qml | 2 +- app/qml/BooksStorageHeader.qml | 11 ++++-- app/qml/BooksStorageLeftSwipeHint.qml | 2 +- app/qml/BooksStorageView.qml | 6 +-- app/settings/BooksSettings.qml | 6 +-- app/src/ZLibrary.cpp | 2 +- app/translations/harbour-books-de.ts | 53 +++++++++++++++------------ app/translations/harbour-books-fi.ts | 53 +++++++++++++++------------ app/translations/harbour-books-ru.ts | 53 +++++++++++++++------------ app/translations/harbour-books-sv.ts | 53 +++++++++++++++------------ app/translations/harbour-books.ts | 53 +++++++++++++++------------ 16 files changed, 187 insertions(+), 144 deletions(-) diff --git a/app/qml/BooksBookView.qml b/app/qml/BooksBookView.qml index d899461..d12d144 100644 --- a/app/qml/BooksBookView.qml +++ b/app/qml/BooksBookView.qml @@ -53,19 +53,19 @@ SilicaFlickable { // NOTE: These have to match ResetReason in BooksBookModel readonly property var _loadingTextLabel: [ //% "Formatting..." - qsTrId("book-view-formatting"), + qsTrId("harbour-books-book-view-formatting"), //% "Loading..." - qsTrId("book-view-loading"), + qsTrId("harbour-books-book-view-loading"), //% "Applying larger fonts..." - qsTrId("book-view-applying-larger-fonts"), + qsTrId("harbour-books-book-view-applying_larger_fonts"), //% "Applying smaller fonts..." - qsTrId("book-view-applying-smaller-fonts") + qsTrId("harbour-books-book-view-applying_smaller_fonts") ] PullDownMenu { MenuItem { //% "Back to library" - text: qsTrId("book-view-back") + text: qsTrId("harbour-books-book-view-back") onClicked: root.closeBook() } } @@ -221,7 +221,7 @@ SilicaFlickable { Button { //% "Cancel" - text: qsTrId("book-view-cancel-loading") + text: qsTrId("harbour-books-book-view-cancel_loading") height: Theme.itemSizeLarge anchors { bottom: parent.bottom diff --git a/app/qml/BooksImport.qml b/app/qml/BooksImport.qml index 2c430ad..25b5b25 100644 --- a/app/qml/BooksImport.qml +++ b/app/qml/BooksImport.qml @@ -1,5 +1,5 @@ /* - Copyright (C) 2015 Jolla Ltd. + Copyright (C) 2015-2016 Jolla Ltd. Contact: Slava Monich You may use this file under the terms of BSD license as follows: @@ -56,10 +56,13 @@ Dialog { id: dialogHeader spacing: 0 acceptText: ((_loading || !importModel.count) && !importModel.selectedCount) ? "" : - //% "Import %0 book(s)" - importModel.selectedCount ? qsTrId("import-view-import-n-books",importModel.selectedCount).arg(importModel.selectedCount) : - //% "Select books" - qsTrId("import-view-select-books") + importModel.selectedCount ? + //: Dialog header button + //% "Import %0 book(s)" + qsTrId("harbour-books-import-page-import_n_books",importModel.selectedCount).arg(importModel.selectedCount) : + //: Dialog header button + //% "Select books" + qsTrId("harbour-books-import-page-select_books") } SilicaListView { @@ -88,8 +91,9 @@ Dialog { } ViewPlaceholder { + //: Import page placeholder //% "No new books found" - text: qsTrId("import-view-no-new-books-found") + text: qsTrId("harbour-books-import-page-no_new_books_found") enabled: !_loading && !importModel.count } } diff --git a/app/qml/BooksMain.qml b/app/qml/BooksMain.qml index 94da454..7544ccf 100644 --- a/app/qml/BooksMain.qml +++ b/app/qml/BooksMain.qml @@ -1,5 +1,5 @@ /* - Copyright (C) 2015 Jolla Ltd. + Copyright (C) 2015-2016 Jolla Ltd. Contact: Slava Monich You may use this file under the terms of BSD license as follows: @@ -38,7 +38,7 @@ ApplicationWindow { allowedOrientations: Orientation.All //% "Books" - readonly property string title: qsTrId("books-app-name") + readonly property string title: qsTrId("harbour-books-app-name") property variant currentShelf: mainPage.currentShelf diff --git a/app/qml/BooksShelfFooter.qml b/app/qml/BooksShelfFooter.qml index 548a8a4..6d37c15 100644 --- a/app/qml/BooksShelfFooter.qml +++ b/app/qml/BooksShelfFooter.qml @@ -46,7 +46,7 @@ Item { id: noBooks //% "No books" - text: qsTrId("shelf-view-no-books") + text: qsTrId("harbour-books-shelf-view-no_books") visible: footerState == 2 && !editMode anchors.centerIn: parent width: parent.width - 2*Theme.horizontalPageMargin diff --git a/app/qml/BooksShelfTitle.qml b/app/qml/BooksShelfTitle.qml index 15371c9..781f8ff 100644 --- a/app/qml/BooksShelfTitle.qml +++ b/app/qml/BooksShelfTitle.qml @@ -113,8 +113,9 @@ MouseArea { visible: opacity > 0 opacity: editable ? 1 : 0 Behavior on opacity { FadeAnimation {} } + //: Placeholder for the bookshelf title //% "Enter folder name" - placeholderText: qsTrId("shelf-title-placeholder") + placeholderText: qsTrId("harbour-books-shelf-title-placeholder") EnterKey.enabled: text.length > 0 && text !== "." && text !== ".." && text.indexOf("/") < 0 EnterKey.onClicked: { if (editable) { diff --git a/app/qml/BooksShelfView.qml b/app/qml/BooksShelfView.qml index da8c964..463087a 100644 --- a/app/qml/BooksShelfView.qml +++ b/app/qml/BooksShelfView.qml @@ -116,7 +116,7 @@ Item { if (!_remorse) _remorse = remorseComponent.createObject(shelfView) fadeAnimation.restart() //% "Deleting all books" - _remorse.execute(qsTrId("shelf-view-about-to-delete-all"), + _remorse.execute(qsTrId("harbour-books-shelf-view-about_to_delete_all"), doDeleteAll, _remorseTimeout) } else if (_remorse) { fadeAnimation.stop() diff --git a/app/qml/BooksStorageHeader.qml b/app/qml/BooksStorageHeader.qml index 1805263..f716d43 100644 --- a/app/qml/BooksStorageHeader.qml +++ b/app/qml/BooksStorageHeader.qml @@ -1,5 +1,5 @@ /* - Copyright (C) 2015 Jolla Ltd. + Copyright (C) 2015-2016 Jolla Ltd. Contact: Slava Monich You may use this file under the terms of BSD license as follows: @@ -94,10 +94,12 @@ Column { } color: (root.enabled && !mouseArea.pressed) ? Theme.primaryColor : Theme.highlightColor text: removable ? + //: Header label for the memory card //% "Memory card" - qsTrId("storage-removable") : + qsTrId("harbour-books-storage-removable") : + //: Header label for the internal storage //% "Internal storage" - qsTrId("storage-internal") + qsTrId("harbour-books-storage-internal") MouseArea { id: mouseArea @@ -122,8 +124,9 @@ Column { right: parent.right rightMargin: Theme.paddingMedium } + //: Number of books in the storage header //% "%0 book(s)" - text: qsTrId("storage-book-count",_shownCount).arg(_shownCount) + text: qsTrId("harbour-books-storage-book_count",_shownCount).arg(_shownCount) font.pixelSize: Theme.fontSizeExtraSmall color: Theme.highlightColor opacity: (showCount && count > 0) ? 1 : 0 diff --git a/app/qml/BooksStorageLeftSwipeHint.qml b/app/qml/BooksStorageLeftSwipeHint.qml index f0fb876..96fd8e3 100644 --- a/app/qml/BooksStorageLeftSwipeHint.qml +++ b/app/qml/BooksStorageLeftSwipeHint.qml @@ -26,7 +26,7 @@ Loader { Component.onCompleted: if (root.hintEnabled) showHint(); InteractionHintLabel { //% "Swipe left to see what's on the SD-card" - text: qsTrId("storage-view-swipe-left-hint") + text: qsTrId("harbour-books-storage-view-swipe_left_hint") anchors.bottom: parent.bottom opacity: touchInteractionHint.running ? 1.0 : 0.0 Behavior on opacity { FadeAnimation { duration: 1000 } } diff --git a/app/qml/BooksStorageView.qml b/app/qml/BooksStorageView.qml index 54be731..4820d9b 100644 --- a/app/qml/BooksStorageView.qml +++ b/app/qml/BooksStorageView.qml @@ -93,7 +93,7 @@ SilicaFlickable { MenuItem { //: Pulley menu item //% "Settings" - text: qsTrId("storage-view-settings") + text: qsTrId("harbour-books-storage-menu-settings") visible: !editMode && BooksSettingsMenu onClicked: { if (!_settingsComponent) { @@ -110,14 +110,14 @@ SilicaFlickable { MenuItem { //: Pulley menu item //% "Scan downloads" - text: qsTrId("storage-view-scan-downloads") + text: qsTrId("harbour-books-storage-menu-scan_downloads") visible: !editMode onClicked: pageStack.push(importComponent) } MenuItem { //: Pulley menu item //% "Delete all books" - text: qsTrId("storage-view-delete-everything") + text: qsTrId("harbour-books-storage-menu-delete_everything") visible: editMode enabled: currentShelf && (currentShelf.count > 0) onClicked: storageModel.setDeleteAllRequest(storageListWatcher.currentIndex, true) diff --git a/app/settings/BooksSettings.qml b/app/settings/BooksSettings.qml index a806188..b62543d 100644 --- a/app/settings/BooksSettings.qml +++ b/app/settings/BooksSettings.qml @@ -62,7 +62,7 @@ Page { id: pageHeader //: Settings page header //% "Books" - title: qsTrId("settings-page_header") + title: qsTrId("harbour-books-settings-page-header") } Slider { @@ -72,10 +72,10 @@ Page { stepSize: 1 //: Slider value label for the standard font size //% "Default" - readonly property string normal: qsTrId("settings-font_size_label-default") + readonly property string normal: qsTrId("harbour-books-settings-page-font_size_label-default") //: Slider label //% "Font size" - label: qsTrId("settings-font_size_label") + label: qsTrId("harbour-books-settings-page-font_size_label") valueText: (value === 0) ? normal : ((value > 0) ? ("+" + value) : value) width: page.width anchors.horizontalCenter: parent.horizontalCenter diff --git a/app/src/ZLibrary.cpp b/app/src/ZLibrary.cpp index 280896f..8ab433c 100644 --- a/app/src/ZLibrary.cpp +++ b/app/src/ZLibrary.cpp @@ -196,7 +196,7 @@ void ZLibrary::run(ZLApplication* aApp) root->setContextProperty("BooksSettingsMenu", QVariant::fromValue(BOOKS_SETTINGS_MENU)); - view->setTitle(qtTrId("books-app-name")); + view->setTitle(qtTrId("harbour-books-app-name")); view->setSource(QUrl::fromLocalFile(qml)); view->show(); HDEBUG("started"); diff --git a/app/translations/harbour-books-de.ts b/app/translations/harbour-books-de.ts index 6cc0d07..3f0ea8a 100644 --- a/app/translations/harbour-books-de.ts +++ b/app/translations/harbour-books-de.ts @@ -3,106 +3,113 @@ - + Books Bücher - + Back to library Zur Bibliothek - + Loading... Laden ... - + Formatting... Formatieren ... - + Applying larger fonts... Verwende größere Schrift ... - + Applying smaller fonts... Verwende kleinere Schrift ... - + Cancel Abbrechen - + Deleting all books Alle Bücher löschen - + No books Keine Bücher - + Enter folder name + Placeholder for the bookshelf title Verzeichnisnamen eingeben - + Memory card + Header label for the memory card Speicherkarte - + Internal storage + Header label for the internal storage Interner Speicher - + %0 book(s) + Number of books in the storage header %0 Buch %0 Bücher - + Settings Pulley menu item Einstellungen - + Scan downloads Pulley menu item Lese Downloads - + Delete all books Pulley menu item Lösche alle Bücher - + Swipe left to see what's on the SD-card Wische, um Speicherkarteninhalt zu lesen - + Import %0 book(s) + Dialog header button Importiere %0 Buch Importiere %0 Bücher - + Select books + Dialog header button Wähle Bücher - + No new books found + Import page placeholder Keine neuen Bücher gefunden - + Books Settings page header Bücher - + Font size Slider label Schriftgröße - + Default Slider value label for the standard font size Standard diff --git a/app/translations/harbour-books-fi.ts b/app/translations/harbour-books-fi.ts index 6d36020..c5841ec 100644 --- a/app/translations/harbour-books-fi.ts +++ b/app/translations/harbour-books-fi.ts @@ -3,106 +3,113 @@ - + Books Kirjat - + Back to library Takaisin kirjalistaan - + Loading... Latautuu... - + Formatting... Muotoillaan... - + Applying larger fonts... Vaihdetaan isompiin fontteihin... - + Applying smaller fonts... Vaihdetaan pienempiin fontteihin... - + Cancel Peru - + Deleting all books Poistetaan kaikki kirjat - + No books Sinulla ei ole kirjoja - + Enter folder name + Placeholder for the bookshelf title Anna kansion nimi - + Memory card + Header label for the memory card Muistikortti - + Internal storage + Header label for the internal storage Sisäinen muisti - + %0 book(s) + Number of books in the storage header %0 kirja %0 kirjaa - + Settings Pulley menu item Asetukset - + Scan downloads Pulley menu item Tarkista lataukset - + Delete all books Pulley menu item Poista kaikki kirjat - + Swipe left to see what's on the SD-card Katso muistikortin sisältö pyyhkäisemällä vasemmalle - + Import %0 book(s) + Dialog header button Tuo %0 kirja Tuo %0 kirjaa - + Select books + Dialog header button Valitse kirjat - + No new books found + Import page placeholder Uusia kirjoja ei löytynyt - + Books Settings page header Kirjat - + Font size Slider label Fonttikoko - + Default Slider value label for the standard font size Oletus diff --git a/app/translations/harbour-books-ru.ts b/app/translations/harbour-books-ru.ts index 6a241c2..0167131 100644 --- a/app/translations/harbour-books-ru.ts +++ b/app/translations/harbour-books-ru.ts @@ -3,108 +3,115 @@ - + Books Книги - + Back to library Вернуться в библиотеку - + Loading... Загрузка... - + Formatting... Форматирование... - + Applying larger fonts... Увеличиваем шрифты... - + Applying smaller fonts... Уменьшаем шрифты... - + Cancel Отставить - + Deleting all books Удаляем все книги - + No books Здесь пусто, нет ничего вообще - + Enter folder name + Placeholder for the bookshelf title Введите имя папки - + Memory card + Header label for the memory card Карта памяти - + Internal storage + Header label for the internal storage Встроенная память - + %0 book(s) + Number of books in the storage header %0 книга %0 книги %0 книг - + Settings Pulley menu item Настройки - + Scan downloads Pulley menu item Проверить загрузки - + Delete all books Pulley menu item Удалить все книги - + Swipe left to see what's on the SD-card Проведите влево, вдруг что-нибудь есть на карте памяти - + Import %0 book(s) + Dialog header button Взять %0 книгу Взять %0 книги Взять %0 книг - + Select books + Dialog header button Выбирайте - + No new books found + Import page placeholder Новых книг не найдено, вообще ни одной - + Books Settings page header Книги - + Font size Slider label Размер шрифта - + Default Slider value label for the standard font size Стандартный diff --git a/app/translations/harbour-books-sv.ts b/app/translations/harbour-books-sv.ts index 8cae62f..9d19485 100644 --- a/app/translations/harbour-books-sv.ts +++ b/app/translations/harbour-books-sv.ts @@ -3,106 +3,113 @@ - + Books Böcker - + Back to library Tillbaka till biblioteket - + Loading... Läser in... - + Formatting... Formatering... - + Applying larger fonts... Tillämpar större teckensnitt... - + Applying smaller fonts... Tillämpar mindre teckensnitt... - + Cancel Avbryt - + Deleting all books Tar bort alla böcker - + No books Inga böcker - + Enter folder name + Placeholder for the bookshelf title Ange mappnamn - + Memory card + Header label for the memory card Minneskort - + Internal storage + Header label for the internal storage Intern lagring - + %0 book(s) + Number of books in the storage header %0 bok %0 böcker - + Settings Pulley menu item Inställningar - + Scan downloads Pulley menu item Skanna Nedladdningar - + Delete all books Pulley menu item Ta bort alla böcker - + Swipe left to see what's on the SD-card Svep åt vänster för att se vad som finns på SD-kortet - + Import %0 book(s) + Dialog header button Importera %0 bok Importera %0 böcker - + Select books + Dialog header button Välj böcker - + No new books found + Import page placeholder Inga nya böcker hittades - + Books Settings page header Böcker - + Font size Slider label Textstorlek - + Default Slider value label for the standard font size Standard diff --git a/app/translations/harbour-books.ts b/app/translations/harbour-books.ts index 186e424..213ec87 100644 --- a/app/translations/harbour-books.ts +++ b/app/translations/harbour-books.ts @@ -3,106 +3,113 @@ - + Books Books - + Back to library Back to library - + Loading... Loading... - + Formatting... Formatting... - + Applying larger fonts... Applying larger fonts... - + Applying smaller fonts... Applying smaller fonts... - + Cancel Cancel - + Deleting all books Deleting all books - + No books No books - + Enter folder name + Placeholder for the bookshelf title Enter folder name - + Memory card + Header label for the memory card Memory card - + Internal storage + Header label for the internal storage Internal storage - + %0 book(s) + Number of books in the storage header %0 book %0 books - + Settings Pulley menu item - + Scan downloads Pulley menu item Check downloads - + Delete all books Pulley menu item Delete all books - + Swipe left to see what's on the SD-card Swipe left to see what's on the SD-card - + Import %0 book(s) + Dialog header button Import %0 book Import %0 books - + Select books + Dialog header button Select books - + No new books found + Import page placeholder No new books found - + Books Settings page header Books - + Font size Slider label Font size - + Default Slider value label for the standard font size Default