From 3950ff0abc2fb9e9cba73ce0cbdd6af39f24b2f0 Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Tue, 31 Mar 2015 16:51:13 +0200 Subject: Moved AppStore MenuItem to main page --- app/qml/pages/InstallAppDialog.qml | 6 +--- app/qml/pages/ManagerPage.qml | 4 +++ app/translations/pebble-es.ts | 68 +++++++++++++++++++------------------- app/translations/pebble.ts | 68 +++++++++++++++++++------------------- 4 files changed, 73 insertions(+), 73 deletions(-) (limited to 'app') diff --git a/app/qml/pages/InstallAppDialog.qml b/app/qml/pages/InstallAppDialog.qml index 4661cf0..97513c0 100644 --- a/app/qml/pages/InstallAppDialog.qml +++ b/app/qml/pages/InstallAppDialog.qml @@ -69,7 +69,7 @@ Dialog { PullDownMenu { MenuItem { - text: qsTr("Add App file...") + text: qsTr("Add App file") onClicked: { var addApps = function() { for(var i=0; i < picker.selectedContent.count; ++i) { @@ -84,10 +84,6 @@ Dialog { } } - MenuItem { - text: qsTr("Pebble Appstore") - onClicked: pageStack.push(Qt.resolvedUrl("AppStorePage.qml")) - } } currentIndex: -1 diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml index 814c9d8..bfafeb5 100644 --- a/app/qml/pages/ManagerPage.qml +++ b/app/qml/pages/ManagerPage.qml @@ -61,6 +61,10 @@ Page { VerticalScrollDecorator { flickable: flickable } PullDownMenu { + MenuItem { + text: qsTr("Pebble Appstore") + onClicked: pageStack.push(Qt.resolvedUrl("AppStorePage.qml")) + } MenuItem { text: qsTr("About") onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml")) diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts index 2b9b6a3..ab30bef 100644 --- a/app/translations/pebble-es.ts +++ b/app/translations/pebble-es.ts @@ -96,12 +96,7 @@ - Add App file... - - - - - Pebble Appstore + Add App file @@ -109,148 +104,153 @@ ManagerPage + Pebble Appstore + + + + About Acerca de - + Pebble Manager - + Waiting for watch... If it can't be found please check it's available and paired in Bluetooth settings. Buscando el reloj Si esto tarda mucho, comprueba que el reloj esté emparejado correctamente. - + Service Servicio - + Enabled Habilitado - + Automatic startup Inicio automático - + Manual startup Inicio manual - + Active Activo - + Running Ejecutándose - + Dead Detenido - + Connection Conexión - + Connected Conectado - + Disconnected Desconectado - + Settings Configuración - + Forward phone calls Transferir llamadas - + Silent when connected Modo silencio automático - + Sets phone profile to "silent" when Pebble is connected Activa el modo silencio cuando se conecte un Pebble - + Transliterate messages Transliterar mensajes - + Messages are transliterated to ASCII before sending to Pebble Codifica los mensajes entrates a ASCII antes de enviarlos a Pebble - + Notifications Notificaciones - + Messaging Mensajería - + SMS and IM SMS y chat - + Missed call Llamadas perdidas - + Emails Correos electrónicos - + Mitakuuluu - + Twitter Twitter - + Facebook Facebook - + Other notifications Resto de notificaciones - + All notifications Todas las notificaciones diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts index b3ff872..b1cbc6b 100644 --- a/app/translations/pebble.ts +++ b/app/translations/pebble.ts @@ -92,12 +92,7 @@ - Add App file... - - - - - Pebble Appstore + Add App file @@ -105,147 +100,152 @@ ManagerPage + Pebble Appstore + + + + About - + Pebble Manager - + Waiting for watch... If it can't be found please check it's available and paired in Bluetooth settings. - + Service - + Enabled - + Automatic startup - + Manual startup - + Active - + Running - + Dead - + Connection - + Connected - + Disconnected - + Settings - + Forward phone calls - + Silent when connected - + Sets phone profile to "silent" when Pebble is connected - + Transliterate messages - + Messages are transliterated to ASCII before sending to Pebble - + Notifications - + Messaging - + SMS and IM - + Missed call - + Emails - + Mitakuuluu - + Twitter - + Facebook - + Other notifications - + All notifications -- cgit v1.2.3