diff --git a/fastlane/screenshots/ca/keyword.strings b/fastlane/screenshots/ca/keyword.strings
new file mode 100644
index 000000000..8d6072935
Binary files /dev/null and b/fastlane/screenshots/ca/keyword.strings differ
diff --git a/fastlane/screenshots/es/keyword.strings b/fastlane/screenshots/es/keyword.strings
new file mode 100644
index 000000000..ad1dc0f49
Binary files /dev/null and b/fastlane/screenshots/es/keyword.strings differ
diff --git a/fastlane/screenshots/es/title.strings b/fastlane/screenshots/es/title.strings
new file mode 100644
index 000000000..90b256dbb
Binary files /dev/null and b/fastlane/screenshots/es/title.strings differ
diff --git a/fastlane/screenshots/tr/keyword.strings b/fastlane/screenshots/tr/keyword.strings
new file mode 100644
index 000000000..c8d9b7ab5
Binary files /dev/null and b/fastlane/screenshots/tr/keyword.strings differ
diff --git a/fastlane/screenshots/tr/title.strings b/fastlane/screenshots/tr/title.strings
new file mode 100644
index 000000000..d6f3387f7
Binary files /dev/null and b/fastlane/screenshots/tr/title.strings differ
diff --git a/fastlane/screenshots/zh-Hans/keyword.strings b/fastlane/screenshots/zh-Hans/keyword.strings
new file mode 100644
index 000000000..384e9c30f
Binary files /dev/null and b/fastlane/screenshots/zh-Hans/keyword.strings differ
diff --git a/ios-sdk b/ios-sdk
index e91a5ebf7..b85482a0b 160000
--- a/ios-sdk
+++ b/ios-sdk
@@ -1 +1 @@
-Subproject commit e91a5ebf76c65e2190be1775df456cc7630d53af
+Subproject commit b85482a0b3e876374e3beaf9241286867d6df5ab
diff --git a/ownCloud/AppDelegate.swift b/ownCloud/AppDelegate.swift
index 2e5b3869b..c64fe2e68 100644
--- a/ownCloud/AppDelegate.swift
+++ b/ownCloud/AppDelegate.swift
@@ -77,8 +77,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		OCExtensionManager.shared.addExtension(UploadFileAction.actionExtension)
 		OCExtensionManager.shared.addExtension(UploadMediaAction.actionExtension)
 		OCExtensionManager.shared.addExtension(UnshareAction.actionExtension)
-		OCExtensionManager.shared.addExtension(BackgroundFetchUpdateTaskAction.taskExtension)
-		OCExtensionManager.shared.addExtension(InstantMediaUploadTaskExtension.taskExtension)
 		OCExtensionManager.shared.addExtension(MakeAvailableOfflineAction.actionExtension)
 		OCExtensionManager.shared.addExtension(MakeUnavailableOfflineAction.actionExtension)
 		OCExtensionManager.shared.addExtension(CollaborateAction.actionExtension)
diff --git a/ownCloud/Resources/ar.lproj/InfoPlist.strings b/ownCloud/Resources/ar.lproj/InfoPlist.strings
index 4735c62da..e37810ab4 100644
Binary files a/ownCloud/Resources/ar.lproj/InfoPlist.strings and b/ownCloud/Resources/ar.lproj/InfoPlist.strings differ
diff --git a/ownCloud/Resources/ar.lproj/Localizable.strings b/ownCloud/Resources/ar.lproj/Localizable.strings
index ebbbe96e1..de41f84dc 100644
Binary files a/ownCloud/Resources/ar.lproj/Localizable.strings and b/ownCloud/Resources/ar.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/de-DE.lproj/Localizable.strings b/ownCloud/Resources/de-DE.lproj/Localizable.strings
index 7b377aeb4..cf01af88d 100644
Binary files a/ownCloud/Resources/de-DE.lproj/Localizable.strings and b/ownCloud/Resources/de-DE.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/de.lproj/Localizable.strings b/ownCloud/Resources/de.lproj/Localizable.strings
index 7b377aeb4..6b8decf48 100644
Binary files a/ownCloud/Resources/de.lproj/Localizable.strings and b/ownCloud/Resources/de.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/el.lproj/Localizable.strings b/ownCloud/Resources/el.lproj/Localizable.strings
index d0fb3cc40..1a81a1a16 100644
Binary files a/ownCloud/Resources/el.lproj/Localizable.strings and b/ownCloud/Resources/el.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/es.lproj/Localizable.strings b/ownCloud/Resources/es.lproj/Localizable.strings
index 59f0042f2..4c8bd3bea 100644
Binary files a/ownCloud/Resources/es.lproj/Localizable.strings and b/ownCloud/Resources/es.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/eu.lproj/Localizable.strings b/ownCloud/Resources/eu.lproj/Localizable.strings
index 2c1c5b0d1..746f9e6c7 100644
Binary files a/ownCloud/Resources/eu.lproj/Localizable.strings and b/ownCloud/Resources/eu.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/gl.lproj/Localizable.strings b/ownCloud/Resources/gl.lproj/Localizable.strings
index 36e830b44..90e2a9602 100644
Binary files a/ownCloud/Resources/gl.lproj/Localizable.strings and b/ownCloud/Resources/gl.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/he.lproj/Localizable.strings b/ownCloud/Resources/he.lproj/Localizable.strings
index f0225e2e9..2731b55c7 100644
Binary files a/ownCloud/Resources/he.lproj/Localizable.strings and b/ownCloud/Resources/he.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/pt-BR.lproj/Localizable.strings b/ownCloud/Resources/pt-BR.lproj/Localizable.strings
index 68b95ef91..0664caa19 100644
Binary files a/ownCloud/Resources/pt-BR.lproj/Localizable.strings and b/ownCloud/Resources/pt-BR.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/ru.lproj/Localizable.strings b/ownCloud/Resources/ru.lproj/Localizable.strings
index 27cb7c6d9..ef0f48916 100644
Binary files a/ownCloud/Resources/ru.lproj/Localizable.strings and b/ownCloud/Resources/ru.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/sq.lproj/Localizable.strings b/ownCloud/Resources/sq.lproj/Localizable.strings
index 86f30e95f..7d90bc2c6 100644
Binary files a/ownCloud/Resources/sq.lproj/Localizable.strings and b/ownCloud/Resources/sq.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/th-TH.lproj/Localizable.strings b/ownCloud/Resources/th-TH.lproj/Localizable.strings
index 86f30e95f..3ca893657 100644
Binary files a/ownCloud/Resources/th-TH.lproj/Localizable.strings and b/ownCloud/Resources/th-TH.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/tr.lproj/InfoPlist.strings b/ownCloud/Resources/tr.lproj/InfoPlist.strings
new file mode 100644
index 000000000..5599c3e2a
Binary files /dev/null and b/ownCloud/Resources/tr.lproj/InfoPlist.strings differ
diff --git a/ownCloud/Resources/tr.lproj/Localizable.strings b/ownCloud/Resources/tr.lproj/Localizable.strings
new file mode 100644
index 000000000..7a488889b
Binary files /dev/null and b/ownCloud/Resources/tr.lproj/Localizable.strings differ
diff --git a/ownCloud/Resources/zh-Hans.lproj/Localizable.strings b/ownCloud/Resources/zh-Hans.lproj/Localizable.strings
index b86a3074e..c42adb4dd 100644
Binary files a/ownCloud/Resources/zh-Hans.lproj/Localizable.strings and b/ownCloud/Resources/zh-Hans.lproj/Localizable.strings differ