Коммит 89bd18fe создал по автору Alexey Andreyev's avatar Alexey Andreyev Зафиксировано автором Alexey Andreev
Просмотр файлов

[WebViewPage] Fix up navigation labes logic. #3

владелец aa4d30ca
Скрыть пробелы
Построчно Рядом
qml/pages/WebViewPage.qml
Просмотр файла @ 89bd18fe
...@@ -98,13 +98,26 @@ Page { ...@@ -98,13 +98,26 @@ Page {
anchors.bottom: urlField.top anchors.bottom: urlField.top
Label { Label {
//% "Back navigation " text:
text: qsTrId("ui-component-gallery-web-view-back-navigation")) //% "Back navigation "
qsTrId("ui-component-gallery-web-view-back-navigation") +
(webViewPage.backNavigation ?
//% "enabled."
qsTrId("ui-component-gallery-web-view-enabled") :
//% "disabled."
qsTrId("ui-component-gallery-web-view-enabled")
)
} }
Label { Label {
//% "Forward navigation " text:
text: qsTrId("ui-component-gallery-web-view-forward-navigation")) //% "Forward navigation "
qsTrId("ui-component-gallery-web-view-forward-navigation") +
(webViewPage.forwardNavigation ?
qsTrId("ui-component-gallery-web-view-enabled") :
//% "disabled."
qsTrId("ui-component-gallery-web-view-enabled")
)
} }
} }
......
translations/ru.auroraos.UIComponentGallery-ru.ts
Просмотр файла @ 89bd18fe
...@@ -1943,8 +1943,9 @@ ...@@ -1943,8 +1943,9 @@
<translation>Показать, как отображается приложение с вырезом эркана</translation> <translation>Показать, как отображается приложение с вырезом эркана</translation>
</message> </message>
<message id="ui-component-gallery-main-forms-declarative-radio-buttons"> <message id="ui-component-gallery-main-forms-declarative-radio-buttons">
<source>Forms: Declarative Radio Buttons</source> <source>Forms: Radio Buttons with Model</source>
<translation>Формы: декларативные переключатели</translation> <oldsource>Forms: Declarative Radio Buttons</oldsource>
<translation type="unfinished">Формы: декларативные переключатели</translation>
</message> </message>
<message id="ui-component-gallery-main-using-qml-only"> <message id="ui-component-gallery-main-using-qml-only">
<source>Using QML only</source> <source>Using QML only</source>
...@@ -3506,55 +3507,87 @@ ...@@ -3506,55 +3507,87 @@
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-create"> <message id="ui-component-gallery-sign-in-dialog-create">
<source>Create</source> <source>Create</source>
<translation type="unfinished"></translation> <translation>Создать</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-sign-in"> <message id="ui-component-gallery-sign-in-dialog-sign-in">
<source>Sign-in</source> <source>Sign-in</source>
<translation type="unfinished"></translation> <translation>Войти</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-add-account-to-get-cool-features"> <message id="ui-component-gallery-sign-in-dialog-add-account-to-get-cool-features">
<source>Add account to get cool features</source> <source>Add account to get cool features</source>
<translation type="unfinished"></translation> <translation>Добавьте аккаунт чтобы получить крутые возможности</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-i-have-an-account"> <message id="ui-component-gallery-sign-in-dialog-i-have-an-account">
<source>I have an account</source> <source>I have an account</source>
<translation type="unfinished"></translation> <translation>У меня есть аккаунт</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-select-this-if-you-want-to-sign-in-to-existing-account"> <message id="ui-component-gallery-sign-in-dialog-select-this-if-you-want-to-sign-in-to-existing-account">
<source>Select this if you want to sign-in to existing account</source> <source>Select this if you want to sign-in to existing account</source>
<translation type="unfinished"></translation> <translation>Отметьте, если хотите войти в существующий аккаунт</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-i-am-a-new-user"> <message id="ui-component-gallery-sign-in-dialog-i-am-a-new-user">
<source>I am a new user</source> <source>I am a new user</source>
<translation type="unfinished"></translation> <translation>Я новый пользователь</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-select-this-if-you-havent-used-the-account-yet-on-any-other-devices"> <message id="ui-component-gallery-sign-in-dialog-select-this-if-you-havent-used-the-account-yet-on-any-other-devices">
<source>Select this if you haven&apos;t used the account yet on any other devices</source> <source>Select this if you haven&apos;t used the account yet on any other devices</source>
<translation type="unfinished"></translation> <translation>Отметьте, если вы не использовали аккаунт ранее на других устройствах</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-username"> <message id="ui-component-gallery-sign-in-dialog-username">
<source>Username</source> <source>Username</source>
<translation type="unfinished">Имя пользователя</translation> <translation>Имя пользователя</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-username-is-too-short"> <message id="ui-component-gallery-sign-in-dialog-username-is-too-short">
<source>Username is too short</source> <source>Username is too short</source>
<translation type="unfinished"></translation> <translation>Слишком короткое имя пользователя</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-password"> <message id="ui-component-gallery-sign-in-dialog-password">
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation>Пароль</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-password-is-too-short"> <message id="ui-component-gallery-sign-in-dialog-password-is-too-short">
<source>Password is too short</source> <source>Password is too short</source>
<translation type="unfinished"></translation> <translation>Слишком короткий пароль</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-re-enter-password"> <message id="ui-component-gallery-sign-in-dialog-re-enter-password">
<source>Re-enter password</source> <source>Re-enter password</source>
<translation type="unfinished"></translation> <translation>Повторно введите пароль</translation>
</message> </message>
<message id="ui-component-gallery-sign-in-dialog-passwords-do-not-match"> <message id="ui-component-gallery-sign-in-dialog-passwords-do-not-match">
<source>Passwords do not match</source> <source>Passwords do not match</source>
<translation type="unfinished"></translation> <translation>Пароли не совпадают</translation>
</message>
<message id="ui-component-gallery-web-view-reload">
<source>Reload</source>
<translation>Перезагрузить</translation>
</message>
<message id="ui-component-gallery-web-view-web-content-load-error">
<source>Web content load error: </source>
<translation>Ошибка загрузки веб-контента: </translation>
</message>
<message id="ui-component-gallery-web-view-check-network-connectivity-and-pull-down-to-reload">
<source>Check network connectivity and pull down to reload</source>
<translation>Проверьте подключение к сети и потяните, чтобы перезагрузить</translation>
</message>
<message id="ui-component-gallery-web-view-back-navigation">
<source>Back navigation </source>
<translation>Навигация назад </translation>
</message>
<message id="ui-component-gallery-web-view-enabled">
<source>enabled.</source>
<translation>включена.</translation>
</message>
<message id="ui-component-gallery-web-view-forward-navigation">
<source>Forward navigation </source>
<translation>Навигация вперед </translation>
</message>
<message id="ui-component-gallery-web-view-httpsauroraosru">
<source>https://auroraos.ru</source>
<translation>https://auroraos.ru</translation>
</message>
<message id="ui-component-gallery-web-view-this-is-an-attached-page-and-shows-how-forward-navigation-goes-to-disabled-state-based-on-web-content-size">
<source>This is an attached page and shows how forward navigation goes to disabled state based on web content size.</source>
<translation>Эта вложенная страница показывает, как навигация вперед отключается на основе содержимого веб-контента</translation>
</message> </message>
</context> </context>
</TS> </TS>
translations/ru.auroraos.UIComponentGallery.ts
Просмотр файла @ 89bd18fe
...@@ -1943,7 +1943,8 @@ ...@@ -1943,7 +1943,8 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message id="ui-component-gallery-main-forms-declarative-radio-buttons"> <message id="ui-component-gallery-main-forms-declarative-radio-buttons">
<source>Forms: Declarative Radio Buttons</source> <source>Forms: Radio Buttons with Model</source>
<oldsource>Forms: Declarative Radio Buttons</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message id="ui-component-gallery-main-using-qml-only"> <message id="ui-component-gallery-main-using-qml-only">
...@@ -3556,5 +3557,37 @@ ...@@ -3556,5 +3557,37 @@
<source>Passwords do not match</source> <source>Passwords do not match</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message id="ui-component-gallery-web-view-reload">
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
<message id="ui-component-gallery-web-view-web-content-load-error">
<source>Web content load error: </source>
<translation type="unfinished"></translation>
</message>
<message id="ui-component-gallery-web-view-check-network-connectivity-and-pull-down-to-reload">
<source>Check network connectivity and pull down to reload</source>
<translation type="unfinished"></translation>
</message>
<message id="ui-component-gallery-web-view-back-navigation">
<source>Back navigation </source>
<translation type="unfinished"></translation>
</message>
<message id="ui-component-gallery-web-view-enabled">
<source>enabled.</source>
<translation type="unfinished"></translation>
</message>
<message id="ui-component-gallery-web-view-forward-navigation">
<source>Forward navigation </source>
<translation type="unfinished"></translation>
</message>
<message id="ui-component-gallery-web-view-httpsauroraosru">
<source>https://auroraos.ru</source>
<translation type="unfinished"></translation>
</message>
<message id="ui-component-gallery-web-view-this-is-an-attached-page-and-shows-how-forward-navigation-goes-to-disabled-state-based-on-web-content-size">
<source>This is an attached page and shows how forward navigation goes to disabled state based on web content size.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать