Merge pull request #37 from nemomobile/home2

Merge home2 to master
sailfishos · May 28, 2015 · 7060011 · 7060011
2 parents 3f53013 + 4a18e57
commit 7060011
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/rpm/transfer-engine-qt5.spec b/rpm/transfer-engine-qt5.spec
@@ -1,5 +1,5 @@
 Name: nemo-transferengine-qt5
-Version: 0.0.34
+Version: 0.1.1
 Release: 0
 Summary: Transfer Engine for uploading media content and tracking transfers.
 Group: System Environment/Daemon

diff --git a/src/transferengine.cpp b/src/transferengine.cpp
@@ -361,18 +361,17 @@ void TransferEnginePrivate::sendNotification(TransferEngineData::TransferType ty
         switch (type) {
         case TransferEngineData::Upload:
             //: Notification for failed file upload
-            //% "Upload failed!"
-            body = qtTrId("transferengine-no-file-upload-failure");
+            //% "Upload failed"
+            body = qtTrId("transferengine-la-file_upload_failed");
             break;
         case TransferEngineData::Download:
             //: Notification for failed file download
-            //% "Download failed!"
-            body = qtTrId("transferengine-no-file-download-failure");
+            //% "Download failed"
+            body = qtTrId("transferengine-la-file_download_failed");
             break;
         case TransferEngineData::Sync:
-            //: Notification for sync failure
-            //% "Sync failed!"
-            body = qtTrId("transferengine-no-sync-failure");
+            // no notification required
+            category.clear();
             break;
         default:
             qWarning() << "TransferEnginePrivate::sendNotification: unknown state";