diff --git a/.buckconfig b/.buckconfig deleted file mode 100644 index f0d868ed09..0000000000 --- a/.buckconfig +++ /dev/null @@ -1,91 +0,0 @@ -[client] -# Do not delete this section. Used by arc focus for logging. - -[project] - # Note that `buck project --ide intellij` can be run from the root. - # to override this default. - ide = xcode - # Forbid symlinks for source files so Buck doesn't have to dump its - # cache every time it encounters one. - allow_symlinks = forbid - - # Use watchman when available to speed up glob() calls - glob_handler = watchman - - # Directories that do not contain input files. Any build output directories - # (but NOT .hg, .git, or anything tracked in source control) should be in - # .watchmanconfig. - ignore = \ - .buckd, \ - .git, \ - .hg, \ - tmp, \ - Tools/clang/analyzer/build, \ - Tools/clang/clang-ocaml-DEPRECATED/build, \ - Tools/clang/libtooling/build, \ - Tools/clang/xcode, \ - Tools/xctool/build, \ - VendorLib/Breakpad/src/tools/mac/dump_syms/build, \ - **/.DS_Store, \ - **/**.orig, \ - Libraries/FBReactKit/js/react-native-github/ReactAndroid, \ - Libraries/FBReactKit/js/react-native-github/Examples/**/android/**, \ - Libraries/FBReactKit/js/react-native-github/local-cli/generator*/**, \ - Libraries/FBReactKit/js/RKJSModules/Libraries/Relay/relay/__github__/**, \ - **/.*.swp, \ - **/.*.swx, \ - **/.*.swpx, \ - **/.*.swo, \ - **/.#*, \ - **/*~ - - parallel_parsing = true - parsing_threads = 4 - - # Enable build file sandboxing - enable_build_file_sandboxing = true - - -[buildfile] - includes = //internal/buck/build_defs.py - -[apple] - device_helper_target = //Tools/SDMMobileDevice:iOSConsole#macosx-x86_64 - iphonesimulator_target_sdk_version = 8.0 - iphoneos_target_sdk_version = 8.0 - macosx_target_sdk_version = 10.9 - watchos_target_sdk_version = 2.0 - watchsimulator_target_sdk_version = 2.0 - xctool_zip_target = //EndToEndTests/FBSimulatorControl:FBXCTest-zip - xctool_default_destination_specifier = "name=iPhone 5s" - force_dsym_mode_in_build_with_buck = false - - default_debug_info_format_for_binaries = DWARF - default_debug_info_format_for_libraries = DWARF - default_debug_info_format_for_tests = DWARF - - -[cxx] - # Disabling deprecated APIs and truncating casts were unfortunately in use - # before fbobjc was Buck-ified. - cflags = -std=gnu11 -Wno-deprecated -Wno-conversion -Wundeclared-selector -Wno-objc-designated-initializers -Wimplicit-retain-self -Werror -g - cxxflags = -std=c++14 -stdlib=libc++ -Wno-deprecated -Wno-conversion -Wundeclared-selector -Wno-objc-designated-initializers -Wimplicit-retain-self -Werror -g - # workaround for osmeta's ranlib, which does not set -s as default. - ranlibflags = -s - default_platform = iphonesimulator-x86_64 - # We enabled combined preprocessing+compiling for two reasons: - # 1. Doing these two steps separately is slower, and until we support - # generalized ABI rule keys, there isn't any reason not to do this - # as a single combined step. - # 2. Clang has a bug where #pragmas for ARC aren't written to preprocessed - # sources, and so get ommited in the actual compilation. - combined_preprocess_and_compile = true - # We explicitly set the host platform so that the rule keys will match between - # different OS X versions as long as the Xcode Toolchain and SDK versions match. - # Note this will break the builds if the machine doesn't have the SDK installed - # or if it cannot run binaries built with it. - host_platform = macosx-x86_64 - - # Link rules take up 2 equivalent CPUs. This limiting reduces concurrent - # links to improve io/memory contention. - link_weight = 2 diff --git a/.buckjavaargs b/.buckjavaargs deleted file mode 100644 index d8861f4524..0000000000 --- a/.buckjavaargs +++ /dev/null @@ -1,3 +0,0 @@ --Xmx3g --XX:+HeapDumpOnOutOfMemoryError --XX:HeapDumpPath=buck-out/log diff --git a/.buckversion b/.buckversion deleted file mode 100644 index 756d09135e..0000000000 --- a/.buckversion +++ /dev/null @@ -1 +0,0 @@ -3a688647b6fca77bda05ab55f2f53860a470edfc diff --git a/.gitignore b/.gitignore index 672ab960fc..86a2b5134a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,11 @@ +ads/samples/AdUnitsSample/AdUnitsSample.xcodeproj/* +ads/samples/AdUnitsSample/AdUnitsSample.xcworkspace/* +ads/samples/InstreamAdSample/InstreamAdSample.xcodeproj/* +ads/samples/InstreamAdSample/InstreamAdSample.xcworkspace/* +ads/samples/NativeAdSample/NativeAdSample.xcodeproj/* +ads/samples/NativeAdSample/NativeAdSample.xcworkspace/* +ads/src/FBAudienceNetwork.xcworkspace/* +ads/src/FBAudienceNetwork/FBAudienceNetwork.xcodeproj/* samples/Hackbook/build/ samples/Hackbook/Hackbook.xcodeproj/*.pbxuser samples/Hackbook/Hackbook.xcodeproj/*.mode* @@ -10,6 +18,7 @@ src/facebook-ios-sdk.xcodeproj/*.mode* src/build/ build/ lib/ +docs/ test/UnitTest/UnitTest.xcodeproj/*.pbxuser test/UnitTest/UnitTest.xcodeproj/*.mode* test/UnitTest/build/ @@ -30,3 +39,7 @@ buck-out/ .buckd/ infer-out + +#generated doc files +docs/ + diff --git a/.inferconfig b/.inferconfig deleted file mode 100644 index eb6ba157f6..0000000000 --- a/.inferconfig +++ /dev/null @@ -1,23 +0,0 @@ -{ - "infer_blacklist": [ - "FBAudienceNetwork/FBAudienceNetwork/util/fnf/", - "../../vendor/", - "../../vendor/OCMock/", - "vendor/", - "vendor/OCMock/" - ], - "cxx": false, - "flavors": true, - "enable_checks": [ - "GLOBAL_VARIABLE_INITIALIZED_WITH_FUNCTION_OR_METHOD_CALL" - ], - "infer_blacklist_files_containing": [ - "@generated" - ], - "skip_translation_headers": [ - "VendorLib", - "xplat", - "buck-out/gen/VendorLib", - "buck-out/gen/xplat" - ] -} diff --git a/.inferversion b/.inferversion deleted file mode 100644 index 535292461d..0000000000 --- a/.inferversion +++ /dev/null @@ -1 +0,0 @@ -332b7d5f3a7a8d43c04d6727cda8d8e3d09c773d diff --git a/Configurations/Version.xcconfig b/Configurations/Version.xcconfig index b8f7b98622..a924236f39 100644 --- a/Configurations/Version.xcconfig +++ b/Configurations/Version.xcconfig @@ -17,6 +17,6 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // The versions for FBSDK and Messenger SDK. -FBSDK_PROJECT_VERSION=4.18.0 +FBSDK_PROJECT_VERSION=4.19.0 MNSDK_PROJECT_VERSION=TODO_SUPPORT_MNSDK diff --git a/FBSDKCoreKit.podspec b/FBSDKCoreKit.podspec index 40d8a08314..00daebf824 100644 --- a/FBSDKCoreKit.podspec +++ b/FBSDKCoreKit.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.name = "FBSDKCoreKit" - s.version = "4.18.0" + s.version = "4.19.0" s.summary = "Official Facebook SDK for iOS to access Facebook Platform's core features" s.description = <<-DESC @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.tvos.deployment_target = '9.0' s.source = { :git => "https://github.com/facebook/facebook-ios-sdk.git", - :tag => "sdk-version-4.18.0" + :tag => "sdk-version-4.19.0" } s.ios.weak_frameworks = 'Accounts', 'CoreLocation', 'Social', 'Security', 'QuartzCore', 'CoreGraphics', 'UIKit', 'Foundation', 'AudioToolbox' diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppEvents.h b/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppEvents.h index 4c359c5954..1608efafb1 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppEvents.h +++ b/FBSDKCoreKit/FBSDKCoreKit/FBSDKAppEvents.h @@ -381,7 +381,10 @@ FBSDK_EXTERN NSString *const FBSDKAppEventParameterValueNo; /** - Notifies the events system that the app has launched and, when appropriate, logs an "activated app" event. Should typically be placed in the + Notifies the events system that the app has launched and, when appropriate, logs an "activated app" event. + This function is called automatically from FBSDKApplicationDelegate applicationDidBecomeActive, unless + one overrides 'FacebookAutoLogAppEventsEnabled' key to false in the project info plist file. + In case 'FacebookAutoLogAppEventsEnabled' is set to false, then it should typically be placed in the app delegates' `applicationDidBecomeActive:` method. This method also takes care of logging the event indicating the first time this app has been launched, which, among other things, is used to diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.h b/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.h index c98ac3776b..95d14534f2 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.h +++ b/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.h @@ -78,6 +78,8 @@ /** Call this method from the [UIApplicationDelegate application:didFinishLaunchingWithOptions:] method of the AppDelegate for your app. It should be invoked for the proper use of the Facebook SDK. + As part of SDK initialization basic auto logging of app events will occur, this can be +controlled via 'FacebookAutoLogAppEventsEnabled' key in the project info plist file. - Parameter application: The application as passed to [UIApplicationDelegate application:didFinishLaunchingWithOptions:]. diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.m b/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.m index 073ca5259c..c48b69e3ca 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.m +++ b/FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.m @@ -220,6 +220,10 @@ - (void)applicationDidEnterBackground:(NSNotification *)notification - (void)applicationDidBecomeActive:(NSNotification *)notification { + // Auto log basic events in case autoLogAppEventsEnabled is set + if ([[FBSDKSettings autoLogAppEventsEnabled] boolValue]) { + [FBSDKAppEvents activateApp]; + } // _expectingBackground can be YES if the caller started doing work (like login) // within the app delegate's lifecycle like openURL, in which case there // might have been a "didBecomeActive" event pending that we want to ignore. diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKCoreKit.h b/FBSDKCoreKit/FBSDKCoreKit/FBSDKCoreKit.h index 9a1284549a..d006cf250b 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/FBSDKCoreKit.h +++ b/FBSDKCoreKit/FBSDKCoreKit/FBSDKCoreKit.h @@ -44,5 +44,5 @@ #import #endif -#define FBSDK_VERSION_STRING @"4.18.0" +#define FBSDK_VERSION_STRING @"4.19.0" #define FBSDK_TARGET_PLATFORM_VERSION @"v2.8" diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKSettings.h b/FBSDKCoreKit/FBSDKCoreKit/FBSDKSettings.h index 2d59a2a658..22347b7095 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/FBSDKSettings.h +++ b/FBSDKCoreKit/FBSDKCoreKit/FBSDKSettings.h @@ -153,6 +153,18 @@ FBSDK_EXTERN NSString *const FBSDKLoggingBehaviorDeveloperErrors; - See:[UIImageJPEGRepresentation](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIKitFunctionReference/#//apple_ref/c/func/UIImageJPEGRepresentation) */ + (void)setJPEGCompressionQuality:(CGFloat)JPEGCompressionQuality; +/** + Flag which controls the auto logging of basic app events, such as activateApp and deactivateApp. + If not explicitly set, the default is 1 - true + */ ++ (NSNumber *)autoLogAppEventsEnabled; + +/** + Set the flag which controls the auto logging of basic app events, such as activateApp and deactivateApp. + - Parameter AutoLogAppEventsEnabled: Flag value, expressed as a value from 0 - false or 1 - true. + */ ++ (void)setAutoLogAppEventsEnabled:(NSNumber *)AutoLogAppEventsEnabled; + /** Gets whether data such as that generated through FBSDKAppEvents and sent to Facebook should be restricted from being used for other than analytics and conversions. Defaults to NO. This value is stored on the device and persists across app launches. */ diff --git a/FBSDKCoreKit/FBSDKCoreKit/FBSDKSettings.m b/FBSDKCoreKit/FBSDKCoreKit/FBSDKSettings.m index 6c53a85c88..3436e04836 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/FBSDKSettings.m +++ b/FBSDKCoreKit/FBSDKCoreKit/FBSDKSettings.m @@ -68,7 +68,9 @@ + (void)initialize FBSDKSETTINGS_PLIST_CONFIGURATION_SETTING_IMPL(NSString, FacebookClientToken, clientToken, setClientToken, nil); FBSDKSETTINGS_PLIST_CONFIGURATION_SETTING_IMPL(NSString, FacebookDisplayName, displayName, setDisplayName, nil); FBSDKSETTINGS_PLIST_CONFIGURATION_SETTING_IMPL(NSString, FacebookDomainPart, facebookDomainPart, setFacebookDomainPart, nil); -FBSDKSETTINGS_PLIST_CONFIGURATION_SETTING_IMPL(NSNumber, FacebookJpegCompressionQuality, _JPEGCompressionQualityNumber, _setJPEGCompressionQualityNumber, @(0.9)); +FBSDKSETTINGS_PLIST_CONFIGURATION_SETTING_IMPL(NSNumber, FacebookJpegCompressionQuality, _JPEGCompressionQualityNumber, _setJPEGCompressionQualityNumber, @0.9); +FBSDKSETTINGS_PLIST_CONFIGURATION_SETTING_IMPL(NSNumber, FacebookAutoLogAppEventsEnabled, autoLogAppEventsEnabled, + setAutoLogAppEventsEnabled, @1); + (void)setGraphErrorRecoveryDisabled:(BOOL)disableGraphErrorRecovery { g_disableErrorRecovery = disableGraphErrorRecovery; diff --git a/FBSDKCoreKit/FBSDKCoreKit/Internal/TokenCaching/FBSDKAccessTokenCacheV4.m b/FBSDKCoreKit/FBSDKCoreKit/Internal/TokenCaching/FBSDKAccessTokenCacheV4.m index 84d4151bee..05aea0a34a 100644 --- a/FBSDKCoreKit/FBSDKCoreKit/Internal/TokenCaching/FBSDKAccessTokenCacheV4.m +++ b/FBSDKCoreKit/FBSDKCoreKit/Internal/TokenCaching/FBSDKAccessTokenCacheV4.m @@ -23,6 +23,7 @@ #import "FBSDKKeychainStore.h" static NSString *const kFBSDKAccessTokenUserDefaultsKey = @"com.facebook.sdk.v4.FBSDKAccessTokenInformationKey"; +static NSString *const kFBSDKAccessTokenKeychainKey = @"com.facebook.sdk.v4.FBSDKAccessTokenInformationKeychainKey"; static NSString *const kFBSDKAccessTokenUUIDKey = @"tokenUUID"; static NSString *const kFBSDKAccessTokenEncodedKey = @"tokenEncoded"; @@ -45,20 +46,21 @@ - (FBSDKAccessToken *)fetchAccessToken NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSString *uuid = [defaults objectForKey:kFBSDKAccessTokenUserDefaultsKey]; - NSDictionary *dict = [_keychainStore dictionaryForKey:kFBSDKAccessTokenUserDefaultsKey]; - if (![dict[kFBSDKAccessTokenUUIDKey] isEqualToString:uuid]) { - // if the uuid doesn't match (including if there is no uuid in defaults which means uninstalled case) - // clear the keychain and return nil. - [self clearCache]; - return nil; - } - - id tokenData = dict[kFBSDKAccessTokenEncodedKey]; - if ([tokenData isKindOfClass:[NSData class]]) { - return [NSKeyedUnarchiver unarchiveObjectWithData:tokenData]; - } else { - return nil; + NSDictionary *dict = [_keychainStore dictionaryForKey:kFBSDKAccessTokenKeychainKey]; + if ([dict[kFBSDKAccessTokenUUIDKey] isKindOfClass:[NSString class]]) { + // there is a bug while running on simulator that the uuid stored in dict can be NSData, + // do a type check to make sure it is NSString + if ([dict[kFBSDKAccessTokenUUIDKey] isEqualToString:uuid]) { + id tokenData = dict[kFBSDKAccessTokenEncodedKey]; + if ([tokenData isKindOfClass:[NSData class]]) { + return [NSKeyedUnarchiver unarchiveObjectWithData:tokenData]; + } + } } + // if the uuid doesn't match (including if there is no uuid in defaults which means uninstalled case) + // clear the keychain and return nil. + [self clearCache]; + return nil; } - (void)cacheAccessToken:(FBSDKAccessToken *)token @@ -81,14 +83,14 @@ - (void)cacheAccessToken:(FBSDKAccessToken *)token }; [_keychainStore setDictionary:dict - forKey:kFBSDKAccessTokenUserDefaultsKey + forKey:kFBSDKAccessTokenKeychainKey accessibility:[FBSDKDynamicFrameworkLoader loadkSecAttrAccessibleAfterFirstUnlockThisDeviceOnly]]; } - (void)clearCache { [_keychainStore setDictionary:nil - forKey:kFBSDKAccessTokenUserDefaultsKey + forKey:kFBSDKAccessTokenKeychainKey accessibility:NULL]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; [defaults removeObjectForKey:kFBSDKAccessTokenUserDefaultsKey]; diff --git a/FBSDKLoginKit.podspec b/FBSDKLoginKit.podspec index 04780d130c..128c4b189f 100644 --- a/FBSDKLoginKit.podspec +++ b/FBSDKLoginKit.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.name = "FBSDKLoginKit" - s.version = "4.18.0" + s.version = "4.19.0" s.summary = "Official Facebook SDK for iOS to access Facebook Platform with features like Login, Share and Message Dialog, App Links, and Graph API" s.description = <<-DESC @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = "7.0" s.source = { :git => "https://github.com/facebook/facebook-ios-sdk.git", - :tag => "sdk-version-4.18.0" + :tag => "sdk-version-4.19.0" } s.weak_frameworks = "Accounts", "CoreLocation", "Social", "Security", "QuartzCore", "CoreGraphics", "UIKit", "Foundation", "AudioToolbox" diff --git a/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginButton.m b/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginButton.m index fe78c33b77..fb3146906c 100644 --- a/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginButton.m +++ b/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginButton.m @@ -21,6 +21,12 @@ #import "FBSDKCoreKit+Internal.h" #import "FBSDKLoginTooltipView.h" +static const CGFloat kFBLogoSize = 16.0; +static const CGFloat kFBLogoLeftMargin = 6.0; +static const CGFloat kButtonHeight = 28.0; +static const CGFloat kRightMargin = 8.0; +static const CGFloat kPaddingBetweenLogoTitle = 8.0; + @interface FBSDKLoginButton() @end @@ -61,6 +67,16 @@ - (void)setLoginBehavior:(FBSDKLoginBehavior)loginBehavior _loginManager.loginBehavior = loginBehavior; } +- (UIFont *)defaultFont +{ + return [UIFont systemFontOfSize:13]; +} + +- (UIColor *)backgroundColor +{ + return [UIColor colorWithRed:66.0/255.0 green:103.0/255.0 blue:178.0/255.0 alpha:1.0]; +} + #pragma mark - UIView - (void)didMoveToWindow @@ -76,6 +92,25 @@ - (void)didMoveToWindow #pragma mark - Layout +- (CGRect)imageRectForContentRect:(CGRect)contentRect +{ + CGFloat centerY = CGRectGetMidY(contentRect); + CGFloat y = centerY - (kFBLogoSize / 2.0); + return CGRectMake(kFBLogoLeftMargin, y, kFBLogoSize, kFBLogoSize); +} + +- (CGRect)titleRectForContentRect:(CGRect)contentRect +{ + if (self.hidden || CGRectIsEmpty(self.bounds)) { + return CGRectZero; + } + CGRect imageRect = [self imageRectForContentRect:contentRect]; + CGFloat titleX = CGRectGetMaxX(imageRect) + kPaddingBetweenLogoTitle; + CGRect titleRect = CGRectMake(titleX, 0, CGRectGetWidth(contentRect) - titleX - kRightMargin, CGRectGetHeight(contentRect)); + + return titleRect; +} + - (void)layoutSubviews { CGSize size = self.bounds.size; @@ -95,12 +130,17 @@ - (CGSize)sizeThatFits:(CGSize)size if ([self isHidden]) { return CGSizeZero; } - CGSize selectedSize = [self sizeThatFits:size title:[self _logOutTitle]]; - CGSize normalSize = [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, size.height) title:[self _longLogInTitle]]; + UIFont *font = self.titleLabel.font; + + CGSize selectedSize = FBSDKTextSize([self _logOutTitle], font, size, self.titleLabel.lineBreakMode); + CGSize normalSize = FBSDKTextSize([self _longLogInTitle], font, size, self.titleLabel.lineBreakMode); if (normalSize.width > size.width) { - return normalSize = [self sizeThatFits:size title:[self _shortLogInTitle]]; + normalSize = FBSDKTextSize([self _shortLogInTitle], font, size, self.titleLabel.lineBreakMode); } - return CGSizeMake(MAX(normalSize.width, selectedSize.width), MAX(normalSize.height, selectedSize.height)); + + CGFloat titleWidth = MAX(normalSize.width, selectedSize.width); + CGFloat buttonWidth = kFBLogoLeftMargin + kFBLogoSize + kPaddingBetweenLogoTitle + titleWidth + kRightMargin; + return CGSizeMake(buttonWidth, kButtonHeight); } #pragma mark - UIActionSheetDelegate @@ -144,14 +184,20 @@ - (void)configureButton [self configureWithIcon:nil title:logInTitle - backgroundColor:[super defaultBackgroundColor] + backgroundColor:[self backgroundColor] highlightedColor:nil selectedTitle:logOutTitle selectedIcon:nil - selectedColor:[super defaultBackgroundColor] + selectedColor:[self backgroundColor] selectedHighlightedColor:nil]; self.titleLabel.textAlignment = NSTextAlignmentCenter; - + [self addConstraint:[NSLayoutConstraint constraintWithItem:self + attribute:NSLayoutAttributeHeight + relatedBy:NSLayoutRelationEqual + toItem:nil + attribute:NSLayoutAttributeNotAnAttribute + multiplier:1 + constant:28]]; [self _updateContent]; [self addTarget:self action:@selector(_buttonPressed:) forControlEvents:UIControlEventTouchUpInside]; @@ -264,8 +310,8 @@ - (NSString *)_logOutTitle - (NSString *)_longLogInTitle { - return NSLocalizedStringWithDefaultValue(@"LoginButton.LogInLong", @"FacebookSDK", [FBSDKInternalUtility bundleForStrings], - @"Log in with Facebook", + return NSLocalizedStringWithDefaultValue(@"LoginButton.LogInContinue", @"FacebookSDK", [FBSDKInternalUtility bundleForStrings], + @"Continue with Facebook", @"The long label for the FBSDKLoginButton when the user is currently logged out"); } diff --git a/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginManager.m b/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginManager.m index c7066f8ec7..f0acd32159 100644 --- a/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginManager.m +++ b/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginManager.m @@ -83,10 +83,9 @@ - (void)logInWithReadPermissions:(NSArray *)permissions [self assertPermissions:permissions]; NSSet *permissionSet = [NSSet setWithArray:permissions]; if (![FBSDKInternalUtility areAllPermissionsReadPermissions:permissionSet]) { - [[NSException exceptionWithName:NSInvalidArgumentException - reason:@"Publish or manage permissions are not permitted to be requested with read permissions." - userInfo:nil] - raise]; + [self raiseLoginException:[NSException exceptionWithName:NSInvalidArgumentException + reason:@"Publish or manage permissions are not permitted to be requested with read permissions." + userInfo:nil]]; } self.fromViewController = fromViewController; [self logInWithPermissions:permissionSet handler:handler]; @@ -109,10 +108,9 @@ - (void)logInWithPublishPermissions:(NSArray *)permissions [self assertPermissions:permissions]; NSSet *permissionSet = [NSSet setWithArray:permissions]; if (![FBSDKInternalUtility areAllPermissionsPublishPermissions:permissionSet]) { - [[NSException exceptionWithName:NSInvalidArgumentException - reason:@"Read permissions are not permitted to be requested with publish or manage permissions." - userInfo:nil] - raise]; + [self raiseLoginException:[NSException exceptionWithName:NSInvalidArgumentException + reason:@"Read permissions are not permitted to be requested with publish or manage permissions." + userInfo:nil]]; } self.fromViewController = fromViewController; [self logInWithPermissions:permissionSet handler:handler]; @@ -139,7 +137,14 @@ + (void)renewSystemCredentials:(void (^)(ACAccountCredentialRenewResult result, #pragma mark - Private -- (void)handleImplicitCancelOfLogIn { +- (void)raiseLoginException:(NSException *)exception +{ + _state = FBSDKLoginManagerStateIdle; + [exception raise]; +} + +- (void)handleImplicitCancelOfLogIn +{ FBSDKLoginManagerLoginResult *result = [[FBSDKLoginManagerLoginResult alloc] initWithToken:nil isCancelled:YES grantedPermissions:nil @@ -177,16 +182,14 @@ - (void)assertPermissions:(NSArray *)permissions { for (NSString *permission in permissions) { if (![permission isKindOfClass:[NSString class]]) { - [[NSException exceptionWithName:NSInvalidArgumentException - reason:@"Permissions must be string values." - userInfo:nil] - raise]; + [self raiseLoginException:[NSException exceptionWithName:NSInvalidArgumentException + reason:@"Permissions must be string values." + userInfo:nil]]; } if ([permission rangeOfString:@","].location != NSNotFound) { - [[NSException exceptionWithName:NSInvalidArgumentException - reason:@"Permissions should each be specified in separate string values in the array." - userInfo:nil] - raise]; + [self raiseLoginException:[NSException exceptionWithName:NSInvalidArgumentException + reason:@"Permissions should each be specified in separate string values in the array." + userInfo:nil]]; } } } diff --git a/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginTooltipView.m b/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginTooltipView.m index 59d4c17895..e1a17d4868 100644 --- a/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginTooltipView.m +++ b/FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginTooltipView.m @@ -29,7 +29,7 @@ - (instancetype)init { NSString *tooltipMessage = NSLocalizedStringWithDefaultValue(@"LoginTooltip.Message", @"FacebookSDK", [FBSDKInternalUtility bundleForStrings], - @"New! You're in control - choose what info you want to share with apps.", + @"You're in control - choose what info you want to share with apps.", @"The message of the FBSDKLoginTooltipView"); return [super initWithTagline:nil message:tooltipMessage colorStyle:FBSDKTooltipColorStyleFriendlyBlue]; } diff --git a/FBSDKShareKit.podspec b/FBSDKShareKit.podspec index 9bd8bc6f0a..a2cb01d8da 100644 --- a/FBSDKShareKit.podspec +++ b/FBSDKShareKit.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.name = "FBSDKShareKit" - s.version = "4.18.0" + s.version = "4.19.0" s.summary = "Official Facebook SDK for iOS to access Facebook Platform's Sharing Features" s.description = <<-DESC @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.tvos.deployment_target = '9.0' s.source = { :git => "https://github.com/facebook/facebook-ios-sdk.git", - :tag => "sdk-version-4.18.0" + :tag => "sdk-version-4.19.0" } s.ios.weak_frameworks = 'Accounts', 'AudioToolbox', 'CoreGraphics', 'CoreLocation', 'Foundation', 'QuartzCore', 'Security', 'Social', 'UIKit' diff --git a/FBSDKTVOSKit.podspec b/FBSDKTVOSKit.podspec index e24fd52b63..31153317b3 100644 --- a/FBSDKTVOSKit.podspec +++ b/FBSDKTVOSKit.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.name = 'FBSDKTVOSKit' - s.version = '4.18.0' + s.version = '4.19.0' s.summary = 'Official Facebook SDK for tvOS to access Facebook Platform with features like Login and Graph API.' s.description = <<-DESC @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.tvos.deployment_target = '9.0' s.source = { :git => 'https://github.com/facebook/facebook-ios-sdk.git', - :tag => 'sdk-version-4.18.0' } + :tag => 'sdk-version-4.19.0' } s.source_files = 'FBSDKTVOSKit/FBSDKTVOSKit/**/*.{h,m}' s.public_header_files = 'FBSDKTVOSKit/FBSDKTVOSKit/*.h' diff --git a/FacebookSDKStrings.bundle/Resources/af.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/af.lproj/FacebookSDK.strings index 5d179e6872..35a6ce74ae 100644 --- a/FacebookSDKStrings.bundle/Resources/af.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/af.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Meld aan"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Gaan voort met Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Meld met Facebook aan"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Jy kan nie op die oomblik by toepassings aanmeld nie. Meld asseblief by www.facebook.com aan en volg die gegewe instruksies."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Nuut! Jy is in beheer - kies waater inligting jy met toepassings wil deel."; +"LoginTooltip.Message" = "Jy is in beheer – kies watter inligting jy met toepassings wil deel."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Meld aan"; diff --git a/FacebookSDKStrings.bundle/Resources/ar.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/ar.lproj/FacebookSDK.strings index 3ff6cb6238..0a3a9a26e5 100644 --- a/FacebookSDKStrings.bundle/Resources/ar.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/ar.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "تسجيل الدخول"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "متابعة بحساب فيسبوك"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "تسجيل الدخول بحساب فيسبوك"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "لا يمكنك تسجيل الدخول إلى التطبيقات حاليًا. يُرجى تسجيل الدخول إلى www.facebook.com واتباع التعليمات الموضحة."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "جديد! أنت المتحكم - اختر المعلومات التي تريد مشاركتها مع التطبيقات."; +"LoginTooltip.Message" = "أنت المتحكم - اختر المعلومات التي تريد مشاركتها مع التطبيقات."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "تسجيل الدخول"; diff --git a/FacebookSDKStrings.bundle/Resources/bn.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/bn.lproj/FacebookSDK.strings index 4b6a4442fb..a6682b9164 100644 --- a/FacebookSDKStrings.bundle/Resources/bn.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/bn.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "লগ ইন করুন"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebook এর সাথে চালিয়ে যান"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Facebook -এর সাথে লগ ইন করুন"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "এই সময়ে আপনি অ্যাপসে লগ ইন করতে পারবেন না৷ অনুগ্রহ করে www.facebook.com-এ লগ ইন করুন এবং উল্লিখিত নির্দেশাবলী অনুসরণ করুন৷"; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "নতুন! আপনি নিয়ন্ত্রণে আছেন-অ্যাপসের সাথে আপনি কোন তথ্য ভাগ করতে চাইছেন তা চয়ন করুন৷"; +"LoginTooltip.Message" = "আপনি নিয়ন্ত্রণে আছেন - অ্যাপ্সের সাথে আপনি যে তথ্য শেয়ার করতে চান তা বাছুন৷"; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "লগ ইন করুন"; diff --git a/FacebookSDKStrings.bundle/Resources/cs.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/cs.lproj/FacebookSDK.strings index acfd8af7df..f4ff4faa63 100644 --- a/FacebookSDKStrings.bundle/Resources/cs.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/cs.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Přihlásit"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Pokračovat přes Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Přihlásit se přes Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Do aplikací se v této chvíli přihlásit nemůžete. Přihlaste se na www. facebook.com a postupujte podle uvedených pokynů."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Novinka! Je jen na vás, které informace chcete s aplikacemi sdílet."; +"LoginTooltip.Message" = "Je jen na vás, které informace chcete s aplikacemi sdílet."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Přihlásit"; diff --git a/FacebookSDKStrings.bundle/Resources/da.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/da.lproj/FacebookSDK.strings index a697f224a3..21ccc8d480 100644 --- a/FacebookSDKStrings.bundle/Resources/da.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/da.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Log på"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Fortsæt med Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Log på med Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Du kan ikke logge på apps på nuværende tidspunkt. Log på www.facebook.com, og følg instruktionerne."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Nyhed! Du har styringen – vælg de oplysninger, som du vil dele med apps."; +"LoginTooltip.Message" = "Du har styringen – vælg de oplysninger, som du vil dele med apps."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Log på"; diff --git a/FacebookSDKStrings.bundle/Resources/de.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/de.lproj/FacebookSDK.strings index ccd087a45f..f7825846ed 100644 --- a/FacebookSDKStrings.bundle/Resources/de.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/de.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Anmelden"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Mit Facebook fortfahren"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Über Facebook anmelden"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Du kannst dich zurzeit nicht bei Apps anmelden. Bitte melde dich unter www.facebook.com an und folge den Anweisungen."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Neu! Es liegt ganz an dir – du kannst dir aussuchen, was du mit Apps teilen möchtest."; +"LoginTooltip.Message" = "Es liegt ganz an dir – du kannst dir aussuchen, was du mit Apps teilen möchtest."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Anmelden"; diff --git a/FacebookSDKStrings.bundle/Resources/el.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/el.lproj/FacebookSDK.strings index da50762358..050455a46a 100644 --- a/FacebookSDKStrings.bundle/Resources/el.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/el.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Σύνδεση"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Συνεχίστε με το Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Σύνδεση μέσω Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Προς το παρόν δεν μπορείτε να συνδεθείτε σε εφαρμογές. Συνδεθείτε στο www.facebook.com και ακολουθήστε τις οδηγίες που εμφανίζονται."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Νέο! Έχετε τον έλεγχο - επιλέξτε ποιες πληροφορίες θέλετε να κοινοποιούνται στις εφαρμογές."; +"LoginTooltip.Message" = "Έχετε τον έλεγχο - επιλέξτε ποιες πληροφορίες θέλετε να κοινοποιούνται στις εφαρμογές."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Σύνδεση"; diff --git a/FacebookSDKStrings.bundle/Resources/en.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/en.lproj/FacebookSDK.strings index 9ad80d1263..96c8563ee9 100644 Binary files a/FacebookSDKStrings.bundle/Resources/en.lproj/FacebookSDK.strings and b/FacebookSDKStrings.bundle/Resources/en.lproj/FacebookSDK.strings differ diff --git a/FacebookSDKStrings.bundle/Resources/en_GB.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/en_GB.lproj/FacebookSDK.strings index acae15d065..9755029c48 100644 --- a/FacebookSDKStrings.bundle/Resources/en_GB.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/en_GB.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Log in"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Continue with Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Log in with Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "You cannot log in to apps at this time. Please log in to www.facebook.com and follow the instructions given."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "New! You're in control – choose what info you want to share with apps."; +"LoginTooltip.Message" = "You're in control – choose what information you want to share with apps."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Log In"; diff --git a/FacebookSDKStrings.bundle/Resources/es.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/es.lproj/FacebookSDK.strings index 52a5a63b94..6271c1009e 100644 --- a/FacebookSDKStrings.bundle/Resources/es.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/es.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Inicio de sesión"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Continuar con Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Iniciar sesión con Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "No puedes iniciar sesión en las aplicaciones en este momento. Inicia sesión en www.facebook.com y sigue las instrucciones."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "¡Nuevo! Tú tienes el control: elige qué información quieres compartir con las aplicaciones."; +"LoginTooltip.Message" = "Tú decides: elige qué información quieres compartir con las aplicaciones."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Inicio de sesión"; diff --git a/FacebookSDKStrings.bundle/Resources/es_ES.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/es_ES.lproj/FacebookSDK.strings index c262711a2c..0bfe194b5f 100644 --- a/FacebookSDKStrings.bundle/Resources/es_ES.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/es_ES.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Inicio de sesión"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Continuar con Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Iniciar sesión con Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "No puedes iniciar sesión en las aplicaciones en este momento. Inicia sesión en www.facebook.com y sigue las instrucciones."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Novedad: Tú eres quien controla y elige la información que quieres compartir con las aplicaciones."; +"LoginTooltip.Message" = "Tú tienes el control: elige la información que quieres compartir con las aplicaciones."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Inicio de sesión"; diff --git a/FacebookSDKStrings.bundle/Resources/fi.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/fi.lproj/FacebookSDK.strings index 04d6898bc8..118646175b 100644 --- a/FacebookSDKStrings.bundle/Resources/fi.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/fi.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Kirjaudu sisään"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Jatka Facebook-tunnuksilla"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Kirjaudu sisään Facebookin avulla"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Et pysty kirjautumaan sovelluksiin tällä hetkellä. Kirjaudu sisään osoitteeseen www.facebook.com ja noudata annettuja ohjeita."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Uutta! Sinä päätät – valitse, mitä haluat jakaa sovellusten kanssa."; +"LoginTooltip.Message" = "Sinä voit valita, mitä tietoja jaat sovelluksille."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Kirjaudu sisään"; diff --git a/FacebookSDKStrings.bundle/Resources/fil.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/fil.lproj/FacebookSDK.strings index 24e5a8455b..e60c3b2961 100644 --- a/FacebookSDKStrings.bundle/Resources/fil.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/fil.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Mag-log in"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Magatuloy sa Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Mag-log in sa pamamagitan ng Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Hindi ka makakapag-log in sa mga app sa oras na ito. Mangyaring mag-log in sa www.facebook.com at sundin ang mga ibinigay na tagubilin."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Bago! Ikaw ang may kontrol - piliin kung anong impormasyon ang gusto mong ibahagi sa mga app."; +"LoginTooltip.Message" = "Ikaw ang may kontrol - piliin kung anong impormasyon ang gusto mong ibahagi sa mga app."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Mag-log In"; diff --git a/FacebookSDKStrings.bundle/Resources/fr.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/fr.lproj/FacebookSDK.strings index 4bb7d401ee..5995257c8e 100644 --- a/FacebookSDKStrings.bundle/Resources/fr.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/fr.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Connexion"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Continuer avec Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Connexion avec Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Vous ne pouvez pas vous connecter à des applications pour le moment. Veuillez vous connecter à www.facebook.com et suivre les instructions indiquées."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Nouveau ! Choisissez les informations que vous souhaitez partager avec les applications."; +"LoginTooltip.Message" = "Vous gardez le contrôle. Choisissez les informations que vous souhaitez partager avec les applications."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Connexion"; diff --git a/FacebookSDKStrings.bundle/Resources/gu.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/gu.lproj/FacebookSDK.strings index 1b03754aea..302cce8cce 100644 --- a/FacebookSDKStrings.bundle/Resources/gu.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/gu.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "લૉગ ઇન કરો"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebook સાથે ચાલુ રાખો"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "ફેસબુક સાથે લૉગ ઇન કરો"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "તમે આ સમયે એપ્લિકેશન્સમાં લૉગ ઇન કરી શકતાં નથી. કૃપા કરીને www.facebook.com પર લૉગ ઇન કરો અને આપેલા સૂચનોને અનુસરો."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "નવું! તમે નિયંત્રણ કરો છો - તમે એપ્લિકેશન્સ સાથે કઈ માહિતી શેર કરવા માંગો છો તે પસંદ કરો."; +"LoginTooltip.Message" = "તમે નિયંત્રણ કરો છો - તમે એપ્લિકેશન્સ સાથે કઈ માહિતી શેર કરવા માંગો છો તે પસંદ કરો."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "લૉગ ઇન કરો"; diff --git a/FacebookSDKStrings.bundle/Resources/he.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/he.lproj/FacebookSDK.strings index 4601da6896..b515e4e50c 100644 --- a/FacebookSDKStrings.bundle/Resources/he.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/he.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "התחבר"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "המשך עם פייסבוק"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "התחבר באמצעות פייסבוק"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "לא ניתן להתחבר לאפליקציות כעת. התחבר ל-www.facebook.com ופעל בהתאם להוראות שיוצגו."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "חדש! אתה מחליט - בחר איזה מידע אתה רוצה לשתף עם האפליקציות."; +"LoginTooltip.Message" = "אתה מחליט - בחר איזה מידע אתה רוצה לשתף עם אפליקציות."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "התחבר"; diff --git a/FacebookSDKStrings.bundle/Resources/hi.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/hi.lproj/FacebookSDK.strings index 5904955624..b920cb9e2c 100644 --- a/FacebookSDKStrings.bundle/Resources/hi.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/hi.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "लॉग इन करें"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebook के साथ जारी रखें"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Facebook से लॉग इन करें"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "आप इस समय एप्लिकेशन में लॉग इन नहीं कर सकते. कृपया www.facebook.com में लॉग इन करें और दिए गए निर्देशों का पालन करें."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "नया! आप नियंत्रण में हैं - चुनें कि आप एप्लिकेशन से कौन-सी जानकारी साझा करना चाहते हैं."; +"LoginTooltip.Message" = "आप नियंत्रण में हैं - चुनें कि आप एप्लिकेशन से कौन-सी जानकारी साझा करना चाहते हैं."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "लॉग इन करें"; diff --git a/FacebookSDKStrings.bundle/Resources/hr.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/hr.lproj/FacebookSDK.strings index 4b43a212f7..548dfb9fb6 100644 --- a/FacebookSDKStrings.bundle/Resources/hr.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/hr.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Prijavi se"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Nastavite s korištenjem Facebooka"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Prijava putem Facebooka"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "U ovome trenutku prijava u aplikacije nije moguća. Prijavite se na www.facebook.com i slijedite upute."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Novo! Vi odlučujete – odaberite koje informacije želite podijeliti u aplikacijama."; +"LoginTooltip.Message" = "Vi odlučujete – odaberite koje podatke želite dijeliti u aplikacijama."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Prijava"; diff --git a/FacebookSDKStrings.bundle/Resources/hu.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/hu.lproj/FacebookSDK.strings index 95e776abe4..7de57b03c6 100644 --- a/FacebookSDKStrings.bundle/Resources/hu.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/hu.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Bejelentkezés"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Folytatás a Facebookkal"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Bejelentkezés a Facebook használatával"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Jelenleg nem tudsz alkalmazásokba bejelentkezni. Jelentkezz be a www.facebook.com címre, és kövesd az utasításokat."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Újdonság! A döntés a kezedben van: kiválaszthatod, hogy milyen adatokat osztasz meg az alkalmazásokkal."; +"LoginTooltip.Message" = "A döntés a kezedben van: kiválaszthatod, hogy milyen adatokat osztasz meg az alkalmazásokkal."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Bejelentkezés"; diff --git a/FacebookSDKStrings.bundle/Resources/id.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/id.lproj/FacebookSDK.strings index bd24944bd9..17a15f3e8f 100644 --- a/FacebookSDKStrings.bundle/Resources/id.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/id.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Masuk"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Lanjutkan dengan Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Masuk menggunakan Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Saat ini Anda tidak dapat masuk ke aplikasi. Masuk ke www.facebook.com dan ikuti petunjuknya."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Baru! Anda memegang kendali - pilih info yang ingin Anda bagikan dengan aplikasi."; +"LoginTooltip.Message" = "Anda memegang kendali - pilih info yang ingin Anda bagikan dengan aplikasi."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Masuk"; diff --git a/FacebookSDKStrings.bundle/Resources/it.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/it.lproj/FacebookSDK.strings index fe79a00fc8..7223a4e6d4 100644 --- a/FacebookSDKStrings.bundle/Resources/it.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/it.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Accedi"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Continua con Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Accedi con Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Impossibile accedere alle applicazioni al momento. Accedi a www.facebook.com e segui le istruzioni fornite."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Novità! Il controllo è nelle tue mani: scegli quali informazioni condividere con le applicazioni."; +"LoginTooltip.Message" = "Il controllo è nelle tue mani: scegli quali informazioni condividere con le app."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Accedi"; diff --git a/FacebookSDKStrings.bundle/Resources/ja.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/ja.lproj/FacebookSDK.strings index 4bac1fa925..43faf40b81 100644 --- a/FacebookSDKStrings.bundle/Resources/ja.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/ja.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "ログイン"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebookで続ける"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Facebookでログイン"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "今はアプリにログインできません。www.facebook.comにログインし、表示される説明に従ってください。"; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "新機能！アプリと共有する情報をコントロールできます。"; +"LoginTooltip.Message" = "アプリと共有する情報をコントロールできます。"; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "ログイン"; diff --git a/FacebookSDKStrings.bundle/Resources/kn.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/kn.lproj/FacebookSDK.strings index 87765be66a..f743a2793c 100644 --- a/FacebookSDKStrings.bundle/Resources/kn.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/kn.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "ಲಾಗ್‌ ಇನ್‌"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebook ಅನ್ನು ಮುಂದುವರಿಸಿ"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Facebook ಮೂಲಕ ಲಾಗ್‌ ಇನ್‌ ಮಾಡಿ"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "ನೀವು ಈ ಸಮಯದಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಲಾಗಿನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ದಯವಿಟ್ಟು www.facebook.com ಗೆ ಲಾಗಿನ್‌ ಮಾಡಿ ಮತ್ತು ಕೆಳಗೆ ನೀಡಿದ ಸೂಚನೆಗಳನ್ನು ಅನುಸರಿಸಿ."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "ಹೊಸ! ನೀವು ನಿಯಂತ್ರಣದಲ್ಲಿರುವಿರಿ - ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸಿಕೊಂಡು ಹಂಚಿಕೊಳ್ಳಲು ಬಯಸುವ ವಿಷಯವನ್ನು ಆರಿಸಿ."; +"LoginTooltip.Message" = "ನೀವು ನಿಯಂತ್ರಣದಲ್ಲಿರುವಿರಿ - ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸಿಕೊಂಡು ಹಂಚಿಕೊಳ್ಳಲು ಬಯಸುವ ವಿಷಯವನ್ನು ಆರಿಸಿ."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "ಲಾಗ್‌ ಇನ್‌"; diff --git a/FacebookSDKStrings.bundle/Resources/ko.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/ko.lproj/FacebookSDK.strings index 87f8217393..f5d01eb8a0 100644 --- a/FacebookSDKStrings.bundle/Resources/ko.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/ko.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "로그인"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebook으로 계속"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Facebook으로 로그인"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "현재 앱에 로그인할 수 없습니다. www.facebook.com에 로그인한 뒤 안내를 따라주세요."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "새로운 기능! 이제 앱과 어떤 정보를 공유할지 자유롭게 선택할 수 있습니다."; +"LoginTooltip.Message" = "원하는 정보를 선택하여 앱에 공유할 수 있습니다."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "로그인"; diff --git a/FacebookSDKStrings.bundle/Resources/ml.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/ml.lproj/FacebookSDK.strings index 4cad7893ff..7357b1d842 100644 --- a/FacebookSDKStrings.bundle/Resources/ml.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/ml.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "ലോഗിൻ ചെയ്യുക"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebook ഉപയോഗിച്ച് തുടരുക"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Facebook ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യുക"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "നിങ്ങൾക്ക് ഈ സമയം ആപ്ലിക്കേഷനുകളിലേക്ക് ലോഗിൻ ചെയ്യാനാവില്ല. www.facebook.com എന്നതിലേക്ക് ലോഗിൻ ചെയ്‌ത് തന്നിരിക്കുന്ന നിർദ്ദേശങ്ങൾ പാലിക്കുക."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "പുതിയത്! നിങ്ങൾ നിയന്ത്രണത്തിലാണ് - നിങ്ങൾക്ക് ആപ്ലിക്കേഷനുകളുമായി പങ്കിടേണ്ടതുണ്ടെങ്കിൽ തിരഞ്ഞെടുക്കുക."; +"LoginTooltip.Message" = "നിങ്ങളുടെ നിയന്ത്രണത്തിലാണ് - നിങ്ങൾക്ക് ആപ്‌സുമായി ഏതെല്ലാം വിവരങ്ങൾ പങ്കിടണമെന്ന് തിരഞ്ഞെടുക്കുക."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "ലോഗിൻ ചെയ്യുക"; diff --git a/FacebookSDKStrings.bundle/Resources/mr.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/mr.lproj/FacebookSDK.strings index ad45d34583..1d1d742b14 100644 --- a/FacebookSDKStrings.bundle/Resources/mr.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/mr.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "लॉग इन करा"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebook सह चालू ठेवा"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "फेसबुकसह लॉग इन करा"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "आपण यावेळी अनुप्रयोगांवर लॉग इन करू शकत नाही. कृपया www.facebook.com वर लॉग इन करा आणि दिलेल्या सूचनांचे अनुसरण करा."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "नवीन! आपण नियंत्रणात आहात - आपण कोणती माहिती अनुप्रयोगांसह शेअर करू इच्छिता ते निवडा."; +"LoginTooltip.Message" = "तुम्ही नियंत्रणात आहात - तुम्ही कोणती माहिती अॅपसह सामायिक करू इच्छिता ते निवडा."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "लॉग इन करा"; diff --git a/FacebookSDKStrings.bundle/Resources/ms.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/ms.lproj/FacebookSDK.strings index 1c28794e82..209d15d242 100644 --- a/FacebookSDKStrings.bundle/Resources/ms.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/ms.lproj/FacebookSDK.strings @@ -34,6 +34,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Log masuk"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Teruskan dengan Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Log masuk dengan Facebook"; @@ -59,7 +62,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Anda tidak boleh log masuk ke aplikasi pada masa ini. Sila log masuk ke www.facebook.com dan ikuti arahan yang diberi."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Baru! Anda yang mengawal - pilih maklumat yang anda ingin kongsi dengan aplikasi."; +"LoginTooltip.Message" = "Anda yang mengawal - pilih maklumat yang anda ingin kongsi dengan apl."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Log Masuk"; diff --git a/FacebookSDKStrings.bundle/Resources/nb.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/nb.lproj/FacebookSDK.strings index 5874890c6a..c278cc1da1 100644 --- a/FacebookSDKStrings.bundle/Resources/nb.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/nb.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Logg inn"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Fortsett med Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Logg inn med Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Du kan ikke logge deg inn på apper for øyeblikket. Logg deg inn på www.facebook.com, og følg instruksjonene."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Nyhet! Du bestemmer – velg hvilke opplysninger du vil dele med appene."; +"LoginTooltip.Message" = "Du bestemmer – velg hvilke opplysninger du vil dele med appene."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Logg inn"; diff --git a/FacebookSDKStrings.bundle/Resources/nl.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/nl.lproj/FacebookSDK.strings index dd5f8d90d7..ad1a565d57 100644 --- a/FacebookSDKStrings.bundle/Resources/nl.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/nl.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Aanmelden"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Doorgaan met Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Aanmelden met Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Je kunt je momenteel niet aanmelden bij apps. Meld je aan bij www.facebook.com en volg de instructies."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Nieuw! Jij hebt de controle. Kies welke informatie je met apps wilt delen."; +"LoginTooltip.Message" = "Jij hebt de controle. Kies welke informatie je met apps wilt delen."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Aanmelden"; diff --git a/FacebookSDKStrings.bundle/Resources/pa.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/pa.lproj/FacebookSDK.strings index 43c1bdabc7..878b4a10f7 100644 --- a/FacebookSDKStrings.bundle/Resources/pa.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/pa.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "ਲੌਗ ਇਨ ਕਰੋ"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebook ਦੇ ਨਾਲ ਜਾਰੀ ਰੱਖੋ"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Facebook ਦੇ ਨਾਲ ਲੌਗ ਇਨ ਕਰੋ"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "ਤੁਸੀਂ ਇਸ ਸਮੇਂ ਐਪ ਵਿੱਚ ਲੌਗ ਇਨ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਕਿਰਪਾ ਕਰਕੇ www.facebook.com ਵਿੱਚ ਲੌਗ ਇਨ ਕਰੋ ਅਤੇ ਹੇਠਾਂ ਦਿੱਤੇ ਨਿਰਦੇਸ਼ਾਂ ਦਾ ਪਾਲਣ ਕਰੋ।"; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "ਨਵਾਂ! ਤੁਸੀਂ ਨਿਯੰਤਰਣ ਵਿੱਚ ਹੋ - ਉਹ ਜਾਣਕਾਰੀ ਚੁਣੋ ਜੋ ਤੁਸੀਂ ਐਪਸ ਦੇ ਨਾਲ ਸਾਂਝੀ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।"; +"LoginTooltip.Message" = "ਤੁ\ਸੀਂ ਨਿਯੰਤਰਣ ਵਿੱਚ ਹੋ - ਉਹ ਜਾਣਕਾਰੀ ਚੁਣੋ ਜੋ ਤੁਸੀਂ ਐਪਸ ਦੇ ਨਾਲ ਸਾਂਝੀ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।"; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "ਲੌਗ ਇਨ ਕਰੋ"; diff --git a/FacebookSDKStrings.bundle/Resources/pl.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/pl.lproj/FacebookSDK.strings index 3649717e09..b3bbf158c6 100644 --- a/FacebookSDKStrings.bundle/Resources/pl.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/pl.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Zaloguj się"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Kontynuuj za pośrednictwem Facebooka"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Zaloguj się przez Facebooka"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Brak możliwości logowania się do aplikacji. Zaloguj się przez stronę www.facebook.com i postępuj zgodnie ze wskazówkami."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Nowość! Masz pełną kontrolę – określ, jakie informacje chcesz udostępniać aplikacjom."; +"LoginTooltip.Message" = "Masz pełną kontrolę – określ, jakie informacje chcesz udostępniać aplikacjom."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Zaloguj się"; diff --git a/FacebookSDKStrings.bundle/Resources/pt.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/pt.lproj/FacebookSDK.strings index 396bc1df94..27b70b0813 100644 --- a/FacebookSDKStrings.bundle/Resources/pt.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/pt.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Entrar"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Continuar com o Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Entrar com o Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Não é possível entrar em aplicativos neste momento. Entre no site www.facebook.com e siga as instruções fornecidas."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Novidade! Você está no controle - escolha quais informações quer compartilhar com os aplicativos."; +"LoginTooltip.Message" = "Você é quem controla — escolha quais informações você quer compartilhar com os aplicativos."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Entrar"; diff --git a/FacebookSDKStrings.bundle/Resources/pt_PT.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/pt_PT.lproj/FacebookSDK.strings index 9141a317d5..eb84fdb4dd 100644 --- a/FacebookSDKStrings.bundle/Resources/pt_PT.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/pt_PT.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Iniciar sessão"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Continuar com o Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Iniciar sessão com o Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Não podes iniciar sessão em aplicações neste momento. Inicia sessão em www.facebook.com e segue as instruções indicadas."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Novidade! Tens o controlo: escolhe a informação que pretendes partilhar com as aplicações."; +"LoginTooltip.Message" = "Tens o controlo: escolhe a informação que pretendes partilhar com as apps."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Iniciar sessão"; diff --git a/FacebookSDKStrings.bundle/Resources/ru.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/ru.lproj/FacebookSDK.strings index 41691cf3a4..0712971ba2 100644 --- a/FacebookSDKStrings.bundle/Resources/ru.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/ru.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Вход"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Продолжить с Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Вход через Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Сейчас нельзя войти в приложения. Войдите на сайт www.facebook.com и следуйте инструкциям."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Новинка! У вас все под контролем — выбирайте, какой информацией вы хотите поделиться с приложениями."; +"LoginTooltip.Message" = "Вы сами выбираете, какой информацией поделиться с приложениями."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Вход в систему"; diff --git a/FacebookSDKStrings.bundle/Resources/sk.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/sk.lproj/FacebookSDK.strings index 85c2d4767c..44b2a3515d 100644 --- a/FacebookSDKStrings.bundle/Resources/sk.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/sk.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Prihlásiť sa"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Pokračovať s Facebookom"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Prihlásiť sa cez Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Momentálne sa nemôžete prihlásiť do aplikácií. Prihláste sa na stránke www.facebook.com a postupujte podľa pokynov."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Novinka! Máte to pod kontrolou: vyberte, ktoré informácie chcete zdieľať s aplikáciami."; +"LoginTooltip.Message" = "Máte to pod kontrolou: vyberte, ktoré informácie chcete zdieľať s aplikáciami."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Prihlásenie sa"; diff --git a/FacebookSDKStrings.bundle/Resources/sv.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/sv.lproj/FacebookSDK.strings index b84f5ffb88..39be6a9d92 100644 --- a/FacebookSDKStrings.bundle/Resources/sv.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/sv.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Logga in"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Fortsätt med Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Logga in med Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Du kan inte logga in på appar för närvarande. Logga in på www.facebook.com och följ instruktionerna."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Nyhet! Du bestämmer – välj vilken info du vill dela med appar."; +"LoginTooltip.Message" = "Du bestämmer – välj vilken info du vill dela med appar."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Logga in"; diff --git a/FacebookSDKStrings.bundle/Resources/ta.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/ta.lproj/FacebookSDK.strings index 8838af2971..dd3020c04b 100644 --- a/FacebookSDKStrings.bundle/Resources/ta.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/ta.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "உள்நுழைவு"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebook இல் தொடரவும்"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Facebook மூலம் உள்நுழையவும்"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "இப்போது பயன்பாடுகளில் உள்நுழைய முடியாது. www.facebook.com இல் உள்நுழைந்து, வழங்கப்பட்டுள்ள வழிமுறைகளைப் பின்பற்றவும்."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "புதிது! உங்கள் கட்டுப்பாட்டில் இருப்பதால், பயன்பாடுகளுடன் பகிர வேண்டிய தகவலைத் தேர்வுசெய்யவும்."; +"LoginTooltip.Message" = "பயன்பாடுகளில் எந்தத் தகவலைப் பகிர விரும்புகிறீர்கள் என்பதை நீங்கள் கட்டுப்படுத்தலாம்."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "உள்நுழைவு"; diff --git a/FacebookSDKStrings.bundle/Resources/te.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/te.lproj/FacebookSDK.strings index 6dd1dadd9b..e3a5085aa3 100644 --- a/FacebookSDKStrings.bundle/Resources/te.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/te.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "లాగిన్ చేయి"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebookతో కొనసాగించండి"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Facebookతో లాగిన్ చేయి"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "ప్రస్తుతం మీరు అప్లికేషన్‌లకు లాగిన్ చేయలేరు. దయచేసి www.facebook.comకి లాగిన్ చేసి, అందించిన సూచనలను అనుసరించండి."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "సరికొత్తది! మీకు నియంత్రణ ఉంది - మీరు అప్లికేషన్‌లతో ఏ సమాచారాన్ని భాగస్వామ్యం చేయాలనుకుంటున్నారో ఎంచుకోండి."; +"LoginTooltip.Message" = "మీకు నియంత్రణ ఉంది - మీరు అనువర్తనాలతో భాగస్వామ్యం చేయాలనుకునే సమాచారాన్ని ఎంచుకోండి."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "లాగిన్ చేయండి"; diff --git a/FacebookSDKStrings.bundle/Resources/th.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/th.lproj/FacebookSDK.strings index f3661edf3c..7d6b4f2e01 100644 --- a/FacebookSDKStrings.bundle/Resources/th.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/th.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "เข้าสู่ระบบ"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "ดำเนินการต่อด้วย Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "เข้าสู่ระบบด้วย Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "คุณไม่สามารถเข้าสู่ระบบของแอพได้ในตอนนี้ โปรดเข้าสู่ระบบที่ www.facebook.com และทำตามคำแนะนำที่ปรากฏ"; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "ใหม่! คุณเป็นฝ่ายควบคุม โปรดเลือกสิ่งที่คุณต้องการแชร์ด้วยแอพ"; +"LoginTooltip.Message" = "คุณเป็นฝ่ายควบคุม โปรดเลือกข้อมูลที่คุณต้องการแชร์ด้วยแอพ"; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "เข้าสู่ระบบ"; diff --git a/FacebookSDKStrings.bundle/Resources/tr.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/tr.lproj/FacebookSDK.strings index 0b5f5e2375..a09c84c247 100644 --- a/FacebookSDKStrings.bundle/Resources/tr.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/tr.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Giriş yap"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Facebook ile Devam Et"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Facebook ile giriş yap"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Şu an için uygulamalara giriş yapamazsın. Lütfen www.facebook.com adresine giriş yap ve verilen talimatları izle."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Yeni! Kontrol sende. Uygulamalarla paylaşmak istediğin bilgileri seç."; +"LoginTooltip.Message" = "Kontrol sende. Uygulamalarla paylaşmak istediğin bilgileri seç."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Giriş Yap"; diff --git a/FacebookSDKStrings.bundle/Resources/vi.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/vi.lproj/FacebookSDK.strings index ad62595449..99ede36235 100644 --- a/FacebookSDKStrings.bundle/Resources/vi.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/vi.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "Đăng nhập"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "Tiếp tục với Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "Đăng nhập bằng Facebook"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "Bạn không thể đăng nhập vào các ứng dụng lúc này. Vui lòng đăng nhập vào www.facebook.com và làm theo hướng dẫn được cung cấp."; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "Mới! Bạn đang có quyền kiểm soát - hãy chọn thông tin bạn muốn chia sẻ với các ứng dụng."; +"LoginTooltip.Message" = "Bạn đang có quyền kiểm soát - hãy chọn thông tin bạn muốn chia sẻ với ứng dụng."; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "Đăng nhập"; diff --git a/FacebookSDKStrings.bundle/Resources/zh.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/zh.lproj/FacebookSDK.strings index c290864616..673fa772d5 100644 --- a/FacebookSDKStrings.bundle/Resources/zh.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/zh.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "登录"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "继续使用 Facebook 登录"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "使用 Facebook 登录"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "您此时不能登录应用。请登录 www.facebook.com，并按照提供的说明操作。"; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "新增功能！一切任您掌控 — 选择您想通过应用分享的信息。"; +"LoginTooltip.Message" = "一切任您掌控 — 选择您想通过应用分享的信息。"; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "登录"; diff --git a/FacebookSDKStrings.bundle/Resources/zh_Hant_HK.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/zh_Hant_HK.lproj/FacebookSDK.strings index 5c96cd43c8..66819f35a0 100644 --- a/FacebookSDKStrings.bundle/Resources/zh_Hant_HK.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/zh_Hant_HK.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "登入"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "繼續使用 Facebook"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "使用 Facebook 登入"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "您現時無法登入應用程式。請登入 www.facebook.com 並依據指示操作。"; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "最新消息！控制權在您 - 選擇您要與應用程式分享的資訊。"; +"LoginTooltip.Message" = "控制權在您 - 選擇您要與應用程式分享的資訊。"; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "登入"; diff --git a/FacebookSDKStrings.bundle/Resources/zh_Hant_TW.lproj/FacebookSDK.strings b/FacebookSDKStrings.bundle/Resources/zh_Hant_TW.lproj/FacebookSDK.strings index fdc02d8dd1..8e64fd09fd 100644 --- a/FacebookSDKStrings.bundle/Resources/zh_Hant_TW.lproj/FacebookSDK.strings +++ b/FacebookSDKStrings.bundle/Resources/zh_Hant_TW.lproj/FacebookSDK.strings @@ -37,6 +37,9 @@ /* The short label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogIn" = "登入"; +/* The long label for the FBSDKLoginButton when the user is currently logged out */ +"LoginButton.LogInContinue" = "繼續使用 Facebook 帳號"; + /* The long label for the FBSDKLoginButton when the user is currently logged out */ "LoginButton.LogInLong" = "使用 Facebook 登入"; @@ -62,7 +65,7 @@ "LoginError.SystemAccount.UserCheckpointed" = "您目前無法登入應用程式。請登入 www.facebook.com，然後按照指示操作。"; /* The message of the FBSDKLoginTooltipView */ -"LoginTooltip.Message" = "新消息！您已成功登入，請選擇要與應用程式分享的資訊。"; +"LoginTooltip.Message" = "您可以全盤掌控！選擇您想和應用程式分享的資訊內容。"; /* Title of the web dialog that prompts the user to log in to Facebook. */ "LoginWeb.LogInTitle" = "登入"; diff --git a/samples/Catalog/Catalog/AppDelegate.m b/samples/Catalog/Catalog/AppDelegate.m index ced1355ceb..d360bbe236 100644 --- a/samples/Catalog/Catalog/AppDelegate.m +++ b/samples/Catalog/Catalog/AppDelegate.m @@ -19,20 +19,13 @@ #import "AppDelegate.h" #import - #import - #import #import "AlertControllerUtility.h" @implementation AppDelegate -- (void)applicationDidBecomeActive:(UIApplication *)application -{ - [FBSDKAppEvents activateApp]; -} - - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { [[FBSDKApplicationDelegate sharedInstance] application:application diff --git a/samples/LoginSample/LoginSample/AKThemes/AdvancedUIManager.m b/samples/LoginSample/LoginSample/AKThemes/AdvancedUIManager.m index 5f69ae07c5..9b23d8125f 100644 --- a/samples/LoginSample/LoginSample/AKThemes/AdvancedUIManager.m +++ b/samples/LoginSample/LoginSample/AKThemes/AdvancedUIManager.m @@ -1,4 +1,4 @@ -// Copyright (c) 2014-present, Facebook, Inc. All rights reserved. +// Copyright 2004-present Facebook. All Rights Reserved. // // You are hereby granted a non-exclusive, worldwide, royalty-free license to use, // copy, modify, and distribute this software in source code or binary form for use @@ -72,6 +72,7 @@ - (AKFButtonType)buttonTypeForState:(AKFLoginFlowState)state case AKFLoginFlowStateEmailVerify: case AKFLoginFlowStateSendingCode: case AKFLoginFlowStateVerifyingCode: + case AKFLoginFlowStateCountryCode: case AKFLoginFlowStateResendCode: return AKFButtonTypeDefault; } @@ -164,6 +165,7 @@ - (PlaceholderView *)_viewForState:(AKFLoginFlowState)state prefix = @"Custom Resend Code"; break; case AKFLoginFlowStateNone: + case AKFLoginFlowStateCountryCode: return nil; } return [self _viewWithText:[NSString stringWithFormat:@"%@ %@", prefix, suffix] intrinsicHeight:intrinsicHeight]; diff --git a/samples/LoginSample/LoginSample/AKThemes/ReverbActionBarView.m b/samples/LoginSample/LoginSample/AKThemes/ReverbActionBarView.m index f2908cebf2..1ff357fea7 100644 --- a/samples/LoginSample/LoginSample/AKThemes/ReverbActionBarView.m +++ b/samples/LoginSample/LoginSample/AKThemes/ReverbActionBarView.m @@ -1,4 +1,4 @@ -// Copyright (c) 2014-present, Facebook, Inc. All rights reserved. +// Copyright 2004-present Facebook. All Rights Reserved. // // You are hereby granted a non-exclusive, worldwide, royalty-free license to use, // copy, modify, and distribute this software in source code or binary form for use @@ -107,6 +107,7 @@ - (NSString *)_titleForState:(AKFLoginFlowState)state theme:(ReverbTheme *)theme switch (state) { case AKFLoginFlowStateNone: case AKFLoginFlowStateResendCode: + case AKFLoginFlowStateCountryCode: return nil; case AKFLoginFlowStatePhoneNumberInput: title = @"Enter your phone number"; diff --git a/samples/LoginSample/LoginSample/AKThemes/ReverbUIManager.m b/samples/LoginSample/LoginSample/AKThemes/ReverbUIManager.m index 311791aea2..aacefa5993 100644 --- a/samples/LoginSample/LoginSample/AKThemes/ReverbUIManager.m +++ b/samples/LoginSample/LoginSample/AKThemes/ReverbUIManager.m @@ -1,4 +1,4 @@ -// Copyright (c) 2014-present, Facebook, Inc. All rights reserved. +// Copyright 2004-present Facebook. All Rights Reserved. // // You are hereby granted a non-exclusive, worldwide, royalty-free license to use, // copy, modify, and distribute this software in source code or binary form for use @@ -91,6 +91,7 @@ - (nullable UIView *)bodyViewForState:(AKFLoginFlowState)state case AKFLoginFlowStateCodeInput: case AKFLoginFlowStateNone: case AKFLoginFlowStateResendCode: + case AKFLoginFlowStateCountryCode: return nil; } @@ -112,6 +113,7 @@ - (AKFButtonType)buttonTypeForState:(AKFLoginFlowState)state case AKFLoginFlowStateEmailVerify: case AKFLoginFlowStateSendingCode: case AKFLoginFlowStateVerifyingCode: + case AKFLoginFlowStateCountryCode: case AKFLoginFlowStateResendCode: return AKFButtonTypeDefault; } @@ -143,6 +145,7 @@ - (nullable UIView *)footerViewForState:(AKFLoginFlowState)state break; case AKFLoginFlowStateError: case AKFLoginFlowStateResendCode: + case AKFLoginFlowStateCountryCode: case AKFLoginFlowStateNone: return nil; } diff --git a/samples/LoginSample/LoginSample/LoginViewController.m b/samples/LoginSample/LoginSample/LoginViewController.m index e6007d7e87..6d8d505174 100644 --- a/samples/LoginSample/LoginSample/LoginViewController.m +++ b/samples/LoginSample/LoginSample/LoginViewController.m @@ -1,4 +1,4 @@ -// Copyright (c) 2014-present, Facebook, Inc. All rights reserved. +// Copyright 2004-present Facebook. All Rights Reserved. // // You are hereby granted a non-exclusive, worldwide, royalty-free license to use, // copy, modify, and distribute this software in source code or binary form for use @@ -19,14 +19,13 @@ #import "LoginViewController.h" #import - #import - #import -#import "FBTweakInline.h" -#import "FBTweakStore.h" -#import "FBTweakViewController.h" +#import "FBTweak/FBTweakInline.h" +#import "FBTweak/FBTweakStore.h" +#import "FBTweak/FBTweakViewController.h" + #import "LoggedInViewController.h" #import "SettingsUtil.h" #import "Theme.h" diff --git a/samples/LoginSample/LoginSample/SettingsUtil.m b/samples/LoginSample/LoginSample/SettingsUtil.m index 5f0414241b..12cb9f758b 100644 --- a/samples/LoginSample/LoginSample/SettingsUtil.m +++ b/samples/LoginSample/LoginSample/SettingsUtil.m @@ -1,4 +1,4 @@ -// Copyright (c) 2014-present, Facebook, Inc. All rights reserved. +// Copyright 2004-present Facebook. All Rights Reserved. // // You are hereby granted a non-exclusive, worldwide, royalty-free license to use, // copy, modify, and distribute this software in source code or binary form for use @@ -19,8 +19,9 @@ #import +#import "FBTweak/FBTweakInline.h" + #import "AdvancedUIManager.h" -#import "FBTweakInline.h" #import "ReverbTheme.h" #import "ReverbUIManager.h" #import "Theme.h" diff --git a/samples/RPSSample/RPSSample/RPSAppDelegate.m b/samples/RPSSample/RPSSample/RPSAppDelegate.m index 7ea031c82f..32fade591c 100644 --- a/samples/RPSSample/RPSSample/RPSAppDelegate.m +++ b/samples/RPSSample/RPSSample/RPSAppDelegate.m @@ -19,9 +19,7 @@ #import "RPSAppDelegate.h" #import - #import - #import #import "RPSAppLinkedViewController.h" @@ -108,9 +106,4 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( return YES; } -- (void)applicationDidBecomeActive:(UIApplication *)application -{ - [FBSDKAppEvents activateApp]; -} - @end diff --git a/samples/Scrumptious/scrumptious/SCAppDelegate.m b/samples/Scrumptious/scrumptious/SCAppDelegate.m index 66d5cbfb3b..ccb663ebee 100644 --- a/samples/Scrumptious/scrumptious/SCAppDelegate.m +++ b/samples/Scrumptious/scrumptious/SCAppDelegate.m @@ -19,9 +19,7 @@ #import "SCAppDelegate.h" #import - #import - #import #import "SCSettings.h" @@ -70,8 +68,6 @@ - (BOOL)application:(UIApplication *)application } - (void)applicationDidBecomeActive:(UIApplication *)application { - [FBSDKAppEvents activateApp]; - // Do the following if you use Mobile App Engagement Ads to get the deferred // app link after your app is installed. [FBSDKAppLinkUtility fetchDeferredAppLink:^(NSURL *url, NSError *error) { diff --git a/samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.m b/samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.m index 15e4b81787..42d447dd6b 100644 --- a/samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.m +++ b/samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.m @@ -55,8 +55,4 @@ - (BOOL)application:(UIApplication *)application return YES; } -- (void)applicationDidBecomeActive:(UIApplication *)application { - [FBSDKAppEvents activateApp]; -} - @end diff --git a/scripts/build_distribution.sh b/scripts/build_distribution.sh index e12e3177be..eec5967e47 100755 --- a/scripts/build_distribution.sh +++ b/scripts/build_distribution.sh @@ -129,10 +129,10 @@ if [ -z $SKIPBUILD ]; then (xcodebuild -workspace "${FB_SDK_ROOT}"/ads/src/FBAudienceNetwork.xcworkspace -scheme "BuildAll-Universal" -configuration Release clean build) || die "Failed to build FBAudienceNetwork" fi FBAN_SAMPLES=$FB_SDK_BUILD_PACKAGE/Samples/FBAudienceNetwork -\cp -R "$FB_SDK_ROOT"/ads/build/FBAudienceNetwork.framework "$FB_SDK_BUILD_PACKAGE" \ +\rsync -avmc "$FB_SDK_ROOT"/ads/build/FBAudienceNetwork.framework "$FB_SDK_BUILD_PACKAGE" \ || die "Could not copy FBAudienceNetwork.framework" \mkdir -p "$FB_SDK_BUILD_PACKAGE/Samples/FBAudienceNetwork" -\cp -R "$FB_SDK_ROOT"/ads/samples/ $FBAN_SAMPLES \ +\rsync -avmc "$FB_SDK_ROOT"/ads/samples/ "$FBAN_SAMPLES" \ || die "Could not copy FBAudienceNetwork samples" # Fix up samples for fname in $(find "$FBAN_SAMPLES" -name "project.pbxproj" -print); do \ @@ -154,6 +154,12 @@ done LANG=C +# Remove all BUCK related files from AN samples +find "$FBAN_SAMPLES" -name "BUCK" -delete +find "$FBAN_SAMPLES" -name "build-buck.sh" -delete +find "$FBAN_SAMPLES" -name "Buck-Info.plist" -delete +find "$FBAN_SAMPLES" -name "Entitlements" -type d -exec rm -r "{}" \; + find "$FBAN_SAMPLES" -name "entitlements.plist" -delete find "$FBAN_SAMPLES" -name "Info.plist" -exec perl -p -i -0777 -e 's/\s*CFBundleURLTypes<\/key>\s*\s*\s*CFBundleURLSchemes<\/key>\s*\s*fb\d*<\/string>\s*<\/array>\s*<\/dict>\s*<\/array>\s*FacebookAppID<\/key>\s*\d*<\/string>\s*FacebookDisplayName<\/key>\s*.*<\/string>\s*LSApplicationQueriesSchemes<\/key>\s*\s*fbapi<\/string>\s*fb-messenger-api<\/string>\s*fbauth2<\/string>\s*fbshareextension<\/string>\s*<\/array>\n//g' {} \; diff --git a/scripts/build_documentation.sh b/scripts/build_documentation.sh index a962ccf5c9..5b687102a4 100755 --- a/scripts/build_documentation.sh +++ b/scripts/build_documentation.sh @@ -17,93 +17,34 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - # This script builds the API documentation from source-level comments. -# This script requires appledoc be installed: https://github.com/tomaz/appledoc +# This script requires jazzy be installed: https://github.com/realm/jazzy . "${FB_SDK_SCRIPT:-$(dirname "$0")}/common.sh" -# ----------------------------------------------------------------------------- -# Build pre-requisites -# - -APPLEDOC_PATH="$FB_SDK_BUILD"/appledoc -progress_message "$APPLEDOC_PATH" +# Make sure jazzy is installed +hash jazzy >/dev/null || die 'Jazzy is not installed! Run `sudo gem install jazzy`' -if [ ! -f "$APPLEDOC_PATH" ]; then - # appledoc is currently being refactored for v3, which will be free from GC. - # In the meantime, use a pre-compiled binary if it is dropped into - # vendor/appledoc_bin/ - VENDOR_APPLEDOC_PATH="$FB_SDK_ROOT"/vendor/appledoc_bin/appledoc - if [ -f "$VENDOR_APPLEDOC_PATH" ]; then - cp "$VENDOR_APPLEDOC_PATH" "$APPLEDOC_PATH" - fi -fi +# Then iterate over the kits +KITS=("FBSDKCoreKit" + "FBSDKShareKit" + "FBSDKLoginKit" + "FBSDKMessengerShareKit" + "AccountKit") -if [ ! -f "$APPLEDOC_PATH" ]; then - progress_message Building appledoc - pushd "$FB_SDK_ROOT"/vendor/appledoc/ >/dev/null - ./install-appledoc.sh -b "$FB_SDK_BUILD" || die 'Could not build appledoc' - popd >/dev/null -fi +CNT=${#KITS[@]} -# ----------------------------------------------------------------------------- -# Build docs -# -progress_message Building Documentation. -test -d "$FB_SDK_BUILD" \ - || mkdir -p "$FB_SDK_BUILD" \ - || die "Could not create directory $FB_SDK_BUILD" +for (( i = 0; i < CNT; i++ )) +do + KITREFDOCS=${KITS[$i]}; -( - HEADERS=("$FB_SDK_BUILD/FBSDKCoreKit.framework/Headers $FB_SDK_BUILD/FBSDKLoginKit.framework/Headers $FB_SDK_BUILD/FBSDKShareKit.framework/Headers" - "$FB_SDK_BUILD/package/FBAudienceNetwork.framework/Headers" - "$FB_SDK_BUILD/package/FBSDKMessengerShareKit.framework/Headers") - PROJECT_NAMES=("Facebook SDK $FB_SDK_VERSION_SHORT for iOS" - "Facebook Audience Network SDK $FB_SDK_VERSION_SHORT for iOS" - "Facebook Messenger Share Kit SDK $MN_SDK_VERSION_SHORT for iOS") - BUNDLE_NAMES=("FacebookSDK-${FB_SDK_VERSION_MAJOR}_${FB_SDK_VERSION_MINOR}-for-iOS.docset" - "FacebookAudienceNetworkSDK-${FB_SDK_VERSION_MAJOR}_${FB_SDK_VERSION_MINOR}-for-iOS.docset" - "FacebookMessengerShareKitSDK-${MN_SDK_VERSION_MAJOR}_${MN_SDK_VERSION_MINOR}-for-iOS.docset") - CNT=${#HEADERS[@]} + # Actually generate the documentation + jazzy --objc --framework-root $FB_SDK_ROOT/$KITREFDOCS --umbrella-header $FB_SDK_ROOT/$KITREFDOCS/$KITREFDOCS/$KITREFDOCS.h --sdk iphoneos --clean --output $FB_SDK_ROOT/docs/$KITREFDOCS - cd "$FB_SDK_ROOT" + # Zip the result so it can be uploaded easily + pushd $FB_SDK_ROOT/docs/ + zip -r $KITREFDOCS.zip $KITREFDOCS + popd +done - for (( i = 0; i < CNT; i++ )) - do - progress_message "Building docs for ${PROJECT_NAMES[$i]}" - DOCSET_OUTPUT="$FB_SDK_BUILD"/docset.build - rm -rf "$DOCSET_OUTPUT" - APPLEDOC_PROJECT_NAME=${PROJECT_NAMES[$i]} - DOCSET_BUNDLE_FILENAME=${BUNDLE_NAMES[$i]} - hash "$APPLEDOC_PATH" &>/dev/null - - if [ "$?" -eq "0" ]; then - "$APPLEDOC_PATH" --project-name "$APPLEDOC_PROJECT_NAME" \ - --project-company "Facebook" \ - --company-id "com.facebook" \ - --output "$DOCSET_OUTPUT" \ - --preprocess-headerdoc \ - --docset-bundle-filename "$DOCSET_BUNDLE_FILENAME" \ - --docset-feed-name "$APPLEDOC_PROJECT_NAME" \ - --docset-install-path "$FB_SDK_BUILD" \ - --exit-threshold 2 \ - --no-install-docset \ - --search-undocumented-doc \ - --keep-undocumented-members \ - --keep-undocumented-objects \ - --explicit-crossref \ - --logformat xcode \ - --no-repeat-first-par \ - ${HEADERS[$i]} \ - || die 'appledoc execution failed' - else - die "appledoc not installed, unable to build documentation" - fi - done -) || die "failed to build docs" - -# ----------------------------------------------------------------------------- -# Done -# common_success diff --git a/scripts/build_framework.sh b/scripts/build_framework.sh index 085aaae2e9..8c85d4523f 100755 --- a/scripts/build_framework.sh +++ b/scripts/build_framework.sh @@ -1,3 +1,4 @@ +#!/bin/sh # Copyright (c) 2014-present, Facebook, Inc. All rights reserved. # # You are hereby granted a non-exclusive, worldwide, royalty-free license to use, @@ -58,13 +59,6 @@ do done -# ----------------------------------------------------------------------------- - -progress_message Updating Submodules - -# ----------------------------------------------------------------------------- -(cd "$FB_SDK_ROOT"; git submodule foreach 'git fetch --tags'; git submodule update --init --recursive) - # ----------------------------------------------------------------------------- progress_message Building Framework. diff --git a/scripts/common.sh b/scripts/common.sh index 8f0ca31b40..ac1e404c96 100755 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -1,3 +1,4 @@ +#!/bin/sh # Copyright (c) 2014-present, Facebook, Inc. All rights reserved. # # You are hereby granted a non-exclusive, worldwide, royalty-free license to use,