From 7e678da77de228ec84f0d01aac3a19c976f57e96 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Wed, 29 May 2024 10:16:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=BF=E8=AF=AD=E7=BF=BB=E8=AF=91=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YuMi/CustomUI/TTPopup/View/TTNewAlertView.m | 2 +- .../View/Cell/XPMineChooseGiveDiamondView.m | 2 +- .../ExchangeAuthority/XPMinePromptWindow.m | 2 +- .../XPMineGuildSetNameViewController.m | 2 +- .../SubViews/XPGuildTimeMonthPickerView.m | 2 +- .../Guild/View/SubViews/XPGuildTimePickView.m | 2 +- .../View/SubViews/XPNewGuildTimePickView.m | 2 +- .../XPMineLoginPasswordViewController.m | 2 +- .../Setting/XPMineResetPayPwdViewController.m | 2 +- .../View/XPRoomMoreMenuViewController.m | 2 +- .../YMRoom/View/RoomGame/View/MSRoomGameVC.m | 2 +- .../View/SubView/MSRoomGameHeadView.m | 21 ++-- .../View/SubViews/XPRoomPKSelectUserView.m | 2 +- .../View/SubViews/XPRoomPKTimePickerView.m | 2 +- .../View/RoomPK/View/XPRoomPKViewController.m | 2 +- .../View/SendGiftView/View/XPGiftBarView.m | 2 +- .../Setting/View/XPRoomSettingInputView.m | 2 +- .../Setting/View/XPRoomTopicViewController.m | 2 +- .../View/XPWishGiftCreateItemViewController.m | 2 +- .../YMRoom/View/XPRoomViewController.m | 2 +- YuMi/Structure/MVP/View/MvpViewController.m | 2 +- YuMi/ar.lproj/Localizable.strings | 101 +++++++++--------- YuMi/en.lproj/Localizable.strings | 50 ++++----- YuMi/zh-Hans.lproj/Localizable.strings | 47 ++++---- YuMi/zh-Hant.lproj/Localizable.strings | 48 ++++----- 25 files changed, 153 insertions(+), 154 deletions(-) diff --git a/YuMi/CustomUI/TTPopup/View/TTNewAlertView.m b/YuMi/CustomUI/TTPopup/View/TTNewAlertView.m index 894d1d91..5936960b 100644 --- a/YuMi/CustomUI/TTPopup/View/TTNewAlertView.m +++ b/YuMi/CustomUI/TTPopup/View/TTNewAlertView.m @@ -95,7 +95,7 @@ -(UIButton *)confirmBtn{ if (!_confirmBtn){ _confirmBtn = [UIButton new]; - [_confirmBtn setTitle:YMLocalizedString(@"XPGiftBarView6") forState:UIControlStateNormal]; + [_confirmBtn setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; _confirmBtn.backgroundColor = UIColorFromRGB(0xE6E6F0); _confirmBtn.layer.cornerRadius = kGetScaleWidth(37)/2; _confirmBtn.layer.masksToBounds = YES; diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m index b5a71727..ffb69b72 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m @@ -415,7 +415,7 @@ -(UIButton *)confirmBtn{ if (!_confirmBtn){ _confirmBtn = [UIButton new]; - [_confirmBtn setTitle:YMLocalizedString(@"XPMineChooseGiveDiamondView1") forState:UIControlStateNormal]; + [_confirmBtn setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; [_confirmBtn setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateNormal]; [_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; [_confirmBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xE6E6F0),UIColorFromRGB(0xE6E6F0)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - kGetScaleWidth(30), kGetScaleWidth(46))] forState:UIControlStateNormal]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m index aee1437f..e432aff7 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m @@ -156,7 +156,7 @@ -(UIButton *)confirmBtn{ if (!_confirmBtn){ _confirmBtn = [UIButton new]; - [_confirmBtn setTitle:YMLocalizedString(@"XPMinePromptWindow3") forState:UIControlStateNormal]; + [_confirmBtn setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; _confirmBtn.layer.cornerRadius = kGetScaleWidth(37)/2; _confirmBtn.layer.masksToBounds = YES; UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(110), kGetScaleWidth(37))]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m index 812328dd..79154313 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m @@ -46,7 +46,7 @@ [self.view addSubview:self.containView]; [self.view addSubview:self.descriptionLabel]; [self.containView addSubview:self.nameTextField]; - [self addNavigationItemWithTitles:@[YMLocalizedString(@"XPMineGuildSetNameViewController1")] titleColor:[DJDKMIMOMColor appMainColor] isLeft:NO target:self action:@selector(completionBtnAction:) tags:nil]; + [self addNavigationItemWithTitles:@[YMLocalizedString(@"TTAlertConfig0")] titleColor:[DJDKMIMOMColor appMainColor] isLeft:NO target:self action:@selector(completionBtnAction:) tags:nil]; } - (void)initSubViewConstraints { diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.m index e829aa0f..086c6331 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.m @@ -1589,7 +1589,7 @@ typedef NS_ENUM(NSInteger,ScrollViewTagValue) { // Button confirm UIButton *sureButton = [[UIButton alloc] initWithFrame:CGRectMake(self.frame.size.width - kHooDatePickerButtonHeaderWidth - kHooDatePickerPadding, 0.0, kHooDatePickerButtonHeaderWidth, self.kHooDatePickerHeaderHeight)]; - [sureButton setTitle:YMLocalizedString(@"XPGuildTimeMonthPickerView3") forState:UIControlStateNormal]; + [sureButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; [sureButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; [sureButton addTarget:self action:@selector(actionButtonValid:) forControlEvents:UIControlEventTouchUpInside]; sureButton.titleLabel.font = [UIFont systemFontOfSize:14]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m index acbd882c..35dce764 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m @@ -323,7 +323,7 @@ - (UIButton *)sureButton { if (!_sureButton) { _sureButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sureButton setTitle:YMLocalizedString(@"XPGuildTimePickView5") forState:UIControlStateNormal]; + [_sureButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; [_sureButton addTarget:self action:@selector(onClickSureButton:) forControlEvents:UIControlEventTouchUpInside]; _sureButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; [_sureButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m index 3bbe691c..d769dc7c 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m @@ -529,7 +529,7 @@ - (UIButton *)sureButton { if (!_sureButton) { _sureButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sureButton setTitle:YMLocalizedString(@"XPGuildTimePickView5") forState:UIControlStateNormal]; + [_sureButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; [_sureButton addTarget:self action:@selector(onClickSureButton:) forControlEvents:UIControlEventTouchUpInside]; _sureButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; [_sureButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.m index 744e86df..a83df24e 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.m @@ -230,7 +230,7 @@ _submitButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_submitButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; [_submitButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled]; - [_submitButton setTitle:YMLocalizedString(@"XPMineLoginPasswordViewController10") forState:UIControlStateNormal]; + [_submitButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; _submitButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; _submitButton.layer.masksToBounds = YES; _submitButton.layer.cornerRadius = 45/2; diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m index ecab3645..1a8f49c2 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m @@ -125,7 +125,7 @@ _submitButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_submitButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; [_submitButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled]; - [_submitButton setTitle:YMLocalizedString(@"XPMineResetPayPwdViewController5") forState:UIControlStateNormal]; + [_submitButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; _submitButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; _submitButton.layer.masksToBounds = YES; _submitButton.layer.cornerRadius = 45/2; diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m index a1586c4d..03af5bd1 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m +++ b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m @@ -430,7 +430,7 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey; TTAlertConfig * config = [[TTAlertConfig alloc] init]; config.title = YMLocalizedString(@"XPRoomMoreMenuViewController17"); config.message = YMLocalizedString(@"XPRoomMoreMenuViewController18"); - config.confirmButtonConfig.title = YMLocalizedString(@"XPRoomMoreMenuViewController19"); + config.confirmButtonConfig.title = YMLocalizedString(@"TTAlertConfig0"); [TTPopup alertWithConfig:config confirmHandler:^{ [self.presenter cleanScreen:roomUid uid:[AccountInfoStorage instance].getUid]; } cancelHandler:^{ diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m index 65f2391b..cd52a47e 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m @@ -54,7 +54,7 @@ make.edges.equalTo(self.view); }]; [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kStatusBarHeight); + make.top.mas_equalTo(kGetScaleWidth(22)); make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(0)); make.height.mas_equalTo(kGetScaleWidth(236)); }]; diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m index 3af39c39..e05910e6 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m @@ -47,32 +47,35 @@ make.top.mas_equalTo(0); make.width.mas_equalTo(kGetScaleWidth(90)); make.height.mas_equalTo(kGetScaleWidth(80)); - make.leading.mas_equalTo(kGetScaleWidth(11)); + make.leading.mas_equalTo(kGetScaleWidth(5)); }]; [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(21)); make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.centerY.equalTo(self.topImageView); + make.top.equalTo(self.topImageView.mas_top).mas_offset(kGetScaleWidth(22)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.backBtn.mas_bottom).offset(-kGetScaleWidth(9)); make.centerX.equalTo(self); }]; [self.pkImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.topImageView.mas_bottom).mas_offset(kGetScaleWidth(5)); + make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(12)); make.width.mas_equalTo(kGetScaleWidth(60)); make.height.mas_equalTo(kGetScaleWidth(53)); make.centerX.equalTo(self); }]; - [self.mineView mas_makeConstraints:^(MASConstraintMaker *make) { + [self.rivalView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.mas_equalTo(kGetScaleWidth(57)); make.centerY.equalTo(self.pkImageView); - make.leading.mas_equalTo(kGetScaleWidth(99)); + + make.leading.equalTo(self.pkImageView.mas_trailing).offset(-kGetScaleWidth(5)); }]; - [self.rivalView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(self.mineView); - make.leading.equalTo(self.mineView.mas_trailing).mas_offset(kGetScaleWidth(52)); + [self.mineView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.width.height.equalTo(self.rivalView); + make.trailing.equalTo(self.rivalView.mas_leading).mas_offset(-kGetScaleWidth(52)); }]; + [self.hintView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.mineView.mas_bottom).mas_offset(kGetScaleWidth(10)); make.leading.trailing.equalTo(self).inset(kGetScaleWidth(10)); @@ -83,7 +86,7 @@ make.leading.mas_equalTo(kGetScaleWidth(21)); make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(81)); make.height.mas_equalTo(kGetScaleWidth(25)); - make.top.equalTo(self.mineView.mas_bottom).mas_offset(kGetScaleWidth(27)); + make.top.equalTo(self.topImageView.mas_bottom).mas_offset(kGetScaleWidth(66)); }]; [self.coinView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(26)); diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m index 22873880..ec6e9e5d 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m @@ -361,7 +361,7 @@ - (UIButton *)confirmButton { if (!_confirmButton) { _confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_confirmButton setTitle:YMLocalizedString(@"XPRoomPKSelectUserView1") forState:UIControlStateNormal]; + [_confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; [_confirmButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; _confirmButton.titleLabel.font = [UIFont systemFontOfSize:15]; [_confirmButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m index 2a8881f6..7fed90f9 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m @@ -197,7 +197,7 @@ - (UIButton *)confirmButton { if (!_confirmButton) { _confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_confirmButton setTitle:YMLocalizedString(@"XPRoomPKTimePickerView6") forState:UIControlStateNormal]; + [_confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; [_confirmButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; _confirmButton.titleLabel.font = [UIFont systemFontOfSize:15]; [_confirmButton addTarget:self action:@selector(confirmButtonAction:) forControlEvents:UIControlEventTouchUpInside]; diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m index ff4d10bd..84cec5b2 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m @@ -450,7 +450,7 @@ - (UIButton *)createPKButton { if (!_createPKButton) { _createPKButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_createPKButton setTitle:YMLocalizedString(@"XPRoomPKViewController5") forState:UIControlStateNormal]; + [_createPKButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; [_createPKButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; _createPKButton.titleLabel.font = [UIFont systemFontOfSize:15]; [_createPKButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m index 81f24b87..6a401718 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m @@ -491,7 +491,7 @@ - (UIButton *)sureButton { if (!_sureButton) { _sureButton = [[UIButton alloc] init]; - [_sureButton setTitle:YMLocalizedString(@"XPGiftBarView6") forState:UIControlStateNormal]; + [_sureButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; _sureButton.titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; _sureButton.titleLabel.font = [UIFont systemFontOfSize:15]; _sureButton.backgroundColor = [DJDKMIMOMColor appMainColor]; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m index 99dae1ce..7dd82d77 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m @@ -272,7 +272,7 @@ - (UIButton *)confirmButton { if (!_confirmButton) { _confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_confirmButton setTitle:YMLocalizedString(@"XPRoomSettingInputView5") forState:UIControlStateNormal]; + [_confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; [_confirmButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; _confirmButton.titleLabel.font = [UIFont systemFontOfSize:15]; [_confirmButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m index a94f961e..ab5e3a8b 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m @@ -239,7 +239,7 @@ - (UIButton *)confirmButton { if (!_confirmButton) { _confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_confirmButton setTitle:YMLocalizedString(@"XPRoomTopicViewController4") forState:UIControlStateNormal]; + [_confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; [_confirmButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; _confirmButton.titleLabel.font = [UIFont systemFontOfSize:15]; [_confirmButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateItemViewController.m b/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateItemViewController.m index 1651be1d..a536d94c 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateItemViewController.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateItemViewController.m @@ -488,7 +488,7 @@ - (UIButton *)sureButton { if (!_sureButton) { _sureButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sureButton setTitle:YMLocalizedString(@"XPWishGiftCreateItemViewController10") forState:UIControlStateNormal]; + [_sureButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; [_sureButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; _sureButton.titleLabel.font = [UIFont systemFontOfSize:14]; [_sureButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index f2d8929f..24292f93 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -1965,7 +1965,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 if ([self.littleGameView isInSudGame]) { TTAlertConfig *config = [[TTAlertConfig alloc] init]; config.cancelButtonConfig.title = YMLocalizedString(@"XPRoomSettingInputView4"); - config.confirmButtonConfig.title = YMLocalizedString(@"XPRoomSettingInputView5"); + config.confirmButtonConfig.title = YMLocalizedString(@"TTAlertConfig0"); config.message = YMLocalizedString(@"XPRoomViewController14"); [TTPopup alertWithConfig:config confirmHandler:^{ // 知道了 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ diff --git a/YuMi/Structure/MVP/View/MvpViewController.m b/YuMi/Structure/MVP/View/MvpViewController.m index 99c019e0..acfc7a35 100644 --- a/YuMi/Structure/MVP/View/MvpViewController.m +++ b/YuMi/Structure/MVP/View/MvpViewController.m @@ -101,7 +101,7 @@ TTAlertConfig *config = [[TTAlertConfig alloc] init]; config.message = YMLocalizedString(@"MvpViewController3"); config.messageLineSpacing = 4; - config.confirmButtonConfig.title = YMLocalizedString(@"MvpViewController4"); + config.confirmButtonConfig.title = YMLocalizedString(@"TTAlertConfig0"); config.confirmButtonConfig.titleColor = UIColor.whiteColor; config.confirmButtonConfig.backgroundColor = [DJDKMIMOMColor appMainColor]; diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index db6b2081..65334125 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -65,7 +65,7 @@ "XPGoldDetailsChooseRoomView0"="الكل"; "XPIncomeRecordGoldDetailsPickViewView0"="إلغاء"; -"XPIncomeRecordGoldDetailsPickViewView1"="تأكيد"; + "XPIncomeRecordGoldDetailsPickViewView2"="إلى"; ///XPMineGuildEmptyTableViewCell.m "XPMineGuildEmptyTableViewCell0" = "لا توجد بيانات حالياً"; @@ -132,7 +132,7 @@ "MvpViewController3" = "من أجل خلق بيئة عمل آمنة على الإنترنت\nوحماية سلامة ممتلكاتك وممتلكات الآخرين،\nيرجى استكمال المصادقة بالاسم الحقيقي أولاً"; -"MvpViewController4" = "تأكيد"; + "MvpViewController5" = "المصادقة بالاسم الحقيقي"; "MvpViewController6" = "لقد تم حظرك"; "MvpViewController7" = "تم حظر حسابك بسبب %@\nوقت فتح الحظر: %@"; @@ -152,7 +152,7 @@ "XPMinePromptWindow0" = "إغلاق التبادل"; "XPMinePromptWindow1" = "هل أنت متأكد أنك تريد إغلاق صلاحية تبادل العملات الذهبية لـ %@؟"; "XPMinePromptWindow2" = "إلغاء"; -"XPMinePromptWindow3" = "تأكيد"; + "XPMineExchangeAuthorityFooderView0" = "لا يوجد المزيد من الأعضاء الذين لا يمكنهم تبادل العملات الذهبية مؤقتًا ~"; "XPMineExchangeAuthorityFooderView1" = "لا يوجد المزيد من الأعضاء الذين يمكنهم تبادل العملات الذهبية مؤقتًا ~"; @@ -234,13 +234,13 @@ ///XPGuildTimePickView.m "XPGuildTimePickView3" = "لا يمكن أن يكون تاريخ الانتهاء قبل تاريخ البدء"; "XPGuildTimePickView4" = "إلغاء"; -"XPGuildTimePickView5" = "تأكيد"; + "XPGuildTimePickView6" = "يمكنك فقط عرض إحصائيات التسوية للثلاثة أشهر الماضية"; ///XPGuildTimeMonthPickerView.m -"XPGuildTimeMonthPickerView0" = "تأكيد"; -"XPGuildTimeMonthPickerView1" = "إلغاء"; + + "XPGuildTimeMonthPickerView2" = "إلغاء"; -"XPGuildTimeMonthPickerView3" = "تأكيد"; + ///XPGuildHeaderView.m "XPGuildHeaderView0" = "المعرف: %@"; @@ -254,7 +254,7 @@ ///XPGuildSearchNavView.m "XPGuildSearchNavView0" = "البحث باللقب/%@ المعرف"; -"XPGuildSearchNavView1" = "بحث"; + ///XPGuildIncomeHeaderView.m "XPGuildIncomeHeaderView0" = "يوم MM، dd"; @@ -267,7 +267,7 @@ "XPMinePersonalCenterCell0" = "مركز شخصي"; "XPMinePersonalCenterCell1" = "غرفتي"; "XPMinePersonalCenterCell2" = "سجل الإيرادات"; -"XPMinePersonalCenterCell3" = "هداياي"; +"XPMinePersonalCenterCell3" = "تحويلاتي"; "XPIncomeRecordView0"="التفاصيل"; "XPIncomeRecordView1"="شحن"; @@ -278,7 +278,7 @@ "XPIncomeRecordVC0"="سجل الإيرادات"; -"XPExchangeDiamondsItemView0"="عملاتي: %@"; + "XPExchangeDiamondsItemView1"="الماس الخاص بي: %.2f"; @@ -325,7 +325,7 @@ "XPWishGiftCreateItemViewController7" = "هدية متوسطة"; "XPWishGiftCreateItemViewController8" = "يجب أن تكون مجموعة كمية الهدية بين %d و %d"; "XPWishGiftCreateItemViewController9" = "يجب أن تكون مجموعة كمية الهدية بين"; -"XPWishGiftCreateItemViewController10" = "تأكيد"; + "XPWishGiftCreateItemViewController11" = "هدية عادية"; "XPWishGiftCreateItemViewController12" = "هدية متوسطة"; "XPWishGiftCreateItemViewController13" = "هدية متقدمة"; @@ -689,7 +689,7 @@ "XPLoginPwdViewController0" = "تم تسجيل الدخول بنجاح"; "XPLoginPwdViewController1" = "تسجيل الدخول بكلمة المرور"; "XPLoginPwdViewController2" = "الرجاء إدخال رقم هاتف/معرف"; -"XPLoginPwdViewController3" = "الرجاء إدخال كلمة المرور"; + "XPLoginPwdViewController4" = "تسجيل الدخول برقم الهاتف"; "XPLoginPwdViewController5" = "نسيت كلمة المرور"; "XPLoginPwdViewController6" = "الرجاء إدخال حساب MoliStar"; @@ -796,7 +796,7 @@ "XPUserCardPresenter5" = "غلق المايك"; "XPUserCardPresenter10" = "غلق المقعد"; -"TTAlertConfig0" = "موافق"; +"TTAlertConfig0" = "تأكيد"; "XPUserCardPresenter7" = "دعوة للمقعد"; "TTActionSheetView0" = "إلغاء"; "XPUserCardPresenter8" = "ترك المايك"; @@ -940,7 +940,7 @@ "XPDressUpShopViewController0" = "تجهيزاتي"; "XPDressUpShopViewController1" = "متجر الزينة"; "XPDressUpShopViewController6" = "فقاعات الدردشة"; -"XPDressUpShopViewController7" = "عملاتي الذهبية"; +"XPDressUpShopViewController7" = "كوينزاتي"; "XPDressUpShopViewController8" = "إعادة شحن"; "XPMineFansTeamViewController0" = "المجموعات التي انضممت إليها من المعجبين"; @@ -1024,11 +1024,11 @@ ineHeadView12" = "الحمل"; ///XPMonentsLayoutConfig.m "XPMonentsLayoutConfig0" = "مثبت "; "XPMineUserInfoDateView0" = "إلغاء"; -"XPMineUserInfoDateView1" = "موافق"; + "XPMineUserInfoDateView2" = "انتهى"; "XPMineUserInfoDateView3" = "سنة"; "XPMineUserInfoDateView4" = "برج"; -"XPMineRechageHeadView0" = "عملاتي الذهبية"; +"XPMineRechageHeadView0" = "كوينزاتي"; "XPMineRechargeNavView0" = "الحساب"; @@ -1169,7 +1169,7 @@ ineHeadView12" = "الحمل"; "XPMineVisitorViewController2" = "لا توجد سجلات زوار حاليًا"; "XPMineViewController0" = "من أجل خلق بيئة إنترنت آمنة أكثر\n لحماية أموالك وأموال الآخرين\n يرجى إكمال التحقق من الهوية أولاً"; -"XPMineViewController1" = "موافق"; + "XPMineViewController2" = "التحقق من الهوية"; "XPSimpleMineViewController0" = "ليس لديك بعد انضمام إلى النقابة"; @@ -1180,7 +1180,7 @@ ineHeadView12" = "الحمل"; "XPSimpleMineViewController5" = "تقديم ملاحظات"; "XPSimpleMineViewController6" = "الإعدادات"; -"XPIAPRechargeHeaderView0" = "عملاتي الذهبية"; +"XPIAPRechargeHeaderView0" = "كوينزاتي"; "XPIAPRechargeViewController0" = "فشلت عملية الشراء"; "XPIAPRechargeViewController1" = "حدث خطأ غير معروف، يرجى المحاولة مرة أخرى"; @@ -1212,7 +1212,7 @@ ineHeadView12" = "الحمل"; "XPMinePayPwdViewController5" = "يجب أن تكون كلمة مرور الدفع أرقامًا فقط"; "XPMinePayPwdViewController6" = "كلمتا المرور غير متطابقتين"; "XPMinePayPwdViewController7" = "الرجاء إدخال رمز التحقق"; -"XPMinePayPwdViewController8" = "موافق"; + "XPMinePayPwdViewController9" = "تم إرسال رمز التحقق إلى هاتفك المحمول المُرتبط %@****%@"; "XPMinePayPwdViewController10" = "إدخال كلمة مرور الدفع"; "XPMinePayPwdViewController11" = "إعادة إدخال كلمة مرور الدفع"; @@ -1225,7 +1225,7 @@ ineHeadView12" = "الحمل"; "XPMineResetPayPwdViewController2" = "كلمتا المرور غير متطابقتين"; "XPMineResetPayPwdViewController3" = "إدخال كلمة مرور الدفع"; "XPMineResetPayPwdViewController4" = "إعادة إدخال كلمة مرور الدفع"; -"XPMineResetPayPwdViewController5" = "موافق"; + "XPMineSettingViewController0" = "الإعدادات"; "XPMineSettingViewController1" = "يرجى ربط رقم الهاتف المحمول أولاً"; @@ -1246,7 +1246,7 @@ ineHeadView12" = "الحمل"; "XPMineModifPayPwdViewController4" = "الرجاء إدخال كلمة مرور الدفع الحالية"; "XPMineModifPayPwdViewController5" = "إدخال كلمة مرور الدفع"; "XPMineModifPayPwdViewController6" = "إعادة إدخال كلمة مرور الدفع"; -"XPMineModifPayPwdViewController7" = "موافق"; + "XPMineModifPayPwdViewController8" = "نسيت كلمة المرور"; "XPMineFeedbackViewController0" = "ردود الفعل"; @@ -1282,7 +1282,7 @@ ineHeadView12" = "الحمل"; "XPMineLoginPasswordViewController7" = "الرجاء إدخال كلمة المرور"; "XPMineLoginPasswordViewController8" = "الرجاء تأكيد كلمة المرور مرة أخرى"; "XPMineLoginPasswordViewController9" = "تعيين كلمة المرور"; -"XPMineLoginPasswordViewController10" = "موافق"; + "XPMineLoginPasswordViewController11" = "نسيت كلمة المرور"; "XPMineLoginPasswordViewController12" = "يجب أن تحتوي كلمة المرور على 6 إلى 16 حرفًا يتكون من أرقام وأحرف إنجليزية فقط"; @@ -1380,7 +1380,7 @@ ineHeadView12" = "الحمل"; "XPHomeSearchRelateView0" = "الغرف ذات الصلة"; "XPHomeSearchNavView0" = "البحث عن الاسم / الهوية / اسم الغرفة"; -"XPHomeSearchNavView1" = "بحث"; +"XPHomeSearchNavView1" = "البحث"; "XPRoomSearchRecommendHeadView0" = "لا توجد غرف في قاعة البث حاليًا"; "XPRoomSearchRecommendHeadView1" = "نوصي لك"; @@ -1506,12 +1506,12 @@ ineHeadView12" = "الحمل"; "XPRoomPKTimePickerView3" = "%d دقيقة %d ثانية"; "XPRoomPKTimePickerView4" = "%d ثانية"; "XPRoomPKTimePickerView5" = "إلغاء"; -"XPRoomPKTimePickerView6" = "تأكيد"; + "XPRoomPKTimePickerView7" = "0 ثانية"; "XPRoomPKTimePickerView8" = "30 ثانية"; "XPRoomPKSelectUserView0" = "NO.0"; -"XPRoomPKSelectUserView1" = "تأكيد"; + "XPRoomPKSelectUserView2" = "NO.%d"; "XPRoomPKUserView0" = "في انتظار التصعيد"; @@ -1555,7 +1555,7 @@ ineHeadView12" = "الحمل"; "XPRoomPKViewController2" = "تم الإنشاء بنجاح"; "XPRoomPKViewController3" = "إنهاء PK، سيتم إغلاق PK الحالي واستعادة وضع الغرفة العادي، هل أنت متأكد من إغلاق PK الحالي؟"; "XPRoomPKViewController4" = "سيؤدي إنشاء هذا الـ PK إلى استبدال الـ PK الحالي، هل أنت متأكد من الاستبدال؟"; -"XPRoomPKViewController5" = "تأكيد"; + "XPRoomPKViewController6" = "إعادة الإنشاء"; "XPRoomPKViewController7" = "إغلاق وضع PK"; @@ -1786,7 +1786,7 @@ ineHeadView12" = "الحمل"; "XPRoomMoreMenuViewController16" = "هل تريد إلغاء التوصيل؟"; "XPRoomMoreMenuViewController17" = "تنبيه"; "XPRoomMoreMenuViewController18" = "هل تريد بالتأكيد مسح جميع رسائل الشاشة العامة؟\n(لا يمكن التراجع بعد المسح)"; -"XPRoomMoreMenuViewController19" = "تأكيد"; + "XPRoomMoreMenuViewController20" = "لا يمكن تفعيل بطولة عبر الغرف أثناء وضع التعارف!"; "XPRoomMoreMenuViewController21" = "لا يمكن تفعيل بطولة عبر الغرف أثناء البطولة!"; @@ -2105,7 +2105,7 @@ ineHeadView12" = "الحمل"; "XPGiftBarView3" = "إرسال"; "XPGiftBarView4" = "إرسال"; "XPGiftBarView5" = "الرجاء إدخال مبلغ الهدية"; -"XPGiftBarView6" = "تأكيد"; + "XPGiftUsersView0" = "إرسال الكل"; "XPGiftUsersView1" = "إرسال الكل"; @@ -2364,7 +2364,7 @@ ineHeadView12" = "الحمل"; "XPRoomSettingInputView2" = "أدخل كلمة المرور"; "XPRoomSettingInputView3" = "الرجاء إدخال"; "XPRoomSettingInputView4" = "إلغاء"; -"XPRoomSettingInputView5" = "تأكيد"; + "XPRoomSettingInputView6" = "كلمة المرور خاطئة، يرجى إعادة المحاولة"; "XPRoomOnLineViewController0" = "لا يوجد أعضاء في الغرفة حاليًا"; @@ -2396,7 +2396,7 @@ ineHeadView12" = "الحمل"; "XPRoomTopicViewController1" = "لا يمكن ترك العنوان فارغًا"; "XPRoomTopicViewController2" = "يرجى تعيين عنوان الإعلان"; "XPRoomTopicViewController3" = "الرجاء إدخال محتوى الإعلان"; -"XPRoomTopicViewController4" = "تأكيد"; + "XPRoomInviteUserViewController1" = "الجمهور المتصل عبر الانترنت"; "XPRoomInviteUserViewController2" = "لا يوجد مستخدمين قابلين للدعوة حاليًا"; @@ -2457,7 +2457,7 @@ ineHeadView12" = "الحمل"; "XPWishGiftCreateItemViewController7" = "هدية متوسطة"; "XPWishGiftCreateItemViewController8" = "يجب أن يكون عدد الهدايا بين %d و %d"; "XPWishGiftCreateItemViewController9" = "يجب أن يكون عدد الهدايا بين"; -"XPWishGiftCreateItemViewController10" = "تأكيد"; + "XPWishGiftCreateItemViewController11" = "هدية عادية"; "XPWishGiftCreateItemViewController12" = "هدية متوسطة"; "XPWishGiftCreateItemViewController13" = "هدية متقدمة"; @@ -2877,7 +2877,7 @@ ineHeadView12" = "الحمل"; "XPLoginPwdViewController0" = "تم تسجيل الدخول بنجاح"; "XPLoginPwdViewController1" = "تسجيل الدخول بكلمة المرور"; "XPLoginPwdViewController2" = "الرجاء إدخال رقم الهاتف / الهوية"; -"XPLoginPwdViewController3" = "الرجاء إدخال كلمة المرور"; +"XPLoginPwdViewController3" = "من فضلك إدخل الرقم السري"; "XPLoginPwdViewController4" = "تسجيل الدخول باستخدام رقم الهاتف"; "XPLoginPwdViewController5" = "نسيت كلمة المرور"; "XPLoginPwdViewController6" = "الرجاء إدخال حساب MoliStar الخاص بك"; @@ -2941,7 +2941,7 @@ ineHeadView12" = "الحمل"; "MvpViewController1" = "%@\n\nيرجى الاتصال بخدمة العملاء (WeChat: kefu01) للحصول على استفسارات"; "MvpViewController2" = "تم إلغاء تسجيل الحساب"; "MvpViewController3" = "من أجل خلق بيئة إنترنت آمنة أكثر\nحماية ممتلكاتك وممتلكات الآخرين\nيرجى تقديم التحقق الهوية أولا"; -"MvpViewController4" = "تحديد"; + "MvpViewController5" = "التحقق من الهوية"; "MvpViewController6" = "تم حظر حسابك"; "MvpViewController7" = "تم حظر حسابك بسبب %@\nوقت فك الحظر: %@"; @@ -2998,13 +2998,10 @@ ineHeadView12" = "الحمل"; "XPGuildTimePickView2" = "يجب أن يكون فارق التاريخ بين تاريخ البدء وتاريخ الانتهاء لا يتجاوز 6 أشهر"; "XPGuildTimePickView3" = "لا يجب أن يكون تاريخ الانتهاء قبل تاريخ البدء"; "XPGuildTimePickView4" = "إلغاء"; -"XPGuildTimePickView5" = "تأكيد"; + "XPGuildTimePickView6" = "يمكن فقط عرض الإحصائيات لآخر 3 أشهر"; -///XPGuildTimeMonthPickerView.m -"XPGuildTimeMonthPickerView0" = "تأكيد"; -"XPGuildTimeMonthPickerView1" = "إلغاء"; -"XPGuildTimeMonthPickerView2" = "إلغاء"; -"XPGuildTimeMonthPickerView3" = "تأكيد"; + + ///XPGuildHeaderView.m "XPGuildHeaderView0" = "الهوية: %@"; @@ -3018,7 +3015,7 @@ ineHeadView12" = "الحمل"; ///XPGuildSearchNavView.m "XPGuildSearchNavView0" = "البحث عن الاسم/معرف %@"; -"XPGuildSearchNavView1" = "بحث"; +"XPGuildSearchNavView1" = "البحث"; ///XPGuildIncomeHeaderView.m "XPGuildIncomeHeaderView0" = "MM شهر dd يوم"; @@ -3070,7 +3067,7 @@ ineHeadView12" = "الحمل"; ///XPMineGuildSetNameViewController.m "XPMineGuildSetNameViewController0" = "تعيين اسم الغرفة"; -"XPMineGuildSetNameViewController1" = "تحديد"; + "XPMineGuildSetNameViewController2" = "لقد تجاوزت الحد الأقصى لعدد الأحرف المسموح به"; "XPMineGuildSetNameViewController3" = "لقد تجاوزت الحد الأقصى لعدد الأحرف المسموح به"; "XPMineGuildSetNameViewController4" = "اسم الغرفة لا يمكن أن يكون فارغًا"; @@ -3081,7 +3078,7 @@ ineHeadView12" = "الحمل"; "MessageContentGuildDialogView1"="رفض الطلب"; "MessageContentGuildDialogView2"="لا يتم قبول طلب المستخدم هذا مرة أخرى خلال 7 أيام"; "MessageContentGuildDialogView3"="إلغاء"; -"MessageContentGuildDialogView4"="تأكيد"; + "MessageContentGuildDialogView5"="هل أنت متأكد من قبول طلب الانضمام إلى الغرفة من هذا المستخدم؟"; "MessageContentGuildDialogView6"="هل أنت متأكد من رفض طلب الانضمام إلى الغرفة من هذا المستخدم؟"; "MessageContentGuildDialogView7"="قبول"; @@ -3107,25 +3104,25 @@ ineHeadView12" = "الحمل"; "XPMineTheGuildCell1" = "انضم إلى الوكالة"; ///XPMineGiveDiamondVC -"XPMineGiveDiamondVC0" = "التبرعات الخاصة بي"; -"XPMineGiveDiamondVC1"="سجل التبرعات"; +"XPMineGiveDiamondVC0" = "تحويلاتي"; +"XPMineGiveDiamondVC1"="سجل التحويلات"; "XPMineGiveDiamondVC2"="سيتم عرض السجلات للأشهر الثلاثة الأخيرة فقط"; "XPMineGiveDiamondVC3"="لا توجد سجلات تبرع"; ///XPMineGiveDiamondSearchView -"XPMineGiveDiamondSearchView0"="بحث"; -"XPMineGiveDiamondSearchView1"="الرجاء إدخال معرف المستخدم"; +"XPMineGiveDiamondSearchView0"="البحث"; +"XPMineGiveDiamondSearchView1"="البحث عن أي دي المستخدم"; "XPMineGiveDiamondSearchView2"="المستخدم غير موجود"; "XPMineGiveDiamondSearchView3"="ابحث عن اسم الغرفة أو الرقم التعريفي"; ///todo ///XPMineChooseGiveDiamondView "XPMineChooseGiveDiamondView0" = "عملاتي الذهبية:"; -"XPMineChooseGiveDiamondView1"="تحديد"; -"XPMineChooseGiveDiamondView2" = "تحويل النقود"; + +"XPMineChooseGiveDiamondView2" = "تحويل الكوينزات"; "XPMineChooseGiveDiamondView3"="تحويل الهدايا"; ///XPMineChooseGiveDiamondVC -"XPMineChooseGiveDiamondVC0"="تحويل إلى"; +"XPMineChooseGiveDiamondVC0"="تحويل إلي"; "XPMineChooseGiveDiamondVC1"="يرجى تعيين كلمة مرور الدفع أولاً"; "XPMineChooseGiveDiamondVC2"="الذهاب للضبط"; "XPMineChooseGiveDiamondVC3"="تجاوزت الحد اليومي للتحويل بالفعل"; @@ -3134,7 +3131,7 @@ ineHeadView12" = "الحمل"; "XPMineChooseGiveDiamondVC6"="تم التحويل بنجاح"; ///XPMineConfirmGiveDiamondView "XPMineConfirmGiveDiamondView0"="تأكيد الدفع"; -"XPMineConfirmGiveDiamondView1"="تحويل إلى %@"; +"XPMineConfirmGiveDiamondView1"="تحويل %@إلي"; "XPMineConfirmGiveDiamondView2"="رسوم"; "XPMineConfirmGiveDiamondView3" = "إجمالي النقود المستهلكة"; "XPMineConfirmGiveDiamondView4"="عملة"; @@ -3144,11 +3141,11 @@ ineHeadView12" = "الحمل"; "XPMineConfirmGiveDiamondView8"="تأكيد التحويل"; "XPExchangeDiamondsView0" = "تبادل العملات الذهبية"; ///XPMineGiveDiamondDetailsVC -"XPMineGiveDiamondDetailsVC0"="تفاصيل التحويل"; +"XPMineGiveDiamondDetailsVC0"="تفاصيل التحويلات"; "XPMineGiveDiamondDetailsVC1" = "نقود"; "XPMineGiveDiamondDetailsVC2"="الهدايا"; "XPIncomeRecordView2" = "تبادل العملات الذهبية"; -"XPExchangeDiamondsItemView0" = "نقودي: %@"; +"XPExchangeDiamondsItemView0" = "كوينزاتي: %@"; "XPExchangeDiamondsView3" = "على الأقل يجب تحويل %ld نقود"; ///XPMineGiveDiamondDetailsCell diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index 460d7e23..530c5617 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -19,7 +19,7 @@ "XPWishGiftCreateItemViewController7" = "Intermediate Gift"; "XPWishGiftCreateItemViewController8" = "The range of gift quantity needs to be %d~%d"; "XPWishGiftCreateItemViewController9" = "The range of gift quantity needs to be"; -"XPWishGiftCreateItemViewController10" = "Confirm"; + "XPWishGiftCreateItemViewController11" = "Ordinary Gift"; "XPWishGiftCreateItemViewController12" = "Intermediate Gift"; "XPWishGiftCreateItemViewController13" = "Advanced Gift"; @@ -398,7 +398,7 @@ "XPLoginPwdViewController0" = "Login successful"; "XPLoginPwdViewController1" = "Password login"; "XPLoginPwdViewController2" = "Please enter a phone number/ID"; -"XPLoginPwdViewController3" = "Please enter a password"; + "XPLoginPwdViewController4" = "Phone number login"; "XPLoginPwdViewController5" = "Forgot password"; "XPLoginPwdViewController6" = "Please enter a MoliStar account"; @@ -583,7 +583,7 @@ "XPGoldDetailsChooseRoomView0"="All"; "XPIncomeRecordGoldDetailsPickViewView0"="Cancel"; -"XPIncomeRecordGoldDetailsPickViewView1"="Confirm"; + "XPIncomeRecordGoldDetailsPickViewView2"="to"; "XPIncomeRecordGoldDetailsPickViewView3"=""; "XPIncomeRecordGoldDetailsPickViewView4"=""; @@ -777,7 +777,7 @@ ///XPMonentsLayoutConfig.m "XPMonentsLayoutConfig0" = "Top "; "XPMineUserInfoDateView0" = "Cancel"; -"XPMineUserInfoDateView1" = "Confirm"; + "XPMineUserInfoDateView2" = "Done"; "XPMineUserInfoDateView3" = " years old"; "XPMineUserInfoDateView4" = "Sign"; @@ -919,7 +919,7 @@ "XPMineVisitorViewController2" = "No visitor records yet"; "XPMineViewController0" = "To create a safer online environment and protect your and others' property security, please complete real-name authentication first."; -"XPMineViewController1" = "OK"; + "XPMineViewController2" = "Real-name Authentication"; "XPSimpleMineViewController0" = "You don't have any guild yet"; @@ -959,7 +959,7 @@ "XPMinePayPwdViewController5" = "Payment password must be numeric"; "XPMinePayPwdViewController6" = "Passwords entered do not match"; "XPMinePayPwdViewController7" = "Enter verification code"; -"XPMinePayPwdViewController8" = "Confirm"; + "XPMinePayPwdViewController9" = "Verification code sent to your bound phone %@****%@"; "XPMinePayPwdViewController10" = "Enter payment password"; "XPMinePayPwdViewController11" = "Confirm payment password"; @@ -972,7 +972,7 @@ "XPMineResetPayPwdViewController2" = "Passwords entered do not match"; "XPMineResetPayPwdViewController3" = "Enter payment password"; "XPMineResetPayPwdViewController4" = "Confirm payment password"; -"XPMineResetPayPwdViewController5" = "Confirm"; + "XPMineSettingViewController0" = "Settings"; "XPMineSettingViewController1" = "Please bind your phone number first"; @@ -993,7 +993,7 @@ "XPMineModifPayPwdViewController4" = "Enter current payment password"; "XPMineModifPayPwdViewController5" = "Enter payment password"; "XPMineModifPayPwdViewController6" = "Confirm payment password"; -"XPMineModifPayPwdViewController7" = "Confirm"; + "XPMineModifPayPwdViewController8" = "Forgot Password"; "XPMineFeedbackViewController0" = "Feedback"; @@ -1026,7 +1026,7 @@ "XPMineLoginPasswordViewController7" = "Enter password"; "XPMineLoginPasswordViewController8" = "Confirm password again"; "XPMineLoginPasswordViewController9" = "Set password"; -"XPMineLoginPasswordViewController10" = "Confirm"; + "XPMineLoginPasswordViewController11" = "Forgot Password"; "XPMineLoginPasswordViewController12" = "Passwords must be 6-16 characters long with a combination of numbers and letters"; @@ -1245,12 +1245,12 @@ "XPRoomPKTimePickerView3" = "%d minutes %d seconds"; "XPRoomPKTimePickerView4" = "%d seconds"; "XPRoomPKTimePickerView5" = "Cancel"; -"XPRoomPKTimePickerView6" = "Confirm"; + "XPRoomPKTimePickerView7" = "0 seconds"; "XPRoomPKTimePickerView8" = "30 seconds"; "XPRoomPKSelectUserView0" = "NO.0"; -"XPRoomPKSelectUserView1" = "Confirm"; + "XPRoomPKSelectUserView2" = "NO.%d"; "XPRoomPKUserView0" = "Waiting to Get on Mic"; @@ -1295,7 +1295,7 @@ "XPRoomPKViewController2" = "Created Successfully"; "XPRoomPKViewController3" = "Ending the PK will close the ongoing PK and restore normal room mode. Are you sure you want to close the current PK?"; "XPRoomPKViewController4" = "Creating this PK will override the ongoing PK. Are you sure you want to override the current PK?"; -"XPRoomPKViewController5" = "Confirm"; + "XPRoomPKViewController6" = "Create Again"; "XPRoomPKViewController7" = "Close PK Mode"; @@ -1527,7 +1527,7 @@ "XPRoomMoreMenuViewController16" = "Cancel Matching?"; "XPRoomMoreMenuViewController17" = "Prompt"; "XPRoomMoreMenuViewController18" = "Are you sure you want to clear all public screen messages? (Cannot be undone)"; -"XPRoomMoreMenuViewController19" = "Confirm"; + "XPRoomMoreMenuViewController20" = "Cannot enable PK mode during dating!"; "XPRoomMoreMenuViewController21" = "Cannot enable PK mode during cross-room PK!"; @@ -1843,7 +1843,7 @@ "XPGiftBarView3" = "Sending..."; "XPGiftBarView4" = "Send"; "XPGiftBarView5" = "Please enter gift amount"; -"XPGiftBarView6" = "Confirm"; + "XPGiftUsersView0" = "Send All"; "XPGiftUsersView1" = "Send All"; @@ -2446,7 +2446,7 @@ "XPRoomSettingInputView2" = "Enter Password"; "XPRoomSettingInputView3" = "Please Enter"; "XPRoomSettingInputView4" = "Cancel"; -"XPRoomSettingInputView5" = "Confirm"; + "XPRoomSettingInputView6" = "Password incorrect, please re-enter"; "XPRoomOnLineViewController0" = "No room members online"; @@ -2477,7 +2477,7 @@ "XPRoomTopicViewController1" = "The topic cannot be empty"; "XPRoomTopicViewController2" = "Please set an announcement title"; "XPRoomTopicViewController3" = "Please enter announcement content"; -"XPRoomTopicViewController4" = "Confirm"; + "XPRoomInviteUserViewController1" = "Online Audience"; "XPRoomInviteUserViewController2" = "No users available to hug"; @@ -2553,7 +2553,7 @@ "MvpViewController1" = "%@\n\nPlease contact customer service (WeChat: kefu01) for inquiries."; "MvpViewController2" = "This account has been logged off"; "MvpViewController3" = "In order to create a safer online environment\nand protect the property safety of you and others,\nplease complete real-name authentication first"; -"MvpViewController4" = "Confirm"; + "MvpViewController5" = "Real-name Authentication"; "MvpViewController6" = "You have been banned"; "MvpViewController7" = "Your account has been banned due to %@\nUnban time: %@"; @@ -2573,7 +2573,7 @@ "XPMinePromptWindow0" = "Close Exchange"; "XPMinePromptWindow1" = "Are you sure you want to close %@'s Diamonds coin exchange permission?"; "XPMinePromptWindow2" = "Cancel"; -"XPMinePromptWindow3" = "Confirm"; + "XPMineExchangeAuthorityFooderView0" = "No more members who cannot exchange diamonds Coins temporarily~"; "XPMineExchangeAuthorityFooderView1" = "No more members who can exchange diamonds Coins temporarily~"; @@ -2659,13 +2659,13 @@ "XPGuildTimePickView2" = "The difference between start date and end date cannot exceed 6 months"; "XPGuildTimePickView3" = "End date cannot be earlier than start date"; "XPGuildTimePickView4" = "Cancel"; -"XPGuildTimePickView5" = "Confirm"; + "XPGuildTimePickView6" = "You can only view settlement statistics for the past 3 months"; ///XPGuildTimeMonthPickerView.m -"XPGuildTimeMonthPickerView0" = "Confirm"; -"XPGuildTimeMonthPickerView1" = "Cancel"; + + "XPGuildTimeMonthPickerView2" = "Cancel"; -"XPGuildTimeMonthPickerView3" = "Confirm"; + ///XPGuildHeaderView.m "XPGuildHeaderView0" = "ID: %@"; @@ -2853,7 +2853,7 @@ "MessageContentGuildDialogView1"="Refuse to Apply"; "MessageContentGuildDialogView2"="Do not accept applications from this user within 7 days"; "MessageContentGuildDialogView3"="Cancel"; -"MessageContentGuildDialogView4"="Confirm"; + "MessageContentGuildDialogView5"="Are you sure you want to approve this user's application to join the room?"; "MessageContentGuildDialogView6"="Are you sure you want to reject this user's application to join the room?"; "MessageContentGuildDialogView7"="Approve"; @@ -2894,7 +2894,7 @@ ///XPMineChooseGiveDiamondView "XPMineChooseGiveDiamondView0"="My Coins:"; -"XPMineChooseGiveDiamondView1"="Confirm"; + "XPMineChooseGiveDiamondView2"="Gift Coins"; "XPMineChooseGiveDiamondView3"="Gift Gifts"; @@ -2952,7 +2952,7 @@ "XPMinePersonalCenterCell2" = "Income Records"; "XPMinePersonalCenterCell3" = "My Gifting"; "XPMineGuildSetNameViewController0" = "Set Room Name"; -"XPMineGuildSetNameViewController1" = "Confirm"; + "XPMineGuildSetNameViewController2" = "Character limit reached"; "XPMineGuildSetNameViewController3" = "Character limit reached"; "XPMineGuildSetNameViewController4" = "Room name cannot be empty"; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index 9092fa9b..9ca8a9c6 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -377,7 +377,7 @@ ///XPMonentsLayoutConfig.m "XPMonentsLayoutConfig0" = "置顶 "; "XPMineUserInfoDateView0" = "取消"; -"XPMineUserInfoDateView1" = "确定"; + "XPMineUserInfoDateView2" = "完成"; "XPMineUserInfoDateView3" = "岁"; "XPMineUserInfoDateView4" = "座"; @@ -521,7 +521,7 @@ "XPMineVisitorViewController2" = "暂无访客记录"; "XPMineViewController0" = "为了营造更安全的网络环境\n保护您和他人的财产安全\n请先进行实名认证"; -"XPMineViewController1" = "确定"; + "XPMineViewController2" = "实名认证"; "XPSimpleMineViewController0" = "你还没有工会"; @@ -562,7 +562,7 @@ "XPMinePayPwdViewController5" = "支付密码必须为纯数字"; "XPMinePayPwdViewController6" = "两次输入密码不一致"; "XPMinePayPwdViewController7" = "请输入验证码"; -"XPMinePayPwdViewController8" = "确定"; + "XPMinePayPwdViewController9" = "验证码已发送至您绑定的手机%@****%@"; "XPMinePayPwdViewController10" = "输入支付密码"; "XPMinePayPwdViewController11" = "再次输入支付密码"; @@ -575,7 +575,7 @@ "XPMineResetPayPwdViewController2" = "两次输入的密码不一致哦"; "XPMineResetPayPwdViewController3" = "输入支付密码"; "XPMineResetPayPwdViewController4" = "再次输入支付密码"; -"XPMineResetPayPwdViewController5" = "确定"; + "XPMineSettingViewController0" = "设置"; "XPMineSettingViewController1" = "请先绑定手机号码哦~"; @@ -596,7 +596,7 @@ "XPMineModifPayPwdViewController4" = "请输入当前支付密码"; "XPMineModifPayPwdViewController5" = "输入支付密码"; "XPMineModifPayPwdViewController6" = "再次输入支付密码"; -"XPMineModifPayPwdViewController7" = "确定"; + "XPMineModifPayPwdViewController8" = "忘记密码"; "XPMineFeedbackViewController0" = "反馈"; @@ -631,7 +631,7 @@ "XPMineLoginPasswordViewController7" = "输入密码"; "XPMineLoginPasswordViewController8" = "再次确认密码"; "XPMineLoginPasswordViewController9" = "设置密码"; -"XPMineLoginPasswordViewController10" = "确定"; + "XPMineLoginPasswordViewController11" = "忘记密码"; "XPMineLoginPasswordViewController12" = "密码必须使用6-16个字符内的数字和英文字母组合哦"; @@ -857,12 +857,12 @@ "XPRoomPKTimePickerView3" = "%d分%d秒"; "XPRoomPKTimePickerView4" = "%d秒"; "XPRoomPKTimePickerView5" = "取消"; -"XPRoomPKTimePickerView6" = "确定"; + "XPRoomPKTimePickerView7" = "0秒"; "XPRoomPKTimePickerView8" = "30秒"; "XPRoomPKSelectUserView0" = "NO.0"; -"XPRoomPKSelectUserView1" = "确定"; + "XPRoomPKSelectUserView2" = "NO.%d"; "XPRoomPKUserView0" = "等待上麦"; @@ -907,7 +907,7 @@ "XPRoomPKViewController2" = "创建成功"; "XPRoomPKViewController3" = "结束PK,会关闭现在进行的PK并恢复普通房间模式，确定关闭当前PK吗？"; "XPRoomPKViewController4" = "创建此PK，会覆盖现在进行的PK,\n 确定覆盖当前PK吗？"; -"XPRoomPKViewController5" = "确定"; + "XPRoomPKViewController6" = "再次创建"; "XPRoomPKViewController7" = "关闭PK模式"; @@ -1138,7 +1138,7 @@ "XPRoomMoreMenuViewController16" = "取消匹配？"; "XPRoomMoreMenuViewController17" = "提示"; "XPRoomMoreMenuViewController18" = "确定要清空公屏消息吗？\n(清空后不可恢复哦~)"; -"XPRoomMoreMenuViewController19" = "确定"; + "XPRoomMoreMenuViewController20" = "相亲中不可以开启PK模式！"; "XPRoomMoreMenuViewController21" = "跨房PK中不可以开启PK模式！"; @@ -1457,7 +1457,7 @@ "XPGiftBarView3" = "赠送中..."; "XPGiftBarView4" = "赠送"; "XPGiftBarView5" = "请输入赠送数额"; -"XPGiftBarView6" = "确定"; + "XPGiftUsersView0" = "全麦送"; "XPGiftUsersView1" = "全麦送"; @@ -1729,7 +1729,7 @@ "XPRoomSettingInputView2" = "输入密码"; "XPRoomSettingInputView3" = "请输入"; "XPRoomSettingInputView4" = "取消"; -"XPRoomSettingInputView5" = "确定"; + "XPRoomSettingInputView6" = "密码错误，请重新输入"; "XPRoomOnLineViewController0" = "暂没有房间成员在线"; @@ -1760,7 +1760,6 @@ "XPRoomTopicViewController1" = "主题不能为空"; "XPRoomTopicViewController2" = "请设置公告标题"; "XPRoomTopicViewController3" = "请输入公告内容"; -"XPRoomTopicViewController4" = "确定"; "XPRoomInviteUserViewController1" = "在线听众"; "XPRoomInviteUserViewController2" = "暂无可抱用户"; @@ -1818,7 +1817,7 @@ "XPWishGiftCreateItemViewController7" = "中级礼物"; "XPWishGiftCreateItemViewController8" = "礼物数量范围需为%d~%d"; "XPWishGiftCreateItemViewController9" = "礼物数量范围需为"; -"XPWishGiftCreateItemViewController10" = "确定"; + "XPWishGiftCreateItemViewController11" = "普通礼物"; "XPWishGiftCreateItemViewController12" = "中级礼物"; "XPWishGiftCreateItemViewController13" = "高级礼物"; @@ -2270,7 +2269,7 @@ "MvpViewController1" = "%@\n\n请联繫客服（微信：kefu01）咨询哦"; "MvpViewController2" = "该账号已注销"; "MvpViewController3" = "为了营造更安全的网络环境\n保护您和他人的财产安全\n请先进行实名认证"; -"MvpViewController4" = "确定"; + "MvpViewController5" = "实名认证"; "MvpViewController6" = "您被封号了"; "MvpViewController7" = "您的账号因%@被封禁\n解封时间：%@"; @@ -2292,7 +2291,7 @@ "XPMinePromptWindow0"="关闭兑换"; "XPMinePromptWindow1"="确定关闭%@的钻石兑换权限吗？"; "XPMinePromptWindow2"="取消"; -"XPMinePromptWindow3"="确定"; + "XPMineExchangeAuthorityFooderView0"="暂无更多不可兑换钻石的成员~"; @@ -2375,13 +2374,13 @@ "XPGuildTimePickView2" = "开始日期和结束日期相差不得超过6个月"; "XPGuildTimePickView3" = "结束日期不得早于开始日期"; "XPGuildTimePickView4" = "取消"; -"XPGuildTimePickView5" = "确定"; + "XPGuildTimePickView6" = "只能查看前3个月的结算统计"; ///XPGuildTimeMonthPickerView.m -"XPGuildTimeMonthPickerView0" = "确定"; -"XPGuildTimeMonthPickerView1" = "取消"; + + "XPGuildTimeMonthPickerView2" = "取消"; -"XPGuildTimeMonthPickerView3" = "确定"; + ///XPGuildHeaderView.m "XPGuildHeaderView0" = "ID：%@"; @@ -2497,7 +2496,7 @@ ///XPMineGuildSetNameViewController.m "XPMineGuildSetNameViewController0" = "设置房间名"; -"XPMineGuildSetNameViewController1" = "确定"; + "XPMineGuildSetNameViewController2" = "输入字数已达上限"; "XPMineGuildSetNameViewController3" = "输入字数已达上限"; "XPMineGuildSetNameViewController4" = "房间名不能为空"; @@ -2508,7 +2507,7 @@ "MessageContentGuildDialogView1"="拒绝申请"; "MessageContentGuildDialogView2"="7天内不再接受该用户的申请"; "MessageContentGuildDialogView3"="取消"; -"MessageContentGuildDialogView4"="确定"; + "MessageContentGuildDialogView5"="确定通过该用户加入房间的申请吗？"; "MessageContentGuildDialogView6"="确定拒绝该用户加入房间的申请吗？"; "MessageContentGuildDialogView7"="通过"; @@ -2546,7 +2545,7 @@ ///XPMineChooseGiveDiamondView "XPMineChooseGiveDiamondView0"="我的金币："; -"XPMineChooseGiveDiamondView1"="确定"; + "XPMineChooseGiveDiamondView2"="转赠金币"; "XPMineChooseGiveDiamondView3"="转赠礼物"; @@ -2633,7 +2632,7 @@ "XPGoldDetailsChooseRoomView0"="全部"; "XPIncomeRecordGoldDetailsPickViewView0"="取消"; -"XPIncomeRecordGoldDetailsPickViewView1"="确定"; + "XPIncomeRecordGoldDetailsPickViewView2"="至"; "XPIncomeRecordGoldDetailsPickViewView3"="年"; "XPIncomeRecordGoldDetailsPickViewView4"="月"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index 68234e34..1f08e566 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -377,7 +377,7 @@ ///XPMonentsLayoutConfig.m "XPMonentsLayoutConfig0" = "置頂 "; "XPMineUserInfoDateView0" = "取消"; -"XPMineUserInfoDateView1" = "確定"; + "XPMineUserInfoDateView2" = "完成"; "XPMineUserInfoDateView3" = "歲"; "XPMineUserInfoDateView4" = "座"; @@ -522,7 +522,7 @@ "XPMineVisitorViewController2" = "暫無訪客記錄"; "XPMineViewController0" = "為了營造更安全的網絡環境\n保護您和他人的財產安全\n請先進行實名認證"; -"XPMineViewController1" = "確定"; + "XPMineViewController2" = "實名認證"; "XPSimpleMineViewController0" = "你還沒有工會"; @@ -563,7 +563,7 @@ "XPMinePayPwdViewController5" = "支付密碼必須為純數字"; "XPMinePayPwdViewController6" = "兩次輸入密碼不一致"; "XPMinePayPwdViewController7" = "請輸入驗證碼"; -"XPMinePayPwdViewController8" = "確定"; + "XPMinePayPwdViewController9" = "驗證碼已發送至您綁定的手機%@****%@"; "XPMinePayPwdViewController10" = "輸入支付密碼"; "XPMinePayPwdViewController11" = "再次輸入支付密碼"; @@ -576,7 +576,7 @@ "XPMineResetPayPwdViewController2" = "兩次輸入的密碼不一致哦"; "XPMineResetPayPwdViewController3" = "輸入支付密碼"; "XPMineResetPayPwdViewController4" = "再次輸入支付密碼"; -"XPMineResetPayPwdViewController5" = "確定"; + "XPMineSettingViewController0" = "設置"; "XPMineSettingViewController1" = "請先綁定手機號碼哦~"; @@ -597,7 +597,7 @@ "XPMineModifPayPwdViewController4" = "請輸入當前支付密碼"; "XPMineModifPayPwdViewController5" = "輸入支付密碼"; "XPMineModifPayPwdViewController6" = "再次輸入支付密碼"; -"XPMineModifPayPwdViewController7" = "確定"; + "XPMineModifPayPwdViewController8" = "忘記密碼"; "XPMineFeedbackViewController0" = "反饋"; @@ -632,7 +632,7 @@ "XPMineLoginPasswordViewController7" = "輸入密碼"; "XPMineLoginPasswordViewController8" = "再次確認密碼"; "XPMineLoginPasswordViewController9" = "設置密碼"; -"XPMineLoginPasswordViewController10" = "確定"; + "XPMineLoginPasswordViewController11" = "忘記密碼"; "XPMineLoginPasswordViewController12" = "密碼必須使用6-16個字符內的數字和英文字母組合哦"; @@ -858,12 +858,12 @@ "XPRoomPKTimePickerView3" = "%d分%d秒"; "XPRoomPKTimePickerView4" = "%d秒"; "XPRoomPKTimePickerView5" = "取消"; -"XPRoomPKTimePickerView6" = "確定"; + "XPRoomPKTimePickerView7" = "0秒"; "XPRoomPKTimePickerView8" = "30秒"; "XPRoomPKSelectUserView0" = "NO.0"; -"XPRoomPKSelectUserView1" = "確定"; + "XPRoomPKSelectUserView2" = "NO.%d"; "XPRoomPKUserView0" = "等待上麥"; @@ -908,7 +908,7 @@ "XPRoomPKViewController2" = "創建成功"; "XPRoomPKViewController3" = "結束PK,會關閉現在進行的PK並恢復普通房間模式，確定關閉當前PK嗎？"; "XPRoomPKViewController4" = "創建此PK，會覆蓋現在進行的PK,\n 確定覆蓋當前PK嗎？"; -"XPRoomPKViewController5" = "確定"; + "XPRoomPKViewController6" = "再次創建"; "XPRoomPKViewController7" = "關閉PK模式"; @@ -1141,7 +1141,7 @@ "XPRoomMoreMenuViewController16" = "取消匹配？"; "XPRoomMoreMenuViewController17" = "提示"; "XPRoomMoreMenuViewController18" = "確定要清空公屏消息嗎？\n(清空後不可恢復哦~)"; -"XPRoomMoreMenuViewController19" = "確定"; + "XPRoomMoreMenuViewController20" = "相親中不可以開啟PK模式！"; "XPRoomMoreMenuViewController21" = "跨房PK中不可以開啟PK模式！"; @@ -1460,7 +1460,7 @@ "XPGiftBarView3" = "贈送中..."; "XPGiftBarView4" = "贈送"; "XPGiftBarView5" = "請輸入贈送數額"; -"XPGiftBarView6" = "確定"; + "XPGiftUsersView0" = "全麥送"; "XPGiftUsersView1" = "全麥送"; @@ -1724,7 +1724,7 @@ "XPRoomSettingInputView2" = "輸入密碼"; "XPRoomSettingInputView3" = "請輸入"; "XPRoomSettingInputView4" = "取消"; -"XPRoomSettingInputView5" = "確定"; + "XPRoomSettingInputView6" = "密碼錯誤，請重新輸入"; "XPRoomOnLineViewController0" = "暫沒有房間成員在線"; @@ -1755,7 +1755,7 @@ "XPRoomTopicViewController1" = "主題不能為空"; "XPRoomTopicViewController2" = "請設置公告標題"; "XPRoomTopicViewController3" = "請輸入公告內容"; -"XPRoomTopicViewController4" = "確定"; + "XPRoomInviteUserViewController1" = "在線聽眾"; "XPRoomInviteUserViewController2" = "暫無可抱用戶"; @@ -1813,7 +1813,7 @@ "XPWishGiftCreateItemViewController7" = "中級禮物"; "XPWishGiftCreateItemViewController8" = "禮物數量範圍需為%d~%d"; "XPWishGiftCreateItemViewController9" = "禮物數量範圍需為"; -"XPWishGiftCreateItemViewController10" = "確定"; + "XPWishGiftCreateItemViewController11" = "普通禮物"; "XPWishGiftCreateItemViewController12" = "中級禮物"; "XPWishGiftCreateItemViewController13" = "高級禮物"; @@ -2259,7 +2259,7 @@ "MvpViewController1" = "%@\n\n請聯繫客服（微信：kefu01）咨詢哦"; "MvpViewController2" = "該賬號已註銷"; "MvpViewController3" = "為了營造更安全的網絡環境\n保護您和他人的財產安全\n請先進行實名認證"; -"MvpViewController4" = "確定"; + "MvpViewController5" = "實名認證"; "MvpViewController6" = "您被封號了"; "MvpViewController7" = "您的賬號因%@被封禁\n解封時間：%@"; @@ -2281,7 +2281,7 @@ "XPMinePromptWindow0"="關閉兌換"; "XPMinePromptWindow1"="確定關閉%@的鉆石兌換權限嗎？"; "XPMinePromptWindow2"="取消"; -"XPMinePromptWindow3"="確定"; + "XPMineExchangeAuthorityFooderView0"="暫無更多不可兌換鉆石的成員~"; @@ -2364,13 +2364,13 @@ "XPGuildTimePickView2" = "開始日期和結束日期相差不得超過6個月"; "XPGuildTimePickView3" = "結束日期不得早於開始日期"; "XPGuildTimePickView4" = "取消"; -"XPGuildTimePickView5" = "確定"; + "XPGuildTimePickView6" = "只能查看前3個月的結算統計"; ///XPGuildTimeMonthPickerView.m -"XPGuildTimeMonthPickerView0" = "確定"; -"XPGuildTimeMonthPickerView1" = "取消"; + + "XPGuildTimeMonthPickerView2" = "取消"; -"XPGuildTimeMonthPickerView3" = "確定"; + ///XPGuildHeaderView.m "XPGuildHeaderView0" = "ID：%@"; @@ -2486,7 +2486,7 @@ ///XPMineGuildSetNameViewController.m "XPMineGuildSetNameViewController0" = "設置房間名"; -"XPMineGuildSetNameViewController1" = "確定"; + "XPMineGuildSetNameViewController2" = "輸入字數已達上限"; "XPMineGuildSetNameViewController3" = "輸入字數已達上限"; "XPMineGuildSetNameViewController4" = "房間名不能為空"; @@ -2497,7 +2497,7 @@ "MessageContentGuildDialogView1"="拒絕申請"; "MessageContentGuildDialogView2"="7天內不再接受該用戶的申請"; "MessageContentGuildDialogView3"="取消"; -"MessageContentGuildDialogView4"="確定"; + "MessageContentGuildDialogView5"="確定通過該用戶加入房間的申請嗎？"; "MessageContentGuildDialogView6"="確定拒絕該用戶加入房間的申請嗎？"; "MessageContentGuildDialogView7"="通過"; @@ -2535,7 +2535,7 @@ ///XPMineChooseGiveDiamondView "XPMineChooseGiveDiamondView0"="我的金幣："; -"XPMineChooseGiveDiamondView1"="確定"; + "XPMineChooseGiveDiamondView2"="轉贈金幣"; "XPMineChooseGiveDiamondView3"="轉贈禮物"; @@ -2622,7 +2622,7 @@ "XPGoldDetailsChooseRoomView0"="全部"; "XPIncomeRecordGoldDetailsPickViewView0"="取消"; -"XPIncomeRecordGoldDetailsPickViewView1"="確定"; + "XPIncomeRecordGoldDetailsPickViewView2"="至"; "XPIncomeRecordGoldDetailsPickViewView3"="年"; "XPIncomeRecordGoldDetailsPickViewView4"="月";