diff --git a/assets/ExportPane.qml b/assets/ExportPane.qml
index 2f662ec..78042ae 100644
--- a/assets/ExportPane.qml
+++ b/assets/ExportPane.qml
@@ -62,6 +62,8 @@ NavigationPane
persist.showToast( qsTr("No accounts found. Are you sure you gave the app the permissions it needs?"), qsTr("OK"), "asset:///images/dropdown/ic_account.png" );
}
+ else if ( persist.tutorialVideo("http://youtu.be/_sSZJPBwlnc") ) {}
+ else if ( persist.tutorial("tutorialExportTxt", qsTr("These are a list of all the conversations, press-and-hold on one and from the menu choose 'Select More' and then 'Export TXT' to save it. You can also tap on the conversation itself and save only parts of it if you wish."), "asset:///images/menu/ic_export.png" ) ) {}
else if ( persist.tutorial("tutorialExportTxt", qsTr("These are a list of all the conversations, press-and-hold on one and from the menu choose 'Select More' and then 'Export TXT' to save it. You can also tap on the conversation itself and save only parts of it if you wish."), "asset:///images/menu/ic_export.png" ) ) {}
else if ( persist.tutorial("tutorialSelectAll", qsTr("You can tap the Select All button at the bottom of the screen to quickly export all your conversations!"), "asset:///images/menu/selectAll.png" ) ) {}
else if ( persist.tutorial("tutorialDropDown", qsTr("Use the dropdown at the top to switch between your mailboxes."), "asset:///images/dropdown/ic_account.png" ) ) {}
diff --git a/assets/HelpPage.qml b/assets/HelpPage.qml
index 0f3f456..c3b44ef 100644
--- a/assets/HelpPage.qml
+++ b/assets/HelpPage.qml
@@ -24,7 +24,7 @@ Page
{
query {
mimeType: "text/html"
- uri: "http://www.youtube.com/watch?v=AbHZLmWSKts"
+ uri: "http://youtu.be/_sSZJPBwlnc"
invokeActionId: "bb.action.OPEN"
}
diff --git a/bar-descriptor.xml b/bar-descriptor.xml
index ac5d5a2..45f0796 100755
--- a/bar-descriptor.xml
+++ b/bar-descriptor.xml
@@ -35,7 +35,7 @@
- 2.3.0
+ 2.6.0
diff --git a/src/ApplicationUI.cpp b/src/ApplicationUI.cpp
index b9f7c14..931cf35 100755
--- a/src/ApplicationUI.cpp
+++ b/src/ApplicationUI.cpp
@@ -126,7 +126,7 @@ void ApplicationUI::init()
m_persistance.saveValueFor("output", sdDirectory, false);
}
-/*
+
bool permissionOK = PimUtil::validateEmailSMSAccess( tr("Warning: It seems like the app does not have access to your Email/SMS messages Folder. This permission is needed for the app to access the SMS and email services it needs to render and process them so they can be saved. If you leave this permission off, some features may not work properly. Select OK to launch the Application Permissions screen where you can turn these settings on.") );
if (permissionOK)
@@ -136,7 +136,7 @@ void ApplicationUI::init()
if (permissionOK) {
PimUtil::validateContactsAccess( tr("Warning: It seems like the app does not have access to your contacts. This permission is needed for the app to access your address book so we can properly display the names of the contacts in the output files. If you leave this permission off, some features may not work properly. Select OK to launch the Application Permissions screen where you can turn these settings on.") );
}
- } */
+ }
}
diff --git a/src/PaymentHelper.cpp b/src/PaymentHelper.cpp
index cf8bc8d..3ec6f43 100644
--- a/src/PaymentHelper.cpp
+++ b/src/PaymentHelper.cpp
@@ -28,6 +28,7 @@ PaymentManager* PaymentHelper::getPaymentManager()
m_payment = new PaymentManager(this);
connect( m_payment, SIGNAL( existingPurchasesFinished(bb::platform::ExistingPurchasesReply*) ), this, SLOT( existingPurchasesFinished(bb::platform::ExistingPurchasesReply*) ) );
connect( m_payment, SIGNAL( purchaseFinished(bb::platform::PurchaseReply*) ), this, SLOT( purchaseFinished(bb::platform::PurchaseReply*) ) );
+
#if !defined(QT_NO_DEBUG)
m_payment->setConnectionMode(PaymentConnectionMode::Test);
#endif
diff --git a/translations/Exporter.ts b/translations/Exporter.ts
index 761efd6..e7680e7 100755
--- a/translations/Exporter.ts
+++ b/translations/Exporter.ts
@@ -79,7 +79,7 @@ Use the Range Selector if the message gets truncated.
-
+
@@ -89,70 +89,71 @@ Use the Range Selector if the message gets truncated.
-
+
-
+
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
@@ -427,6 +428,21 @@ Tap the first message, then tap the last message and all of the ones in between
%2: %3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+