Browse Source

remove Strings

Marino Faggiana 6 years ago
parent
commit
aa0f9b2d07
54 changed files with 243 additions and 518 deletions
  1. 0 271
      Nextcloud.xcodeproj/project.pbxproj
  2. 1 1
      iOSClient/AutoUpload/NCAutoUpload.m
  3. 22 22
      iOSClient/Library/BKPasscodeView/BKPasscodeViewController.m
  4. 3 3
      iOSClient/Library/BKPasscodeView/BKTouchIDSwitchView.m
  5. 43 43
      iOSClient/Library/OCCommunicationLib/OCCommunication.m
  6. 1 1
      iOSClient/Login/CCLogin.m
  7. 57 57
      iOSClient/Networking/OCNetworking.m
  8. BIN
      iOSClient/Supporting Files/cs-CZ.lproj/BKPasscodeView.strings
  9. BIN
      iOSClient/Supporting Files/cs-CZ.lproj/Error.strings
  10. BIN
      iOSClient/Supporting Files/cs-CZ.lproj/SwiftWebVC.strings
  11. BIN
      iOSClient/Supporting Files/de.lproj/BKPasscodeView.strings
  12. BIN
      iOSClient/Supporting Files/de.lproj/Error.strings
  13. BIN
      iOSClient/Supporting Files/de.lproj/SwiftWebVC.strings
  14. BIN
      iOSClient/Supporting Files/en.lproj/BKPasscodeView.strings
  15. 0 57
      iOSClient/Supporting Files/en.lproj/Error.strings
  16. 77 0
      iOSClient/Supporting Files/en.lproj/Localizable.strings
  17. 0 24
      iOSClient/Supporting Files/en.lproj/SwiftWebVC.strings
  18. BIN
      iOSClient/Supporting Files/es.lproj/BKPasscodeView.strings
  19. BIN
      iOSClient/Supporting Files/es.lproj/Error.strings
  20. BIN
      iOSClient/Supporting Files/es.lproj/SwiftWebVC.strings
  21. BIN
      iOSClient/Supporting Files/fr.lproj/BKPasscodeView.strings
  22. BIN
      iOSClient/Supporting Files/fr.lproj/Error.strings
  23. BIN
      iOSClient/Supporting Files/fr.lproj/SwiftWebVC.strings
  24. BIN
      iOSClient/Supporting Files/is.lproj/BKPasscodeView.strings
  25. BIN
      iOSClient/Supporting Files/is.lproj/Error.strings
  26. BIN
      iOSClient/Supporting Files/is.lproj/SwiftWebVC.strings
  27. BIN
      iOSClient/Supporting Files/it.lproj/BKPasscodeView.strings
  28. BIN
      iOSClient/Supporting Files/it.lproj/Error.strings
  29. BIN
      iOSClient/Supporting Files/it.lproj/SwiftWebVC.strings
  30. BIN
      iOSClient/Supporting Files/nb-NO.lproj/BKPasscodeView.strings
  31. BIN
      iOSClient/Supporting Files/nb-NO.lproj/Error.strings
  32. BIN
      iOSClient/Supporting Files/nb-NO.lproj/SwiftWebVC.strings
  33. BIN
      iOSClient/Supporting Files/nl.lproj/BKPasscodeView.strings
  34. BIN
      iOSClient/Supporting Files/nl.lproj/Error.strings
  35. BIN
      iOSClient/Supporting Files/nl.lproj/SwiftWebVC.strings
  36. BIN
      iOSClient/Supporting Files/pt-BR.lproj/BKPasscodeView.strings
  37. BIN
      iOSClient/Supporting Files/pt-BR.lproj/Error.strings
  38. BIN
      iOSClient/Supporting Files/pt-BR.lproj/SwiftWebVC.strings
  39. BIN
      iOSClient/Supporting Files/ru.lproj/BKPasscodeView.strings
  40. BIN
      iOSClient/Supporting Files/ru.lproj/Error.strings
  41. BIN
      iOSClient/Supporting Files/ru.lproj/SwiftWebVC.strings
  42. BIN
      iOSClient/Supporting Files/sk-SK.lproj/BKPasscodeView.strings
  43. BIN
      iOSClient/Supporting Files/sk-SK.lproj/Error.strings
  44. BIN
      iOSClient/Supporting Files/sk-SK.lproj/SwiftWebVC.strings
  45. BIN
      iOSClient/Supporting Files/sr.lproj/BKPasscodeView.strings
  46. BIN
      iOSClient/Supporting Files/sr.lproj/Error.strings
  47. BIN
      iOSClient/Supporting Files/sr.lproj/SwiftWebVC.strings
  48. BIN
      iOSClient/Supporting Files/sv.lproj/BKPasscodeView.strings
  49. BIN
      iOSClient/Supporting Files/sv.lproj/Error.strings
  50. BIN
      iOSClient/Supporting Files/sv.lproj/SwiftWebVC.strings
  51. BIN
      iOSClient/Supporting Files/tr.lproj/BKPasscodeView.strings
  52. BIN
      iOSClient/Supporting Files/tr.lproj/Error.strings
  53. BIN
      iOSClient/Supporting Files/tr.lproj/SwiftWebVC.strings
  54. 39 39
      iOSClient/Utility/CCError.m

+ 0 - 271
Nextcloud.xcodeproj/project.pbxproj

@@ -88,8 +88,6 @@
 		F7145A041D12E3B700CAFEEC /* CCloadItemData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7296A661C8880ED001A7809 /* CCloadItemData.swift */; };
 		F7145A1A1D12E3B700CAFEEC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F7F67BB81A24D27800EE80DA /* Images.xcassets */; };
 		F7145A1C1D12E3B700CAFEEC /* CCMove.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7D02A481C5F9E4400D6F972 /* CCMove.storyboard */; };
-		F7145A1D1D12E3B700CAFEEC /* BKPasscodeView.strings in Resources */ = {isa = PBXBuildFile; fileRef = F72B60911A24F00B004EF66F /* BKPasscodeView.strings */; };
-		F7145A211D12E3B700CAFEEC /* Error.strings in Resources */ = {isa = PBXBuildFile; fileRef = F7B381BF1C074E3E004693F8 /* Error.strings */; };
 		F7145A231D12E3B700CAFEEC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F7E70DE91A24DE4100E1B66A /* Localizable.strings */; };
 		F7169A1C1EE590930086BD69 /* NCShares.m in Sources */ = {isa = PBXBuildFile; fileRef = F7169A181EE590930086BD69 /* NCShares.m */; };
 		F7169A1D1EE590930086BD69 /* NCSharesCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F7169A1A1EE590930086BD69 /* NCSharesCell.m */; };
@@ -124,7 +122,6 @@
 		F72D1040210B77EA009C96B7 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F70A63061D5B3467004E2AA5 /* libcrypto.a */; };
 		F72D1041210B77ED009C96B7 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F70A63071D5B3467004E2AA5 /* libssl.a */; };
 		F72D1042210B783D009C96B7 /* NCEndToEndEncryption.m in Sources */ = {isa = PBXBuildFile; fileRef = F70CAE391F8CF31A008125FD /* NCEndToEndEncryption.m */; };
-		F732B3371E8045A1002B7D75 /* SwiftWebVC.strings in Resources */ = {isa = PBXBuildFile; fileRef = F732B3351E8045A1002B7D75 /* SwiftWebVC.strings */; };
 		F732BA061D76CE1500E9878B /* CCNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = F732BA041D76CE1500E9878B /* CCNetworking.m */; };
 		F732BA0B1D76DBA500E9878B /* CCNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = F732BA041D76CE1500E9878B /* CCNetworking.m */; };
 		F734E5891F019D860060CB77 /* UIScrollView+EmptyDataSet.m in Sources */ = {isa = PBXBuildFile; fileRef = F73CCE241DC13788007E38D8 /* UIScrollView+EmptyDataSet.m */; };
@@ -391,11 +388,9 @@
 		F77B0ED51D118A16002130FE /* PHAsset+Utility.m in Sources */ = {isa = PBXBuildFile; fileRef = F777F0311C29717F00CE81CB /* PHAsset+Utility.m */; };
 		F77B0ED91D118A16002130FE /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F7F67BAD1A24D27800EE80DA /* main.m */; };
 		F77B0EFE1D118A16002130FE /* CCUploadFromOtherUpp.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7956FCB1B4886E60085DEA3 /* CCUploadFromOtherUpp.storyboard */; };
-		F77B0F0E1D118A16002130FE /* BKPasscodeView.strings in Resources */ = {isa = PBXBuildFile; fileRef = F72B60911A24F00B004EF66F /* BKPasscodeView.strings */; };
 		F77B0F2F1D118A16002130FE /* CCMove.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7D02A481C5F9E4400D6F972 /* CCMove.storyboard */; };
 		F77B0F481D118A16002130FE /* synchronized.gif in Resources */ = {isa = PBXBuildFile; fileRef = F76344751BF259A800188725 /* synchronized.gif */; };
 		F77B0F4D1D118A16002130FE /* CCShare.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F768EB021BFB7EA900B6E341 /* CCShare.storyboard */; };
-		F77B0F551D118A16002130FE /* Error.strings in Resources */ = {isa = PBXBuildFile; fileRef = F7B381BF1C074E3E004693F8 /* Error.strings */; };
 		F77B0F571D118A16002130FE /* synchronizedcrypto.gif in Resources */ = {isa = PBXBuildFile; fileRef = F76344761BF259A800188725 /* synchronizedcrypto.gif */; };
 		F77B0F611D118A16002130FE /* Acknowledgements.rtf in Resources */ = {isa = PBXBuildFile; fileRef = F7ACE42B1BAC0268006C0017 /* Acknowledgements.rtf */; };
 		F77B0F631D118A16002130FE /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F7E70DE91A24DE4100E1B66A /* Localizable.strings */; };
@@ -741,11 +736,8 @@
 		F7053E3C1C639DF500741EA5 /* CCUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCUtility.h; sourceTree = "<group>"; };
 		F7053E3D1C639DF500741EA5 /* CCUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCUtility.m; sourceTree = "<group>"; };
 		F70A07C5205285FA00DC1231 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F70A07C6205285FB00DC1231 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F70A07C7205285FB00DC1231 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F70A07C8205285FB00DC1231 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F70A07C9205285FB00DC1231 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F70A07CB205285FB00DC1231 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Error.strings"; sourceTree = "<group>"; };
 		F70A63061D5B3467004E2AA5 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcrypto.a; sourceTree = "<group>"; };
 		F70A63071D5B3467004E2AA5 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libssl.a; sourceTree = "<group>"; };
 		F70BFC7320E0FA7C00C67599 /* NCUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCUtility.swift; sourceTree = "<group>"; };
@@ -762,27 +754,19 @@
 		F710E80D1EF95C9C00DC2427 /* CCIntro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCIntro.h; sourceTree = "<group>"; };
 		F710E80E1EF95C9C00DC2427 /* CCIntro.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCIntro.m; sourceTree = "<group>"; };
 		F710E80F1EF95C9C00DC2427 /* ImagesIntro.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ImagesIntro.xcassets; sourceTree = "<group>"; };
-		F7151A801D477A4B00E6AF45 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F7151A811D477A4B00E6AF45 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F7151A821D477A4B00E6AF45 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F7151A841D477A4B00E6AF45 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Error.strings; sourceTree = "<group>"; };
 		F7169A171EE590930086BD69 /* NCShares.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NCShares.h; sourceTree = "<group>"; };
 		F7169A181EE590930086BD69 /* NCShares.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NCShares.m; sourceTree = "<group>"; };
 		F7169A191EE590930086BD69 /* NCSharesCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NCSharesCell.h; sourceTree = "<group>"; };
 		F7169A1A1EE590930086BD69 /* NCSharesCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NCSharesCell.m; sourceTree = "<group>"; };
 		F7169A1B1EE590930086BD69 /* NCSharesCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCSharesCell.xib; sourceTree = "<group>"; };
 		F7169A2D1EE59BB70086BD69 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F7169A2E1EE59BB70086BD69 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F7169A2F1EE59BB70086BD69 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F7169A301EE59BB70086BD69 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F7169A311EE59BB70086BD69 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F7169A331EE59BB80086BD69 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Error.strings; sourceTree = "<group>"; };
 		F7169A491EE59C630086BD69 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F7169A4A1EE59C640086BD69 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F7169A4B1EE59C640086BD69 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F7169A4C1EE59C640086BD69 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F7169A4D1EE59C640086BD69 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F7169A4F1EE59C640086BD69 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Error.strings; sourceTree = "<group>"; };
 		F7226EDB1EE4089300EBECB1 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		F7229B491DF71BB300E8C4E7 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AUTHORS; sourceTree = SOURCE_ROOT; };
 		F726EEEB1FED1C820030B9C8 /* NCEndToEndInitialize.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCEndToEndInitialize.swift; sourceTree = "<group>"; };
@@ -810,18 +794,11 @@
 		F73049B81CB567F000C7C320 /* NSString+TruncateToWidth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+TruncateToWidth.h"; sourceTree = "<group>"; };
 		F73049B91CB567F000C7C320 /* NSString+TruncateToWidth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+TruncateToWidth.m"; sourceTree = "<group>"; };
 		F7320931201B812F008A0888 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F7320932201B812F008A0888 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F7320933201B812F008A0888 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F7320934201B812F008A0888 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F7320935201B8130008A0888 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F7320937201B8130008A0888 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Error.strings; sourceTree = "<group>"; };
 		F7320938201B81E4008A0888 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F7320939201B81E4008A0888 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F732093A201B81E4008A0888 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F732093B201B81E4008A0888 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F732093C201B81E4008A0888 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F732093E201B81E5008A0888 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/Error.strings"; sourceTree = "<group>"; };
-		F732B3361E8045A1002B7D75 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
 		F732BA031D76CE1500E9878B /* CCNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNetworking.h; sourceTree = "<group>"; };
 		F732BA041D76CE1500E9878B /* CCNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCNetworking.m; sourceTree = "<group>"; };
 		F738E8401F90FFD100F95C8E /* NCManageEndToEndEncryption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NCManageEndToEndEncryption.h; sourceTree = "<group>"; };
@@ -1046,23 +1023,14 @@
 		F75ADF441DC75FFE008A7347 /* CCLogin.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CCLogin.storyboard; sourceTree = "<group>"; };
 		F75AE3C61E9D12900088BB09 /* SwiftyAvatar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftyAvatar.swift; sourceTree = "<group>"; };
 		F75B91DF1ECAE17800199C96 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F75B91E01ECAE17800199C96 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F75B91E11ECAE17800199C96 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F75B91E21ECAE17800199C96 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F75B91E31ECAE17800199C96 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F75B91E51ECAE17800199C96 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Error.strings; sourceTree = "<group>"; };
 		F75B91F41ECAE26300199C96 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F75B91F51ECAE26300199C96 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F75B91F61ECAE26300199C96 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F75B91F71ECAE26300199C96 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F75B91F81ECAE26400199C96 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F75B91FA1ECAE26400199C96 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Error.strings"; sourceTree = "<group>"; };
 		F75B923A1ECAE55E00199C96 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F75B923B1ECAE55E00199C96 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F75B923C1ECAE55E00199C96 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F75B923D1ECAE55E00199C96 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F75B923E1ECAE55E00199C96 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F75B92401ECAE55F00199C96 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Error.strings; sourceTree = "<group>"; };
 		F75CDBF51DF063AD00116AD0 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; name = .gitignore; path = ../.gitignore; sourceTree = "<group>"; };
 		F75EDFBC1E8C112F00E6F369 /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
 		F75EDFBE1E8C116D00E6F369 /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
@@ -1194,113 +1162,59 @@
 		F771E3FB20E23A8700AFB62D /* File_Provider_Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = File_Provider_Extension.entitlements; sourceTree = "<group>"; };
 		F771E3FC20E23A8800AFB62D /* File_Provider_Extension.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = File_Provider_Extension.plist; sourceTree = "<group>"; };
 		F77438E81FCD694900662C46 /* ka-GE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ka-GE"; path = "ka-GE.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F77438E91FCD694900662C46 /* ka-GE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ka-GE"; path = "ka-GE.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F77438EA1FCD694900662C46 /* ka-GE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ka-GE"; path = "ka-GE.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F77438EB1FCD694900662C46 /* ka-GE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ka-GE"; path = "ka-GE.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77438EC1FCD694900662C46 /* ka-GE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ka-GE"; path = "ka-GE.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F77438EE1FCD694900662C46 /* ka-GE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ka-GE"; path = "ka-GE.lproj/Error.strings"; sourceTree = "<group>"; };
 		F77438EF1FCD69D200662C46 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F77438F01FCD69D200662C46 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F77438F11FCD69D200662C46 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F77438F21FCD69D300662C46 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F77438F31FCD69D300662C46 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F77438F51FCD69D300662C46 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Error.strings; sourceTree = "<group>"; };
 		F77438F61FCD6A0D00662C46 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F77438F71FCD6A0D00662C46 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F77438F81FCD6A0D00662C46 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F77438F91FCD6A0D00662C46 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77438FA1FCD6A0E00662C46 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F77438FC1FCD6A0E00662C46 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/Error.strings"; sourceTree = "<group>"; };
 		F77438FD1FCD6B7E00662C46 /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F77438FE1FCD6B7E00662C46 /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F77438FF1FCD6B7F00662C46 /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F77439001FCD6B7F00662C46 /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F77439011FCD6B7F00662C46 /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F77439031FCD6B7F00662C46 /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/Error.strings; sourceTree = "<group>"; };
 		F77439041FCD6BEF00662C46 /* es-CL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CL"; path = "es-CL.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F77439051FCD6BEF00662C46 /* es-CL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CL"; path = "es-CL.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F77439061FCD6BEF00662C46 /* es-CL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CL"; path = "es-CL.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F77439071FCD6BF000662C46 /* es-CL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CL"; path = "es-CL.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77439081FCD6BF000662C46 /* es-CL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CL"; path = "es-CL.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F774390A1FCD6BF000662C46 /* es-CL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CL"; path = "es-CL.lproj/Error.strings"; sourceTree = "<group>"; };
 		F774390B1FCD6C0C00662C46 /* es-CO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CO"; path = "es-CO.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F774390C1FCD6C0C00662C46 /* es-CO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CO"; path = "es-CO.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F774390D1FCD6C0C00662C46 /* es-CO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CO"; path = "es-CO.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F774390E1FCD6C0C00662C46 /* es-CO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CO"; path = "es-CO.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F774390F1FCD6C0D00662C46 /* es-CO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CO"; path = "es-CO.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F77439111FCD6C0D00662C46 /* es-CO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CO"; path = "es-CO.lproj/Error.strings"; sourceTree = "<group>"; };
 		F77439121FCD6C4900662C46 /* es-CR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CR"; path = "es-CR.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F77439131FCD6C4A00662C46 /* es-CR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CR"; path = "es-CR.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F77439141FCD6C4A00662C46 /* es-CR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CR"; path = "es-CR.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F77439151FCD6C4A00662C46 /* es-CR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CR"; path = "es-CR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77439161FCD6C4A00662C46 /* es-CR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CR"; path = "es-CR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F77439181FCD6C4A00662C46 /* es-CR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-CR"; path = "es-CR.lproj/Error.strings"; sourceTree = "<group>"; };
 		F77439191FCD6C6700662C46 /* es-DO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-DO"; path = "es-DO.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F774391A1FCD6C6700662C46 /* es-DO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-DO"; path = "es-DO.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F774391B1FCD6C6700662C46 /* es-DO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-DO"; path = "es-DO.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F774391C1FCD6C6700662C46 /* es-DO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-DO"; path = "es-DO.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F774391D1FCD6C6700662C46 /* es-DO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-DO"; path = "es-DO.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F774391F1FCD6C6800662C46 /* es-DO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-DO"; path = "es-DO.lproj/Error.strings"; sourceTree = "<group>"; };
 		F77439201FCD6C8600662C46 /* es-EC */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-EC"; path = "es-EC.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F77439211FCD6C8600662C46 /* es-EC */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-EC"; path = "es-EC.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F77439221FCD6C8600662C46 /* es-EC */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-EC"; path = "es-EC.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F77439231FCD6C8700662C46 /* es-EC */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-EC"; path = "es-EC.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77439241FCD6C8700662C46 /* es-EC */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-EC"; path = "es-EC.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F77439261FCD6C8700662C46 /* es-EC */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-EC"; path = "es-EC.lproj/Error.strings"; sourceTree = "<group>"; };
 		F77439271FCD6CAA00662C46 /* es-GT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-GT"; path = "es-GT.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F77439281FCD6CAA00662C46 /* es-GT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-GT"; path = "es-GT.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F77439291FCD6CAA00662C46 /* es-GT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-GT"; path = "es-GT.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F774392A1FCD6CAA00662C46 /* es-GT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-GT"; path = "es-GT.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F774392B1FCD6CAA00662C46 /* es-GT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-GT"; path = "es-GT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F774392D1FCD6CAA00662C46 /* es-GT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-GT"; path = "es-GT.lproj/Error.strings"; sourceTree = "<group>"; };
 		F774392E1FCD6CC400662C46 /* es-HN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-HN"; path = "es-HN.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F774392F1FCD6CC400662C46 /* es-HN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-HN"; path = "es-HN.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F77439301FCD6CC400662C46 /* es-HN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-HN"; path = "es-HN.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F77439311FCD6CC400662C46 /* es-HN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-HN"; path = "es-HN.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77439321FCD6CC400662C46 /* es-HN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-HN"; path = "es-HN.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F77439341FCD6CC500662C46 /* es-HN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-HN"; path = "es-HN.lproj/Error.strings"; sourceTree = "<group>"; };
 		F77439351FCD6CDD00662C46 /* es-NI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-NI"; path = "es-NI.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F77439361FCD6CDD00662C46 /* es-NI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-NI"; path = "es-NI.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F77439371FCD6CDE00662C46 /* es-NI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-NI"; path = "es-NI.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F77439381FCD6CDE00662C46 /* es-NI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-NI"; path = "es-NI.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77439391FCD6CDE00662C46 /* es-NI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-NI"; path = "es-NI.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F774393B1FCD6CDE00662C46 /* es-NI */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-NI"; path = "es-NI.lproj/Error.strings"; sourceTree = "<group>"; };
 		F774393C1FCD6D0A00662C46 /* es-PA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PA"; path = "es-PA.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F774393D1FCD6D0A00662C46 /* es-PA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PA"; path = "es-PA.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F774393E1FCD6D0B00662C46 /* es-PA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PA"; path = "es-PA.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F774393F1FCD6D0B00662C46 /* es-PA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PA"; path = "es-PA.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77439401FCD6D0B00662C46 /* es-PA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PA"; path = "es-PA.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F77439421FCD6D0B00662C46 /* es-PA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PA"; path = "es-PA.lproj/Error.strings"; sourceTree = "<group>"; };
 		F77439431FCD6D2200662C46 /* es-PE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PE"; path = "es-PE.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F77439441FCD6D2200662C46 /* es-PE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PE"; path = "es-PE.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F77439451FCD6D2300662C46 /* es-PE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PE"; path = "es-PE.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F77439461FCD6D2300662C46 /* es-PE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PE"; path = "es-PE.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77439471FCD6D2300662C46 /* es-PE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PE"; path = "es-PE.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F77439491FCD6D2300662C46 /* es-PE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PE"; path = "es-PE.lproj/Error.strings"; sourceTree = "<group>"; };
 		F774394A1FCD6D3D00662C46 /* es-PR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PR"; path = "es-PR.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F774394B1FCD6D3D00662C46 /* es-PR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PR"; path = "es-PR.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F774394C1FCD6D3E00662C46 /* es-PR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PR"; path = "es-PR.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F774394D1FCD6D3E00662C46 /* es-PR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PR"; path = "es-PR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F774394E1FCD6D3E00662C46 /* es-PR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PR"; path = "es-PR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F77439501FCD6D3E00662C46 /* es-PR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PR"; path = "es-PR.lproj/Error.strings"; sourceTree = "<group>"; };
 		F77439511FCD6D6100662C46 /* es-PY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PY"; path = "es-PY.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F77439521FCD6D6100662C46 /* es-PY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PY"; path = "es-PY.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F77439531FCD6D6100662C46 /* es-PY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PY"; path = "es-PY.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F77439541FCD6D6100662C46 /* es-PY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PY"; path = "es-PY.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77439551FCD6D6100662C46 /* es-PY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PY"; path = "es-PY.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F77439571FCD6D6200662C46 /* es-PY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-PY"; path = "es-PY.lproj/Error.strings"; sourceTree = "<group>"; };
 		F77439581FCD6D8100662C46 /* es-SV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-SV"; path = "es-SV.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F77439591FCD6D8100662C46 /* es-SV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-SV"; path = "es-SV.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F774395A1FCD6D8200662C46 /* es-SV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-SV"; path = "es-SV.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F774395B1FCD6D8200662C46 /* es-SV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-SV"; path = "es-SV.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F774395C1FCD6D8200662C46 /* es-SV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-SV"; path = "es-SV.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F774395E1FCD6D8200662C46 /* es-SV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-SV"; path = "es-SV.lproj/Error.strings"; sourceTree = "<group>"; };
 		F774395F1FCD6D9C00662C46 /* es-UY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-UY"; path = "es-UY.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F77439601FCD6D9C00662C46 /* es-UY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-UY"; path = "es-UY.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F77439611FCD6D9C00662C46 /* es-UY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-UY"; path = "es-UY.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F77439621FCD6D9C00662C46 /* es-UY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-UY"; path = "es-UY.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F77439631FCD6D9C00662C46 /* es-UY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-UY"; path = "es-UY.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F77439651FCD6D9D00662C46 /* es-UY */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-UY"; path = "es-UY.lproj/Error.strings"; sourceTree = "<group>"; };
 		F774DF0C1FCC26BD002AF9FC /* iTunesArtwork@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iTunesArtwork@1x.png"; sourceTree = "<group>"; };
 		F774DF0D1FCC26BD002AF9FC /* iTunesArtwork@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iTunesArtwork@2x.png"; sourceTree = "<group>"; };
 		F774DF0E1FCC26BE002AF9FC /* iTunesArtwork@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iTunesArtwork@3x.png"; sourceTree = "<group>"; };
@@ -1322,23 +1236,14 @@
 		F78964AC1EBB576C00403E13 /* JDStatusBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JDStatusBarView.m; sourceTree = "<group>"; };
 		F78BFEDE1D31126B00E513CF /* MainInterface.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainInterface.storyboard; sourceTree = "<group>"; };
 		F78D6F431F0B7CB9002F9619 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F78D6F441F0B7CB9002F9619 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F78D6F451F0B7CB9002F9619 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F78D6F461F0B7CB9002F9619 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F78D6F471F0B7CB9002F9619 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F78D6F491F0B7CB9002F9619 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/Error.strings"; sourceTree = "<group>"; };
 		F78D6F4A1F0B7CE4002F9619 /* nb-NO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "nb-NO"; path = "nb-NO.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F78D6F4B1F0B7CE4002F9619 /* nb-NO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "nb-NO"; path = "nb-NO.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F78D6F4C1F0B7CE4002F9619 /* nb-NO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "nb-NO"; path = "nb-NO.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F78D6F4D1F0B7CE4002F9619 /* nb-NO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "nb-NO"; path = "nb-NO.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F78D6F4E1F0B7CE4002F9619 /* nb-NO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "nb-NO"; path = "nb-NO.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F78D6F501F0B7CE5002F9619 /* nb-NO */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "nb-NO"; path = "nb-NO.lproj/Error.strings"; sourceTree = "<group>"; };
 		F78D6F511F0B7D47002F9619 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F78D6F521F0B7D47002F9619 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F78D6F531F0B7D47002F9619 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F78D6F541F0B7D47002F9619 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F78D6F551F0B7D47002F9619 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F78D6F571F0B7D48002F9619 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Error.strings; sourceTree = "<group>"; };
 		F78F6FAE1CC8CCB700F4EA25 /* CCSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSection.h; sourceTree = "<group>"; };
 		F78F6FAF1CC8CCB700F4EA25 /* CCSection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCSection.m; sourceTree = "<group>"; };
 		F78F74332163757000C2ADAD /* NCTrash.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCTrash.storyboard; sourceTree = "<group>"; };
@@ -1384,11 +1289,8 @@
 		F7B0C1731EE839A30033AC24 /* NCAutoUpload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NCAutoUpload.h; sourceTree = "<group>"; };
 		F7B0C1741EE839A30033AC24 /* NCAutoUpload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NCAutoUpload.m; sourceTree = "<group>"; };
 		F7B1A7731EBB3C8000BFB6D1 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F7B1A7741EBB3C8000BFB6D1 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F7B1A7751EBB3C8000BFB6D1 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F7B1A7761EBB3C8000BFB6D1 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F7B1A7771EBB3C8100BFB6D1 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F7B1A7791EBB3C8100BFB6D1 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Error.strings; sourceTree = "<group>"; };
 		F7B1FBB11E72E3D1001781FE /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
 		F7B1FBBF1E72E3D1001781FE /* SwiftModalWebVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftModalWebVC.swift; sourceTree = "<group>"; };
 		F7B1FBC01E72E3D1001781FE /* SwiftWebVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftWebVC.swift; sourceTree = "<group>"; };
@@ -1406,11 +1308,8 @@
 		F7BAADB41ED5A87C00B7EAD4 /* NCDatabase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCDatabase.swift; sourceTree = "<group>"; };
 		F7BAADB51ED5A87C00B7EAD4 /* NCManageDatabase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCManageDatabase.swift; sourceTree = "<group>"; };
 		F7BB04821FD58ACA00BBFD2A /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F7BB04831FD58ACA00BBFD2A /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F7BB04841FD58ACB00BBFD2A /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F7BB04851FD58ACB00BBFD2A /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F7BB04861FD58ACB00BBFD2A /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F7BB04881FD58ACB00BBFD2A /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/Error.strings"; sourceTree = "<group>"; };
 		F7BE6E2B1D2D5C3B00106933 /* CCQuickActions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCQuickActions.h; sourceTree = "<group>"; };
 		F7BE6E2C1D2D5C3B00106933 /* CCQuickActions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCQuickActions.m; sourceTree = "<group>"; };
 		F7BF1B3F1D51E893000854F6 /* CCLogin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCLogin.h; sourceTree = "<group>"; };
@@ -1445,11 +1344,8 @@
 		F7CA1ECE20E7E3FE002CC65E /* NSLayoutConstraint+PKDownloadButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSLayoutConstraint+PKDownloadButton.m"; sourceTree = "<group>"; };
 		F7CA1ECF20E7E3FE002CC65E /* PKPendingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PKPendingView.h; sourceTree = "<group>"; };
 		F7CC04E31F5AD50D00378CEF /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F7CC04E41F5AD50D00378CEF /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F7CC04E51F5AD50D00378CEF /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F7CC04E61F5AD50D00378CEF /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F7CC04E71F5AD50D00378CEF /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F7CC04E91F5AD50E00378CEF /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Error.strings; sourceTree = "<group>"; };
 		F7CD0FF91C8DDA7D006520C5 /* CCSharePermissionOC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSharePermissionOC.h; sourceTree = "<group>"; };
 		F7CD0FFA1C8DDA7D006520C5 /* CCSharePermissionOC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCSharePermissionOC.m; sourceTree = "<group>"; };
 		F7CE8AFA1DC1F8D8009CAE48 /* Nextcloud.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Nextcloud.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1600,46 +1496,28 @@
 		F7D423E91F063B82009C9782 /* CTAssetThumbnailView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTAssetThumbnailView.h; sourceTree = "<group>"; };
 		F7D423EA1F063B82009C9782 /* CTAssetThumbnailView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CTAssetThumbnailView.m; sourceTree = "<group>"; };
 		F7D532431F5D4123006568B1 /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F7D532441F5D4123006568B1 /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F7D532451F5D4123006568B1 /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F7D532461F5D4123006568B1 /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F7D532471F5D4123006568B1 /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F7D532491F5D4124006568B1 /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/Error.strings; sourceTree = "<group>"; };
 		F7D5324A1F5D4137006568B1 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F7D5324B1F5D4137006568B1 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F7D5324C1F5D4137006568B1 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F7D5324D1F5D4137006568B1 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F7D5324E1F5D4137006568B1 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F7D532501F5D4137006568B1 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Error.strings; sourceTree = "<group>"; };
 		F7D532511F5D4155006568B1 /* sk-SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sk-SK"; path = "sk-SK.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F7D532521F5D4155006568B1 /* sk-SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sk-SK"; path = "sk-SK.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F7D532531F5D4155006568B1 /* sk-SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sk-SK"; path = "sk-SK.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F7D532541F5D4155006568B1 /* sk-SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sk-SK"; path = "sk-SK.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F7D532551F5D4155006568B1 /* sk-SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sk-SK"; path = "sk-SK.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F7D532571F5D4156006568B1 /* sk-SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sk-SK"; path = "sk-SK.lproj/Error.strings"; sourceTree = "<group>"; };
 		F7D5328C1F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F7D5328D1F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F7D5328E1F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F7D5328F1F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F7D532901F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F7D532921F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/Error.strings"; sourceTree = "<group>"; };
 		F7D532A11F5D4461006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F7D532A21F5D4461006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F7D532A31F5D4461006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
 		F7D532A41F5D4461006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F7D532A51F5D4461006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F7D532A71F5D4462006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Error.strings"; sourceTree = "<group>"; };
 		F7D6650620FF341600BFBA9E /* NCMainCommon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMainCommon.swift; sourceTree = "<group>"; };
 		F7DC5FE81F011EB700A903C7 /* MGSwipeButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGSwipeButton.h; sourceTree = "<group>"; };
 		F7DC5FE91F011EB700A903C7 /* MGSwipeButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGSwipeButton.m; sourceTree = "<group>"; };
 		F7DC5FEA1F011EB700A903C7 /* MGSwipeTableCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGSwipeTableCell.h; sourceTree = "<group>"; };
 		F7DC5FEB1F011EB700A903C7 /* MGSwipeTableCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGSwipeTableCell.m; sourceTree = "<group>"; };
 		F7DE9AAD1F482FA5008DFE10 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F7DE9AAE1F482FA5008DFE10 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F7DE9AAF1F482FA5008DFE10 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
 		F7DE9AB01F482FA5008DFE10 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F7DE9AB11F482FA5008DFE10 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F7DE9AB31F482FA5008DFE10 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Error.strings; sourceTree = "<group>"; };
 		F7DFE24F1EBDC3A400CF5202 /* Realm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Realm.framework; sourceTree = "<group>"; };
 		F7DFE2501EBDC3A400CF5202 /* RealmSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RealmSwift.framework; sourceTree = "<group>"; };
 		F7E9C41520F4CA870040CF18 /* CCTransfers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTransfers.h; sourceTree = "<group>"; };
@@ -2043,10 +1921,7 @@
 			children = (
 				F7E70DE91A24DE4100E1B66A /* Localizable.strings */,
 				F75797AC1E81356C00187A1B /* CTAssetsPicker.strings */,
-				F732B3351E8045A1002B7D75 /* SwiftWebVC.strings */,
-				F72B60911A24F00B004EF66F /* BKPasscodeView.strings */,
 				F7C6D5F61BE371D800AC83AD /* InfoPlist.strings */,
-				F7B381BF1C074E3E004693F8 /* Error.strings */,
 			);
 			name = Localizations;
 			sourceTree = "<group>";
@@ -3633,8 +3508,6 @@
 				F78BFEE11D31126B00E513CF /* MainInterface.storyboard in Resources */,
 				F7145A1A1D12E3B700CAFEEC /* Images.xcassets in Resources */,
 				F7145A1C1D12E3B700CAFEEC /* CCMove.storyboard in Resources */,
-				F7145A1D1D12E3B700CAFEEC /* BKPasscodeView.strings in Resources */,
-				F7145A211D12E3B700CAFEEC /* Error.strings in Resources */,
 				F7F8D71D1ED6183000E711F3 /* CCCellShareExt.xib in Resources */,
 				F7145A231D12E3B700CAFEEC /* Localizable.strings in Resources */,
 				F700222D1EC479840080073F /* Custom.xcassets in Resources */,
@@ -3675,7 +3548,6 @@
 				F7D4246E1F063B82009C9782 /* CTAssetsPickerController.bundle in Resources */,
 				F762CB991EACB84400B38484 /* icon-success.png in Resources */,
 				F7F54CF81E5B14C700E19C62 /* PlayButtonOverlayLargeTap@2x.png in Resources */,
-				F77B0F0E1D118A16002130FE /* BKPasscodeView.strings in Resources */,
 				F73B4EEE1F470D9100BBEE4B /* Big5Freq.tab in Resources */,
 				F7D4233B1F0596AC009C9782 /* Reader-Button-N.png in Resources */,
 				F7F54CF31E5B14C700E19C62 /* ImageSelectedSmallOn@3x.png in Resources */,
@@ -3716,12 +3588,10 @@
 				F77B0F4D1D118A16002130FE /* CCShare.storyboard in Resources */,
 				F7F54D021E5B14C700E19C62 /* UIBarButtonItemGrid@3x.png in Resources */,
 				F7F54CEA1E5B14C700E19C62 /* ImageSelectedOff@3x.png in Resources */,
-				F732B3371E8045A1002B7D75 /* SwiftWebVC.strings in Resources */,
 				F7F54CF11E5B14C700E19C62 /* ImageSelectedSmallOn.png in Resources */,
 				F762CB1B1EACB66200B38484 /* XLForm.bundle in Resources */,
 				F7CA1ED520E7E3FE002CC65E /* .gitkeep in Resources */,
 				F762CB9A1EACB84400B38484 /* icon-success@2x.png in Resources */,
-				F77B0F551D118A16002130FE /* Error.strings in Resources */,
 				F77B0F571D118A16002130FE /* synchronizedcrypto.gif in Resources */,
 				F7F54CEE1E5B14C700E19C62 /* ImageSelectedSmallOff.png in Resources */,
 				F73B4EF31F470D9100BBEE4B /* GB2312Freq.tab in Resources */,
@@ -4310,100 +4180,6 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
-		F72B60911A24F00B004EF66F /* BKPasscodeView.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				F7151A801D477A4B00E6AF45 /* en */,
-				F7B1A7751EBB3C8000BFB6D1 /* de */,
-				F75B91E11ECAE17800199C96 /* fr */,
-				F75B91F61ECAE26300199C96 /* pt-BR */,
-				F75B923C1ECAE55E00199C96 /* ru */,
-				F7169A2F1EE59BB70086BD69 /* it */,
-				F7169A4B1EE59C640086BD69 /* tr */,
-				F78D6F451F0B7CB9002F9619 /* es-MX */,
-				F78D6F4C1F0B7CE4002F9619 /* nb-NO */,
-				F78D6F531F0B7D47002F9619 /* pl */,
-				F7DE9AAF1F482FA5008DFE10 /* sv */,
-				F7CC04E51F5AD50D00378CEF /* es */,
-				F7D532451F5D4123006568B1 /* is */,
-				F7D5324C1F5D4137006568B1 /* nl */,
-				F7D532531F5D4155006568B1 /* sk-SK */,
-				F7D5328E1F5D443B006568B1 /* en-GB */,
-				F7D532A31F5D4461006568B1 /* zh-Hans */,
-				F77438EA1FCD694900662C46 /* ka-GE */,
-				F77438F11FCD69D200662C46 /* hu */,
-				F77438F81FCD6A0D00662C46 /* zh-Hant-TW */,
-				F77438FF1FCD6B7F00662C46 /* sr */,
-				F77439061FCD6BEF00662C46 /* es-CL */,
-				F774390D1FCD6C0C00662C46 /* es-CO */,
-				F77439141FCD6C4A00662C46 /* es-CR */,
-				F774391B1FCD6C6700662C46 /* es-DO */,
-				F77439221FCD6C8600662C46 /* es-EC */,
-				F77439291FCD6CAA00662C46 /* es-GT */,
-				F77439301FCD6CC400662C46 /* es-HN */,
-				F77439371FCD6CDE00662C46 /* es-NI */,
-				F774393E1FCD6D0B00662C46 /* es-PA */,
-				F77439451FCD6D2300662C46 /* es-PE */,
-				F774394C1FCD6D3E00662C46 /* es-PR */,
-				F77439531FCD6D6100662C46 /* es-PY */,
-				F774395A1FCD6D8200662C46 /* es-SV */,
-				F77439611FCD6D9C00662C46 /* es-UY */,
-				F7BB04841FD58ACB00BBFD2A /* cs-CZ */,
-				F7320933201B812F008A0888 /* ko */,
-				F732093A201B81E4008A0888 /* es-419 */,
-				F70A07C7205285FB00DC1231 /* pt-PT */,
-			);
-			name = BKPasscodeView.strings;
-			path = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		F732B3351E8045A1002B7D75 /* SwiftWebVC.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				F732B3361E8045A1002B7D75 /* en */,
-				F7B1A7741EBB3C8000BFB6D1 /* de */,
-				F75B91E01ECAE17800199C96 /* fr */,
-				F75B91F51ECAE26300199C96 /* pt-BR */,
-				F75B923B1ECAE55E00199C96 /* ru */,
-				F7169A2E1EE59BB70086BD69 /* it */,
-				F7169A4A1EE59C640086BD69 /* tr */,
-				F78D6F441F0B7CB9002F9619 /* es-MX */,
-				F78D6F4B1F0B7CE4002F9619 /* nb-NO */,
-				F78D6F521F0B7D47002F9619 /* pl */,
-				F7DE9AAE1F482FA5008DFE10 /* sv */,
-				F7CC04E41F5AD50D00378CEF /* es */,
-				F7D532441F5D4123006568B1 /* is */,
-				F7D5324B1F5D4137006568B1 /* nl */,
-				F7D532521F5D4155006568B1 /* sk-SK */,
-				F7D5328D1F5D443B006568B1 /* en-GB */,
-				F7D532A21F5D4461006568B1 /* zh-Hans */,
-				F77438E91FCD694900662C46 /* ka-GE */,
-				F77438F01FCD69D200662C46 /* hu */,
-				F77438F71FCD6A0D00662C46 /* zh-Hant-TW */,
-				F77438FE1FCD6B7E00662C46 /* sr */,
-				F77439051FCD6BEF00662C46 /* es-CL */,
-				F774390C1FCD6C0C00662C46 /* es-CO */,
-				F77439131FCD6C4A00662C46 /* es-CR */,
-				F774391A1FCD6C6700662C46 /* es-DO */,
-				F77439211FCD6C8600662C46 /* es-EC */,
-				F77439281FCD6CAA00662C46 /* es-GT */,
-				F774392F1FCD6CC400662C46 /* es-HN */,
-				F77439361FCD6CDD00662C46 /* es-NI */,
-				F774393D1FCD6D0A00662C46 /* es-PA */,
-				F77439441FCD6D2200662C46 /* es-PE */,
-				F774394B1FCD6D3D00662C46 /* es-PR */,
-				F77439521FCD6D6100662C46 /* es-PY */,
-				F77439591FCD6D8100662C46 /* es-SV */,
-				F77439601FCD6D9C00662C46 /* es-UY */,
-				F7BB04831FD58ACA00BBFD2A /* cs-CZ */,
-				F7320932201B812F008A0888 /* ko */,
-				F7320939201B81E4008A0888 /* es-419 */,
-				F70A07C6205285FB00DC1231 /* pt-PT */,
-			);
-			name = SwiftWebVC.strings;
-			path = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		F75797AC1E81356C00187A1B /* CTAssetsPicker.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -4451,53 +4227,6 @@
 			path = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		F7B381BF1C074E3E004693F8 /* Error.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				F7151A841D477A4B00E6AF45 /* en */,
-				F7B1A7791EBB3C8100BFB6D1 /* de */,
-				F75B91E51ECAE17800199C96 /* fr */,
-				F75B91FA1ECAE26400199C96 /* pt-BR */,
-				F75B92401ECAE55F00199C96 /* ru */,
-				F7169A331EE59BB80086BD69 /* it */,
-				F7169A4F1EE59C640086BD69 /* tr */,
-				F78D6F491F0B7CB9002F9619 /* es-MX */,
-				F78D6F501F0B7CE5002F9619 /* nb-NO */,
-				F78D6F571F0B7D48002F9619 /* pl */,
-				F7DE9AB31F482FA5008DFE10 /* sv */,
-				F7CC04E91F5AD50E00378CEF /* es */,
-				F7D532491F5D4124006568B1 /* is */,
-				F7D532501F5D4137006568B1 /* nl */,
-				F7D532571F5D4156006568B1 /* sk-SK */,
-				F7D532921F5D443B006568B1 /* en-GB */,
-				F7D532A71F5D4462006568B1 /* zh-Hans */,
-				F77438EE1FCD694900662C46 /* ka-GE */,
-				F77438F51FCD69D300662C46 /* hu */,
-				F77438FC1FCD6A0E00662C46 /* zh-Hant-TW */,
-				F77439031FCD6B7F00662C46 /* sr */,
-				F774390A1FCD6BF000662C46 /* es-CL */,
-				F77439111FCD6C0D00662C46 /* es-CO */,
-				F77439181FCD6C4A00662C46 /* es-CR */,
-				F774391F1FCD6C6800662C46 /* es-DO */,
-				F77439261FCD6C8700662C46 /* es-EC */,
-				F774392D1FCD6CAA00662C46 /* es-GT */,
-				F77439341FCD6CC500662C46 /* es-HN */,
-				F774393B1FCD6CDE00662C46 /* es-NI */,
-				F77439421FCD6D0B00662C46 /* es-PA */,
-				F77439491FCD6D2300662C46 /* es-PE */,
-				F77439501FCD6D3E00662C46 /* es-PR */,
-				F77439571FCD6D6200662C46 /* es-PY */,
-				F774395E1FCD6D8200662C46 /* es-SV */,
-				F77439651FCD6D9D00662C46 /* es-UY */,
-				F7BB04881FD58ACB00BBFD2A /* cs-CZ */,
-				F7320937201B8130008A0888 /* ko */,
-				F732093E201B81E5008A0888 /* es-419 */,
-				F70A07CB205285FB00DC1231 /* pt-PT */,
-			);
-			name = Error.strings;
-			path = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		F7C6D5F61BE371D800AC83AD /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (

+ 1 - 1
iOSClient/AutoUpload/NCAutoUpload.m

@@ -501,7 +501,7 @@
     } else {
         
         // Activity
-        [[NCManageDatabase sharedInstance] addActivityClient:autoUploadPath fileID:@"" action:k_activityDebugActionAutoUpload selector:selector note:NSLocalizedStringFromTable(@"_not_possible_create_folder_", @"Error", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:appDelegate.activeUrl];
+        [[NCManageDatabase sharedInstance] addActivityClient:autoUploadPath fileID:@"" action:k_activityDebugActionAutoUpload selector:selector note:NSLocalizedString(@"_not_possible_create_folder_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:appDelegate.activeUrl];
         
         if ([selector isEqualToString:selectorUploadAutoUploadAll])
             [appDelegate messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:k_CCErrorInternalError];

+ 22 - 22
iOSClient/Library/BKPasscodeView/BKPasscodeViewController.m

@@ -196,9 +196,9 @@ typedef enum : NSUInteger {
     inputView.enabled = NO;
     
     if (minutes == 1) {
-        inputView.title = NSLocalizedStringFromTable(@"Try again in 1 minute", @"BKPasscodeView", @"1분 후에 다시 시도");
+        inputView.title = NSLocalizedString(@"Try again in 1 minute", nil);
     } else {
-        inputView.title = [NSString stringWithFormat:NSLocalizedStringFromTable(@"Try again in %d minutes", @"BKPasscodeView", @"%d분 후에 다시 시도"), minutes];
+        inputView.title = [NSString stringWithFormat:NSLocalizedString(@"Try again in %d minutes", nil), minutes];
     }
     
     NSUInteger numberOfFailedAttempts = [self.delegate passcodeViewControllerNumberOfFailedAttempts:self];
@@ -314,27 +314,27 @@ typedef enum : NSUInteger {
     switch (self.currentState) {
         case BKPasscodeViewControllerStateCheckPassword:
             if (self.type == BKPasscodeViewControllerChangePasscodeType) {
-                if (self.inputViewTitlePassword) passcodeInputView.title = NSLocalizedStringFromTable(@"Enter your old password", @"BKPasscodeView", @"Enter your old password");
-                else passcodeInputView.title = NSLocalizedStringFromTable(@"Enter your old passcode", @"BKPasscodeView", @"기존 암호 입력");
+                if (self.inputViewTitlePassword) passcodeInputView.title = NSLocalizedString(@"Enter your old password", nil);
+                else passcodeInputView.title = NSLocalizedString(@"Enter your old passcode", nil);
             } else {
-                if (self.inputViewTitlePassword) passcodeInputView.title = NSLocalizedStringFromTable(@"Enter your password", @"BKPasscodeView", @"Enter your password");
-                else passcodeInputView.title = NSLocalizedStringFromTable(@"Enter your passcode", @"BKPasscodeView", @"암호 입력");
+                if (self.inputViewTitlePassword) passcodeInputView.title = NSLocalizedString(@"Enter your password", nil);
+                else passcodeInputView.title = NSLocalizedString(@"Enter your passcode", nil);
             }
             break;
             
         case BKPasscodeViewControllerStateInputPassword:
             if (self.type == BKPasscodeViewControllerChangePasscodeType) {
-                if (self.inputViewTitlePassword) passcodeInputView.title = NSLocalizedStringFromTable(@"Enter your new password", @"BKPasscodeView", @"Enter your new password");
-                else passcodeInputView.title = NSLocalizedStringFromTable(@"Enter your new passcode", @"BKPasscodeView", @"새로운 암호 입력");
+                if (self.inputViewTitlePassword) passcodeInputView.title = NSLocalizedString(@"Enter your new password", nil);
+                else passcodeInputView.title = NSLocalizedString(@"Enter your new passcode", nil);
             } else {
-                if (self.inputViewTitlePassword) passcodeInputView.title = NSLocalizedStringFromTable(@"Enter a password", @"BKPasscodeView", @"Enter a password");
-                else passcodeInputView.title = NSLocalizedStringFromTable(@"Enter a passcode", @"BKPasscodeView", @"암호 입력");
+                if (self.inputViewTitlePassword) passcodeInputView.title = NSLocalizedString(@"Enter a password", nil);
+                else passcodeInputView.title = NSLocalizedString(@"Enter a passcode", nil);
             }
             break;
             
         case BKPasscodeViewControllerStateReinputPassword:
-            if (self.inputViewTitlePassword) passcodeInputView.title = NSLocalizedStringFromTable(@"Re-enter your password", @"BKPasscodeView", @"Re-enter your password");
-            else passcodeInputView.title = NSLocalizedStringFromTable(@"Re-enter your passcode", @"BKPasscodeView", @"암호 재입력");
+            if (self.inputViewTitlePassword) passcodeInputView.title = NSLocalizedString(@"Re-enter your password", nil);
+            else passcodeInputView.title = NSLocalizedString(@"Re-enter your passcode", nil);
             break;
             
         default:
@@ -345,14 +345,14 @@ typedef enum : NSUInteger {
 - (void)showFailedAttemptsCount:(NSUInteger)failCount inputView:(BKPasscodeInputView *)aInputView
 {
     if (failCount == 0) {
-        if (self.inputViewTitlePassword) aInputView.errorMessage = NSLocalizedStringFromTable(@"Invalid Password", @"BKPasscodeView", @"Invalid Password");
-        else aInputView.errorMessage = NSLocalizedStringFromTable(@"Invalid Passcode", @"BKPasscodeView", @"잘못된 암호");
+        if (self.inputViewTitlePassword) aInputView.errorMessage = NSLocalizedString(@"Invalid Password", nil);
+        else aInputView.errorMessage = NSLocalizedString(@"Invalid Passcode", nil);
     } else if (failCount == 1) {
-        if (self.inputViewTitlePassword) aInputView.errorMessage = NSLocalizedStringFromTable(@"1 Failed Password Attempt", @"BKPasscodeView", @"1 Failed Password Attempt");
-        else aInputView.errorMessage = NSLocalizedStringFromTable(@"1 Failed Passcode Attempt", @"BKPasscodeView", @"1번의 암호 입력 시도 실패");
+        if (self.inputViewTitlePassword) aInputView.errorMessage = NSLocalizedString(@"1 Failed Password Attempt", nil);
+        else aInputView.errorMessage = NSLocalizedString(@"1 Failed Passcode Attempt", nil);
     } else {
-        if (self.inputViewTitlePassword) aInputView.errorMessage = [NSString stringWithFormat:NSLocalizedStringFromTable(@"%d Failed Password Attempts", @"BKPasscodeView", @"%d Failed Password Attempts"), failCount];
-        else aInputView.errorMessage = [NSString stringWithFormat:NSLocalizedStringFromTable(@"%d Failed Passcode Attempts", @"BKPasscodeView", @"%d번의 암호 입력 시도 실패"), failCount];
+        if (self.inputViewTitlePassword) aInputView.errorMessage = [NSString stringWithFormat:NSLocalizedString(@"%d Failed Password Attempts", nil), failCount];
+        else aInputView.errorMessage = [NSString stringWithFormat:NSLocalizedString(@"%d Failed Passcode Attempts", nil), failCount];
     }
 }
 
@@ -470,8 +470,8 @@ typedef enum : NSUInteger {
                 
                 aInputView.passcode = nil;
                 
-                if (self.inputViewTitlePassword) aInputView.message = NSLocalizedStringFromTable(@"Enter a different password. Cannot re-use the same password.", @"BKPasscodeView", @"Enter a different password. Cannot re-use the same password.");
-                else aInputView.message = NSLocalizedStringFromTable(@"Enter a different passcode. Cannot re-use the same passcode.", @"BKPasscodeView", @"다른 암호를 입력하십시오. 동일한 암호를 다시 사용할 수 없습니다.");
+                if (self.inputViewTitlePassword) aInputView.message = NSLocalizedString(@"Enter a different password. Cannot re-use the same password.", nil);
+                else aInputView.message = NSLocalizedString(@"Enter a different passcode. Cannot re-use the same passcode.", nil);
                 
             } else {
                 
@@ -510,8 +510,8 @@ typedef enum : NSUInteger {
                 
                 [self updatePasscodeInputViewTitle:newPasscodeInputView];
                 
-                if (self.inputViewTitlePassword) newPasscodeInputView.message = NSLocalizedStringFromTable(@"Password did not match.\nTry again.", @"BKPasscodeView", @"Password did not match.\nTry again.");
-                else newPasscodeInputView.message = NSLocalizedStringFromTable(@"Passcodes did not match.\nTry again.", @"BKPasscodeView", @"암호가 일치하지 않습니다.\n다시 시도하십시오.");
+                if (self.inputViewTitlePassword) newPasscodeInputView.message = NSLocalizedString(@"Password did not match.\nTry again.", nil);
+                else newPasscodeInputView.message = NSLocalizedString(@"Passcodes did not match.\nTry again.", nil);
                 
                 [self.shiftingView showView:newPasscodeInputView withDirection:BKShiftingDirectionBackward];
                 

+ 3 - 3
iOSClient/Library/BKPasscodeView/BKTouchIDSwitchView.m

@@ -40,12 +40,12 @@
     self.messageLabel.numberOfLines = 0;
     self.messageLabel.lineBreakMode = NSLineBreakByWordWrapping;
     self.messageLabel.textAlignment = NSTextAlignmentCenter;
-    self.messageLabel.text = NSLocalizedStringFromTable(@"Do you want to use Touch ID for authentication?", @"BKPasscodeView", @"Touch ID를 사용하시겠습니까?");
+    self.messageLabel.text = NSLocalizedString(@"Do you want to use Touch ID for authentication?", nil);
     self.messageLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline];
     [self addSubview:self.messageLabel];
     
     self.titleLabel = [[UILabel alloc] init];
-    self.titleLabel.text = NSLocalizedStringFromTable(@"Enable Touch ID", @"BKPasscodeView", @"Touch ID 사용");
+    self.titleLabel.text = NSLocalizedString(@"Enable Touch ID", nil);
     self.titleLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
     [self addSubview:self.titleLabel];
     
@@ -54,7 +54,7 @@
     
     self.doneButton = [UIButton buttonWithType:UIButtonTypeSystem];
     [self.doneButton.titleLabel setFont:[UIFont systemFontOfSize:20.f]];
-    [self.doneButton setTitle:NSLocalizedStringFromTable(@"Done", @"BKPasscodeView", @"확인") forState:UIControlStateNormal];
+    [self.doneButton setTitle:NSLocalizedString(@"Done", nil) forState:UIControlStateNormal];
     [self.doneButton addTarget:self action:@selector(doneButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
     [self addSubview:self.doneButton];
 }

+ 43 - 43
iOSClient/Library/OCCommunicationLib/OCCommunication.m

@@ -1491,7 +1491,7 @@
             successRequest(response, capabilities, request.redirectedServer);
             
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -1671,12 +1671,12 @@
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
     
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -1740,12 +1740,12 @@
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
 
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -1881,13 +1881,13 @@
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
             
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
 
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -1954,13 +1954,13 @@
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
             
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -2050,13 +2050,13 @@
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
             
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -2104,20 +2104,20 @@
                     successRequest(response, publicKey, request.redirectedServer);
                     
                 } else {
-                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
                 }
                 
             } else {
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
             
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -2162,18 +2162,18 @@
                     successRequest(response, privateKeyChiper, request.redirectedServer);
                     
                 } else {
-                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
                 }
             } else {
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -2218,18 +2218,18 @@
                     successRequest(response, publicKey, request.redirectedServer);
                     
                 } else {
-                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
                 }
             } else {
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
         //Return success
@@ -2276,18 +2276,18 @@
                     successRequest(response, publicKey, request.redirectedServer);
                     
                 } else {
-                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
                 }
             } else {
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -2332,19 +2332,19 @@
                     successRequest(response, privateKey, request.redirectedServer);
                     
                 } else {
-                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
                 }
                 
             } else {
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -2478,18 +2478,18 @@
                     successRequest(response, token, request.redirectedServer);
                     
                 } else {
-                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_",  nil)], request.redirectedServer);
                 }
             } else {
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -2555,17 +2555,17 @@
                     successRequest(response, encryptedMetadata, request.redirectedServer);
                     
                 } else {
-                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
                 }
             } else {
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -2612,18 +2612,18 @@
                     successRequest(response, encryptedMetadata, request.redirectedServer);
                     
                 } else {
-                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
                 }
             } else {
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -2671,18 +2671,18 @@
                     successRequest(response, encryptedMetadata, request.redirectedServer);
                     
                 } else {
-                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
                 }
             } else {
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -2748,20 +2748,20 @@
                     successRequest(response, link, request.redirectedServer);
                     
                 } else {
-                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+                    failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
                 }
                 
             } else {
                 
                 NSString *message = (NSString *)[meta objectForKey:@"message"];
                 if ([message isKindOfClass:[NSNull class]]) {
-                    message = NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_response_error_", nil);
                 }
                 failureRequest(response, [UtilsFramework getErrorWithCode:statusCode andCustomMessageFromTheServer:message], request.redirectedServer);
             }
             
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
   
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
@@ -2796,11 +2796,11 @@
                 successRequest(response, url, request.redirectedServer);
                     
             } else {
-                failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+                failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
             }
                 
         } else {
-            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedStringFromTable(@"_server_response_error_", @"Error", nil)], request.redirectedServer);
+            failureRequest(response, [UtilsFramework getErrorWithCode:k_CCErrorWebdavResponseError andCustomMessageFromTheServer:NSLocalizedString(@"_server_response_error_", nil)], request.redirectedServer);
         }
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {

+ 1 - 1
iOSClient/Login/CCLogin.m

@@ -379,7 +379,7 @@
             
             if (errorCode != NSURLErrorServerCertificateUntrusted) {
                 
-                NSString *messageAlert = [NSString stringWithFormat:@"%@.\n%@", NSLocalizedStringFromTable(@"_not_possible_connect_to_server_", @"Error", nil), message];
+                NSString *messageAlert = [NSString stringWithFormat:@"%@.\n%@", NSLocalizedString(@"_not_possible_connect_to_server_", nil), message];
                 
                 UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"_error_", nil) message:messageAlert preferredStyle:UIAlertControllerStyleAlert];
                 UIAlertAction *okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"_ok_", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {}];

+ 57 - 57
iOSClient/Networking/OCNetworking.m

@@ -153,7 +153,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
     
@@ -196,7 +196,7 @@
                 
                 // Error
                 if (errorCode == 503)
-                    message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+                    message = NSLocalizedString(@"_server_error_retry_", nil);
                 else
                     message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
                 
@@ -302,7 +302,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         
@@ -346,7 +346,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         
@@ -393,7 +393,7 @@
             
             // Error
             if (errorCode == 503)
-                message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+                message = NSLocalizedString(@"_server_error_retry_", nil);
             else
                 message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
             
@@ -445,7 +445,7 @@
             
             // Error
             if (errorCode == 503)
-                message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+                message = NSLocalizedString(@"_server_error_retry_", nil);
             else
                 message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
             
@@ -491,7 +491,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:account]) {
             
-            failure(NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil), k_CCErrorUserNotAvailble);
+            failure(NSLocalizedString(@"_error_user_not_available_", nil), k_CCErrorUserNotAvailble);
             
         } else {
             
@@ -503,7 +503,7 @@
                 
                 [appDelegate messageNotification:@"Server error" description:@"Read Folder WebDAV : [items NULL] please fix" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:k_CCErrorInternalError];
 #endif
-                failure(NSLocalizedStringFromTable(@"Read Folder WebDAV : [items NULL] please fix", @"Server error", nil), k_CCErrorInternalError);
+                failure(NSLocalizedString(@"Read Folder WebDAV : [items NULL] please fix", nil), k_CCErrorInternalError);
 
             } else {
                 
@@ -603,7 +603,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         
@@ -662,7 +662,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:account]) {
             
-            failure(NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil), k_CCErrorUserNotAvailble);
+            failure(NSLocalizedString(@"_error_user_not_available_", nil), k_CCErrorUserNotAvailble);
             
         } else {
             
@@ -686,7 +686,7 @@
                     
                 } else {
                     
-                    failure(NSLocalizedStringFromTable(@"Directory not found", @"Error", nil), k_CCErrorInternalError);
+                    failure(NSLocalizedString(@"Directory not found", nil), k_CCErrorInternalError);
                 }
             }
             
@@ -698,7 +698,7 @@
                 
                 [appDelegate messageNotification:@"Server error" description:@"Read File WebDAV : [items NULL] please fix" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:k_CCErrorInternalError];
 #endif
-                failure(NSLocalizedStringFromTable(@"Read File WebDAV : [items NULL] please fix", @"Server error", nil), k_CCErrorInternalError);
+                failure(NSLocalizedString(@"Read File WebDAV : [items NULL] please fix", nil), k_CCErrorInternalError);
             }
         }
         
@@ -712,7 +712,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         
@@ -757,7 +757,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:_metadataNet.account]) {
             if ([self.delegate respondsToSelector:@selector(searchSuccessFailure:metadatas:message:errorCode:)])
-                [self.delegate searchSuccessFailure:_metadataNet metadatas:nil message:NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil) errorCode:k_CCErrorUserNotAvailble];
+                [self.delegate searchSuccessFailure:_metadataNet metadatas:nil message:NSLocalizedString(@"_error_user_not_available_", nil) errorCode:k_CCErrorUserNotAvailble];
 
             [self complete];
             return;
@@ -830,7 +830,7 @@
         if ([self.delegate respondsToSelector:@selector(searchSuccessFailure:metadatas:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate searchSuccessFailure:_metadataNet metadatas:nil message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate searchSuccessFailure:_metadataNet metadatas:nil message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate searchSuccessFailure:_metadataNet metadatas:nil message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -870,7 +870,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         
@@ -902,7 +902,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:account]) {
             
-            failure(NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil), k_CCErrorUserNotAvailble);
+            failure(NSLocalizedString(@"_error_user_not_available_", nil), k_CCErrorUserNotAvailble);
             
         } else {
         
@@ -982,7 +982,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
 
@@ -1016,7 +1016,7 @@
 
         if (![[[NCManageDatabase sharedInstance] getAccountActive].account isEqualToString:account]) {
             
-            failure(NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil), k_CCErrorUserNotAvailble);
+            failure(NSLocalizedString(@"_error_user_not_available_", nil), k_CCErrorUserNotAvailble);
             
         } else {
             
@@ -1046,7 +1046,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [[NCManageDatabase sharedInstance] addActivityClient:path fileID:@"" action:k_activityDebugActionCreateFolder selector:@"" note:NSLocalizedStringFromTable(@"_not_possible_create_folder_", @"Error", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:_activeUrl];
+        [[NCManageDatabase sharedInstance] addActivityClient:path fileID:@"" action:k_activityDebugActionCreateFolder selector:@"" note:NSLocalizedString(@"_not_possible_create_folder_", nil) type:k_activityTypeFailure verbose:k_activityVerboseDefault activeUrl:_activeUrl];
 
         failure(message, errorCode);
 
@@ -1058,9 +1058,9 @@
             message = nil;
         else {
             if (error.code == OCErrorForbidenCharacters)
-                message = NSLocalizedStringFromTable(@"_forbidden_characters_from_server_", @"Error", nil);
+                message = NSLocalizedString(@"_forbidden_characters_from_server_", nil);
             else
-                message = NSLocalizedStringFromTable(@"_unknow_response_server_", @"Error", nil);
+                message = NSLocalizedString(@"_unknow_response_server_", nil);
         }
         
         failure(message, error.code);
@@ -1094,7 +1094,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         
@@ -1163,13 +1163,13 @@
         NSString *message;
         
         if (error.code == OCErrorMovingTheDestinyAndOriginAreTheSame) {
-            message = NSLocalizedStringFromTable(@"_error_folder_destiny_is_the_same_", @"Error", nil);
+            message = NSLocalizedString(@"_error_folder_destiny_is_the_same_", nil);
         } else if (error.code == OCErrorMovingFolderInsideHimself) {
-            message = NSLocalizedStringFromTable(@"_error_folder_destiny_is_the_same_", @"Error", nil);
+            message = NSLocalizedString(@"_error_folder_destiny_is_the_same_", nil);
         } else if (error.code == OCErrorMovingDestinyNameHaveForbiddenCharacters) {
-            message = NSLocalizedStringFromTable(@"_forbidden_characters_from_server_", @"Error", nil);
+            message = NSLocalizedString(@"_forbidden_characters_from_server_", nil);
         } else {
-            message = NSLocalizedStringFromTable(@"_unknow_response_server_", @"Error", nil);
+            message = NSLocalizedString(@"_unknow_response_server_", nil);
         }
         
         failure(message, error.code);
@@ -1195,7 +1195,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:_metadataNet.account]) {
             if ([self.delegate respondsToSelector:@selector(shareFailure:message:errorCode:)])
-                [self.delegate shareFailure:_metadataNet message:NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil) errorCode:k_CCErrorUserNotAvailble];
+                [self.delegate shareFailure:_metadataNet message:NSLocalizedString(@"_error_user_not_available_", nil) errorCode:k_CCErrorUserNotAvailble];
             
             [self complete];
             return;
@@ -1232,7 +1232,7 @@
         if ([self.delegate respondsToSelector:@selector(shareFailure:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate shareFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate shareFailure:_metadataNet message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate shareFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1267,7 +1267,7 @@
         if ([self.delegate respondsToSelector:@selector(shareFailure:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate shareFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate shareFailure:_metadataNet message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate shareFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1303,7 +1303,7 @@
         if ([self.delegate respondsToSelector:@selector(shareFailure:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate shareFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate shareFailure:_metadataNet message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate shareFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1343,7 +1343,7 @@
         if ([self.delegate respondsToSelector:@selector(shareFailure:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate shareFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate shareFailure:_metadataNet message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate shareFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1384,7 +1384,7 @@
         if ([self.delegate respondsToSelector:@selector(shareFailure:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate shareFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate shareFailure:_metadataNet message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate shareFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1421,7 +1421,7 @@
         if ([self.delegate respondsToSelector:@selector(getUserAndGroupFailure:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate getUserAndGroupFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate getUserAndGroupFailure:_metadataNet message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate getUserAndGroupFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1449,7 +1449,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:_metadataNet.account]) {
             if ([self.delegate respondsToSelector:@selector(getSharePermissionsFileFailure:message:errorCode:)])
-                [self.delegate getSharePermissionsFileFailure:_metadataNet message:NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil) errorCode:k_CCErrorUserNotAvailble];
+                [self.delegate getSharePermissionsFileFailure:_metadataNet message:NSLocalizedString(@"_error_user_not_available_", nil) errorCode:k_CCErrorUserNotAvailble];
             
             [self complete];
             return;
@@ -1470,7 +1470,7 @@
         if ([self.delegate respondsToSelector:@selector(getSharePermissionsFileFailure:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate getSharePermissionsFileFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate getSharePermissionsFileFailure:_metadataNet message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate getSharePermissionsFileFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1526,7 +1526,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         
@@ -1551,7 +1551,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:_metadataNet.account]) {
             if ([self.delegate respondsToSelector:@selector(getExternalSitesServerSuccessFailure:listOfExternalSites:message:errorCode:)])
-                [self.delegate getExternalSitesServerSuccessFailure:_metadataNet listOfExternalSites:nil message:NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil) errorCode:k_CCErrorUserNotAvailble];
+                [self.delegate getExternalSitesServerSuccessFailure:_metadataNet listOfExternalSites:nil message:NSLocalizedString(@"_error_user_not_available_", nil) errorCode:k_CCErrorUserNotAvailble];
             
             [self complete];
             return;
@@ -1572,7 +1572,7 @@
         if ([self.delegate respondsToSelector:@selector(getExternalSitesServerSuccessFailure:listOfExternalSites:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate getExternalSitesServerSuccessFailure:_metadataNet listOfExternalSites:nil message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate getExternalSitesServerSuccessFailure:_metadataNet listOfExternalSites:nil message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate getExternalSitesServerSuccessFailure:_metadataNet listOfExternalSites:nil message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1611,7 +1611,7 @@
         if ([self.delegate respondsToSelector:@selector(getExternalSitesServerFailure:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate getExternalSitesServerFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate getExternalSitesServerFailure:_metadataNet message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate getExternalSitesServerFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1643,7 +1643,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:_metadataNet.account]) {
             if ([self.delegate respondsToSelector:@selector(getNotificationServerSuccessFailure:listOfNotifications:message:errorCode:)])
-                [self.delegate getNotificationServerSuccessFailure:_metadataNet listOfNotifications:nil message:NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil) errorCode:k_CCErrorUserNotAvailble];
+                [self.delegate getNotificationServerSuccessFailure:_metadataNet listOfNotifications:nil message:NSLocalizedString(@"_error_user_not_available_",  nil) errorCode:k_CCErrorUserNotAvailble];
             
             [self complete];
             return;
@@ -1664,7 +1664,7 @@
         if ([self.delegate respondsToSelector:@selector(getNotificationServerSuccessFailure:listOfNotifications:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate getNotificationServerSuccessFailure:_metadataNet listOfNotifications:nil message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate getNotificationServerSuccessFailure:_metadataNet listOfNotifications:nil message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate getNotificationServerSuccessFailure:_metadataNet listOfNotifications:nil message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1695,7 +1695,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:_metadataNet.account]) {
             if ([self.delegate respondsToSelector:@selector(setNotificationServerSuccessFailure:message:errorCode:)])
-                [self.delegate setNotificationServerSuccessFailure:_metadataNet message:NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil) errorCode:k_CCErrorUserNotAvailble];
+                [self.delegate setNotificationServerSuccessFailure:_metadataNet message:NSLocalizedString(@"_error_user_not_available_", nil) errorCode:k_CCErrorUserNotAvailble];
             
             [self complete];
             return;
@@ -1716,7 +1716,7 @@
         if ([self.delegate respondsToSelector:@selector(setNotificationServerSuccessFailure:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate setNotificationServerSuccessFailure:_metadataNet message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate setNotificationServerSuccessFailure:_metadataNet message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate setNotificationServerSuccessFailure:_metadataNet message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1765,7 +1765,7 @@
             
             // Error
             if (errorCode == 503)
-                message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+                message = NSLocalizedString(@"_server_error_retry_", nil);
             else
                 message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
             
@@ -1785,7 +1785,7 @@
     
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
 
@@ -1819,7 +1819,7 @@
             
             // Error
             if (errorCode == 503)
-                message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+                message = NSLocalizedString(@"_server_error_retry_", nil);
             else
                 message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
             
@@ -1839,7 +1839,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         
@@ -1867,7 +1867,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:_metadataNet.account]) {
             if ([self.delegate respondsToSelector:@selector(getUserProfileSuccessFailure:userProfile:message:errorCode:)])
-                [self.delegate getUserProfileSuccessFailure:_metadataNet userProfile:nil message:NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil) errorCode:k_CCErrorUserNotAvailble];
+                [self.delegate getUserProfileSuccessFailure:_metadataNet userProfile:nil message:NSLocalizedString(@"_error_user_not_available_", nil) errorCode:k_CCErrorUserNotAvailble];
             
             [self complete];
             return;
@@ -1888,7 +1888,7 @@
         if ([self.delegate respondsToSelector:@selector(getUserProfileSuccessFailure:userProfile:message:errorCode:)]) {
             
             if (errorCode == 503)
-                [self.delegate getUserProfileSuccessFailure:_metadataNet userProfile:nil message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate getUserProfileSuccessFailure:_metadataNet userProfile:nil message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate getUserProfileSuccessFailure:_metadataNet userProfile:nil message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -1918,7 +1918,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:_metadataNet.account]) {
             if ([self.delegate respondsToSelector:@selector(getCapabilitiesOfServerSuccessFailure:capabilities:message:errorCode:)])
-                [self.delegate getCapabilitiesOfServerSuccessFailure:_metadataNet capabilities:nil message:NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil) errorCode:k_CCErrorUserNotAvailble];
+                [self.delegate getCapabilitiesOfServerSuccessFailure:_metadataNet capabilities:nil message:NSLocalizedString(@"_error_user_not_available_", nil) errorCode:k_CCErrorUserNotAvailble];
             
             [self complete];
             return;
@@ -1939,7 +1939,7 @@
         if ([self.delegate respondsToSelector:@selector(getCapabilitiesOfServerSuccessFailure:capabilities:message:errorCode:)]) {
 
             if (errorCode == 503)
-                [self.delegate getCapabilitiesOfServerSuccessFailure:_metadataNet capabilities:nil message:NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil) errorCode:errorCode];
+                [self.delegate getCapabilitiesOfServerSuccessFailure:_metadataNet capabilities:nil message:NSLocalizedString(@"_server_error_retry_", nil) errorCode:errorCode];
             else
                 [self.delegate getCapabilitiesOfServerSuccessFailure:_metadataNet capabilities:nil message:[error.userInfo valueForKey:@"NSLocalizedDescription"] errorCode:errorCode];
         }
@@ -2224,7 +2224,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         
@@ -2258,7 +2258,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         
@@ -2286,7 +2286,7 @@
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         if (![recordAccount.account isEqualToString:account]) {
             
-            failure(NSLocalizedStringFromTable(@"_error_user_not_available_", @"Error", nil), k_CCErrorUserNotAvailble);
+            failure(NSLocalizedString(@"_error_user_not_available_", nil), k_CCErrorUserNotAvailble);
             
         } else {
             
@@ -2298,7 +2298,7 @@
                 
                 [appDelegate messageNotification:@"Server error" description:@"Read Folder WebDAV : [items NULL] please fix" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:k_CCErrorInternalError];
 #endif
-                failure(NSLocalizedStringFromTable(@"Read Folder WebDAV : [items NULL] please fix", @"Server error", nil), k_CCErrorInternalError);
+                failure(NSLocalizedString(@"Read Folder WebDAV : [items NULL] please fix", nil), k_CCErrorInternalError);
                 
             } else {
                 
@@ -2343,7 +2343,7 @@
         
         // Error
         if (errorCode == 503)
-            message = NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            message = NSLocalizedString(@"_server_error_retry_", nil);
         else
             message = [error.userInfo valueForKey:@"NSLocalizedDescription"];
         

BIN
iOSClient/Supporting Files/cs-CZ.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/cs-CZ.lproj/Error.strings


BIN
iOSClient/Supporting Files/cs-CZ.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/de.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/de.lproj/Error.strings


BIN
iOSClient/Supporting Files/de.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/en.lproj/BKPasscodeView.strings


+ 0 - 57
iOSClient/Supporting Files/en.lproj/Error.strings

@@ -1,57 +0,0 @@
-//
-//  Error.strings
-//  Nextcloud iOS
-//
-//  Copyright (c) 2017 TWS. All rights reserved.
-//
-//  Author Marino Faggiana <m.faggiana@twsweb.it>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-
-"_bad_username_password_"               = "Wrong username or password";
-"_cancelled_by_user"                    = "Transfer canceled";
-"_error_folder_destiny_is_the_same_"    = "It is not possible to move the folder into itself";
-"_error_not_permission_"                = "You don't have permission to complete the operation";
-"_error_path_"                          = "Unable to open this file or folder. Please make sure it exists";
-"_file_upload_not_exitst_"              = "The file that you want to upload does not exist";
-"_forbidden_characters_from_server_"    = "The name contains at least one invalid character";
-"_not_connected_internet_"              = "Server connection error";
-"_not_possible_connect_to_server_"      = "It is not possible to connect to the server at this time";
-"_not_possible_create_folder_"          = "Folder could not be created";
-"_server_down_"                         = "Could not establish contact with server";
-"_time_out_"                            = "Timeout, try again";
-"_unknow_response_server_"              = "Unexpected response from server";
-"_user_autentication_required_"         = "User autentication required";
-"_file_directory_locked_"               = "File or directory locked";
-"_ssl_certificate_untrusted_"           = "The certificate for this server is invalid";
-"_internal_server_"                     = "Internal server error";
-"_file_already_exists_"                 = "Could not complete the operation, a file with the same name exists";
-"_file_folder_not_exists_"              = "The source file wasn't found at the specified path";
-"_folder_contents_nochanged_"           = "The folder contents have not changed";
-"_images_invalid_converted_"            = "The image is invalid and cannot be converted to a thumbnail";
-"_method_not_expected_"                 = "Unexpected request method";
-"_reauthenticate_user_"                 = "Access expired, log in again";
-"_server_error_retry_"                  = "The server is temporarily unavailable";
-"_too_many_files_"                      = "Too many files would be involved in this operation";
-"_too_many_request_"                    = "Sending too many requests caused the rate limit to be reached";
-"_user_over_quota_"                     = "Storage quota is reached";
-"_ssl_connection_error_"                = "Connection SSL error, try again";
-"_bad_request_"                         = "Bad request";
-"_webdav_locked_"                       = "WebDAV Locked: Trying to access locked resource";
-"_error_user_not_available_"            = "The user is no longer available";
-"_server_response_error_"               = "Server response content error";
-
-

+ 77 - 0
iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -615,3 +615,80 @@
 "_sign_up_"             = "Sign up with provider";
 "_host_your_own_server" = "Host your own server";
 
+// Error
+
+"_bad_username_password_"               = "Wrong username or password";
+"_cancelled_by_user"                    = "Transfer canceled";
+"_error_folder_destiny_is_the_same_"    = "It is not possible to move the folder into itself";
+"_error_not_permission_"                = "You don't have permission to complete the operation";
+"_error_path_"                          = "Unable to open this file or folder. Please make sure it exists";
+"_file_upload_not_exitst_"              = "The file that you want to upload does not exist";
+"_forbidden_characters_from_server_"    = "The name contains at least one invalid character";
+"_not_connected_internet_"              = "Server connection error";
+"_not_possible_connect_to_server_"      = "It is not possible to connect to the server at this time";
+"_not_possible_create_folder_"          = "Folder could not be created";
+"_server_down_"                         = "Could not establish contact with server";
+"_time_out_"                            = "Timeout, try again";
+"_unknow_response_server_"              = "Unexpected response from server";
+"_user_autentication_required_"         = "User autentication required";
+"_file_directory_locked_"               = "File or directory locked";
+"_ssl_certificate_untrusted_"           = "The certificate for this server is invalid";
+"_internal_server_"                     = "Internal server error";
+"_file_already_exists_"                 = "Could not complete the operation, a file with the same name exists";
+"_file_folder_not_exists_"              = "The source file wasn't found at the specified path";
+"_folder_contents_nochanged_"           = "The folder contents have not changed";
+"_images_invalid_converted_"            = "The image is invalid and cannot be converted to a thumbnail";
+"_method_not_expected_"                 = "Unexpected request method";
+"_reauthenticate_user_"                 = "Access expired, log in again";
+"_server_error_retry_"                  = "The server is temporarily unavailable";
+"_too_many_files_"                      = "Too many files would be involved in this operation";
+"_too_many_request_"                    = "Sending too many requests caused the rate limit to be reached";
+"_user_over_quota_"                     = "Storage quota is reached";
+"_ssl_connection_error_"                = "Connection SSL error, try again";
+"_bad_request_"                         = "Bad request";
+"_webdav_locked_"                       = "WebDAV Locked: Trying to access locked resource";
+"_error_user_not_available_"            = "The user is no longer available";
+"_server_response_error_"               = "Server response content error";
+
+// BKPasscode
+
+"%d Failed Passcode Attempts" = "%d failed passcode attempts";
+"%d Failed Password Attempts" = "%d failed password attempts";
+
+"1 Failed Passcode Attempt" = "1 failed passcode attempt";
+"1 Failed Password Attempt" = "1 failed password attempt";
+
+"Do you want to use Touch ID for authentication?" = "Do you want to use Touch/Face ID for authentication?";
+
+"Done" = "Done";
+
+"Enable Touch ID" = "Enable Touch/Face ID";
+
+"Enter a different passcode. Cannot re-use the same passcode." = "Enter a different passcode. Cannot re-use the same passcode.";
+"Enter a different password. Cannot re-use the same password." = "Enter a different password. Cannot re-use the same password.";
+
+"Enter a passcode" = "Enter a passcode";
+"Enter a password" = "Enter a password";
+
+"Enter your new passcode" = "Enter your new passcode";
+"Enter your new password" = "Enter your new password";
+
+"Enter your old passcode" = "Enter your old passcode";
+"Enter your old password" = "Enter your old password";
+
+"Enter your passcode" = "Enter your passcode";
+"Enter your password" = "Enter your password";
+
+"Invalid Passcode" = "Invalid passcode";
+"Invalid Password" = "Invalid password";
+
+"Passcodes did not match.\nTry again." = "Passcodes did not match.\nTry again.";
+"Password did not match.\nTry again." = "Password did not match.\nTry again.";
+
+"Re-enter your passcode" = "Re-enter your passcode";
+"Re-enter your password" = "Re-enter your password";
+
+"Try again in %d minutes" = "Try again in %d minutes";
+
+"Try again in 1 minute" = "Try again in 1 minute";
+

+ 0 - 24
iOSClient/Supporting Files/en.lproj/SwiftWebVC.strings

@@ -1,24 +0,0 @@
-//
-//  SwiftWebVC.strings
-//  Nextcloud iOS
-//
-//  Copyright (c) 2017 TWS. All rights reserved.
-//
-//  Author Marino Faggiana <m.faggiana@twsweb.it>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-"Open in Safari" = "Open in Safari";
-"Open in Chrome" = "Open in Chrome";

BIN
iOSClient/Supporting Files/es.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es.lproj/Error.strings


BIN
iOSClient/Supporting Files/es.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/fr.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/fr.lproj/Error.strings


BIN
iOSClient/Supporting Files/fr.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/is.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/is.lproj/Error.strings


BIN
iOSClient/Supporting Files/is.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/it.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/it.lproj/Error.strings


BIN
iOSClient/Supporting Files/it.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/nb-NO.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/nb-NO.lproj/Error.strings


BIN
iOSClient/Supporting Files/nb-NO.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/nl.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/nl.lproj/Error.strings


BIN
iOSClient/Supporting Files/nl.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/pt-BR.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/pt-BR.lproj/Error.strings


BIN
iOSClient/Supporting Files/pt-BR.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/ru.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/ru.lproj/Error.strings


BIN
iOSClient/Supporting Files/ru.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/sk-SK.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/sk-SK.lproj/Error.strings


BIN
iOSClient/Supporting Files/sk-SK.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/sr.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/sr.lproj/Error.strings


BIN
iOSClient/Supporting Files/sr.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/sv.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/sv.lproj/Error.strings


BIN
iOSClient/Supporting Files/sv.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/tr.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/tr.lproj/Error.strings


BIN
iOSClient/Supporting Files/tr.lproj/SwiftWebVC.strings


+ 39 - 39
iOSClient/Utility/CCError.m

@@ -30,58 +30,58 @@
     switch (errorCode) {
             
         case kCFURLErrorCancelled:                      // -999
-            return NSLocalizedStringFromTable(@"_cancelled_by_user", @"Error", nil);
+            return NSLocalizedString(@"_cancelled_by_user", nil);
             break;
         case kCFURLErrorTimedOut:                       // -1001
-            return NSLocalizedStringFromTable(@"_time_out_", @"Error", nil);
+            return NSLocalizedString(@"_time_out_", nil);
             break;
         case kCFURLErrorCannotConnectToHost:            // -1004
-            return NSLocalizedStringFromTable(@"_server_down_", @"Error", nil);
+            return NSLocalizedString(@"_server_down_", nil);
             break;
         case kCFURLErrorNetworkConnectionLost:          // -1005
-            return NSLocalizedStringFromTable(@"_not_possible_connect_to_server_", @"Error", nil);
+            return NSLocalizedString(@"_not_possible_connect_to_server_", nil);
             break;
         case kCFURLErrorNotConnectedToInternet:         // -1009
-            return NSLocalizedStringFromTable(@"_not_connected_internet_", @"Error", nil);
+            return NSLocalizedString(@"_not_connected_internet_", nil);
             break;
         case kCFURLErrorBadServerResponse:              // -1011
-            return NSLocalizedString(@"_error_",nil);
+            return NSLocalizedString(@"_error_", nil);
             break;
         case kCFURLErrorUserCancelledAuthentication:    // -1012
-            return NSLocalizedStringFromTable(@"_not_possible_connect_to_server_", @"Error", nil);
+            return NSLocalizedString(@"_not_possible_connect_to_server_", nil);
             break;
         case kCFURLErrorUserAuthenticationRequired:     // -1013
-            return NSLocalizedStringFromTable(@"_user_autentication_required_", @"Error", nil);
+            return NSLocalizedString(@"_user_autentication_required_", nil);
             break;
         case kCFURLErrorSecureConnectionFailed:         // -1200
-            return NSLocalizedStringFromTable(@"_ssl_connection_error_", @"Error", nil);
+            return NSLocalizedString(@"_ssl_connection_error_", nil);
             break;
         case kCFURLErrorServerCertificateUntrusted:     // -1202
-            return NSLocalizedStringFromTable(@"_ssl_certificate_untrusted_", @"Error", nil);
+            return NSLocalizedString(@"_ssl_certificate_untrusted_", nil);
             break;
         case 101:                                       // 101
-            return NSLocalizedStringFromTable(@"_forbidden_characters_from_server_", @"Error", nil);
+            return NSLocalizedString(@"_forbidden_characters_from_server_", nil);
             break;
         case 400:                                       // 400
-            return NSLocalizedStringFromTable(@"_bad_request_", @"Error", nil);
+            return NSLocalizedString(@"_bad_request_", nil);
             break;
         case 403:                                       // 403
-            return NSLocalizedStringFromTable(@"_error_not_permission_", @"Error", nil);
+            return NSLocalizedString(@"_error_not_permission_", nil);
             break;
         case 404:                                       // 404 Not Found. When for example we try to access a path that now not exist
-            return NSLocalizedStringFromTable(@"_error_path_", @"Error", nil);
+            return NSLocalizedString(@"_error_path_", nil);
             break;
         case 423:                                       // 423 WebDAV Locked : The resource that is being accessed is locked
-            return NSLocalizedStringFromTable(@"_webdav_locked_", @"Error", nil);
+            return NSLocalizedString(@"_webdav_locked_", nil);
             break;
         case 500:
-            return NSLocalizedStringFromTable(@"_internal_server_", @"Error", nil);
+            return NSLocalizedString(@"_internal_server_", nil);
             break;
         case 503:
-            return NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            return NSLocalizedString(@"_server_error_retry_", nil);
             break;
         case 507:
-            return NSLocalizedStringFromTable(@"_user_over_quota_", @"Error", nil);
+            return NSLocalizedString(@"_user_over_quota_", nil);
             break;
         default:
             if (withNumberError) return [NSString stringWithFormat:@"%ld", (long)errorCode];
@@ -99,46 +99,46 @@
     
     switch (errorCode) {
         case 304:
-            return NSLocalizedStringFromTable(@"_folder_contents_nochanged_", @"Error", nil);
+            return NSLocalizedString(@"_folder_contents_nochanged_", nil);
             break;
         case 400:
             return NSLocalizedString(@"_error_",nil);
             break;
         case 401:
-            return NSLocalizedStringFromTable(@"_reauthenticate_user_", @"Error", nil);
+            return NSLocalizedString(@"_reauthenticate_user_", nil);
             break;
         case 403:
-            return NSLocalizedStringFromTable(@"_file_already_exists_", @"Error", nil);
+            return NSLocalizedString(@"_file_already_exists_", nil);
             break;
         case 404:
-            return NSLocalizedStringFromTable(@"_file_folder_not_exists_", @"Error", nil);
+            return NSLocalizedString(@"_file_folder_not_exists_", nil);
             break;
         case 405:
-            return NSLocalizedStringFromTable(@"_method_not_expected_", @"Error", nil);
+            return NSLocalizedString(@"_method_not_expected_", nil);
             break;
         case 406:
-            return NSLocalizedStringFromTable(@"_too_many_files_", @"Error", nil);
+            return NSLocalizedString(@"_too_many_files_", nil);
             break;
         case 409:
-            return NSLocalizedStringFromTable(@"_file_already_exists_", @"Error", nil);
+            return NSLocalizedString(@"_file_already_exists_", nil);
             break;
         case 411:
-            return NSLocalizedStringFromTable(@"_too_many_files_", @"Error", nil);
+            return NSLocalizedString(@"_too_many_files_", nil);
             break;
         case 415:
-            return NSLocalizedStringFromTable(@"_images_invalid_converted_", @"Error", nil);
+            return NSLocalizedString(@"_images_invalid_converted_", nil);
             break;
         case 429:
-            return NSLocalizedStringFromTable(@"_too_many_request_", @"Error", nil);
+            return NSLocalizedString(@"_too_many_request_", nil);
             break;
         case 500:
-            return NSLocalizedStringFromTable(@"_internal_server_", @"Error", nil);
+            return NSLocalizedString(@"_internal_server_", nil);
             break;
         case 503:
-            return NSLocalizedStringFromTable(@"_server_error_retry_", @"Error", nil);
+            return NSLocalizedString(@"_server_error_retry_", nil);
             break;
         case 507:
-            return NSLocalizedStringFromTable(@"_user_over_quota_", @"Error", nil);
+            return NSLocalizedString(@"_user_over_quota_", nil);
             break;
         default:
             return [NSString stringWithFormat:@"Error code %ld", (long)errorCode];
@@ -159,28 +159,28 @@
             errorHTTP = @"";
             break;
         case kOCErrorSharedAPIWrong:            // 400
-            errorHTTP = NSLocalizedStringFromTable(@"_api_wrong_", @"Error", nil);
+            errorHTTP = NSLocalizedString(@"_api_wrong_", nil);
             break;
         case kOCErrorServerUnauthorized:        // 401
-            errorHTTP = NSLocalizedStringFromTable(@"_bad_username_password_", @"Error", nil);
+            errorHTTP = NSLocalizedString(@"_bad_username_password_", nil);
             break;
         case kOCErrorServerForbidden:           // 403 Forbidden
-            errorHTTP = NSLocalizedStringFromTable(@"_error_not_permission_", @"Error", nil);
+            errorHTTP = NSLocalizedString(@"_error_not_permission_", nil);
             break;
         case kOCErrorServerPathNotFound:        // 404 Not Found. When for example we try to access a path that now not exist
-            errorHTTP = NSLocalizedStringFromTable(@"_error_path_", @"Error", nil);
+            errorHTTP = NSLocalizedString(@"_error_path_", nil);
             break;
         case kOCErrorServerMethodNotPermitted:  // 405 Method not permitted
-            errorHTTP = NSLocalizedStringFromTable(@"_not_possible_create_folder_", @"Error", nil);
+            errorHTTP = NSLocalizedString(@"_not_possible_create_folder_", nil);
             break;
         case kOCErrorProxyAuth:                 // 407 Error credential
-            errorHTTP = NSLocalizedStringFromTable(@"_error_proxy_auth_", @"Error", nil);
+            errorHTTP = NSLocalizedString(@"_error_proxy_auth_", nil);
             break;
         case kOCErrorServerTimeout:             // 408 timeout
-            errorHTTP = NSLocalizedStringFromTable(@"_not_possible_connect_to_server_", @"Error", nil);
+            errorHTTP = NSLocalizedString(@"_not_possible_connect_to_server_", nil);
             break;
         case 423:                               // 423 Locked
-            errorHTTP = NSLocalizedStringFromTable(@"_file_directory_locked_", @"Error", nil);
+            errorHTTP = NSLocalizedString(@"_file_directory_locked_", nil);
             break;
         default:                                // Default
             errorHTTP = [NSString stringWithFormat:@"Error code %ld", (long)errorCode];