Explorar o código

Merge remote-tracking branch 'refs/remotes/origin/develop'

Conflicts:
	iOSClient/Supporting Files/en.lproj/Localizable.strings
marinofaggiana %!s(int64=4) %!d(string=hai) anos
pai
achega
0543ef810d
Modificáronse 1 ficheiros con 3 adicións e 0 borrados
  1. 3 0
      iOSClient/Supporting Files/en.lproj/Localizable.strings

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

@@ -143,6 +143,9 @@
 "_leave_share_"             = "Leave this share";
 "_delete_file_"             = "Delete file";
 "_delete_folder_"           = "Delete folder";
+"_video_streaming_"         = "Streaming video";
+
+/* TRANSLATORS Comment here */
 "_LIVE_"                    = "LIVE";
 
 // App