diff --git a/Limelight/Base.lproj/iPad.storyboard b/Limelight/Base.lproj/iPad.storyboard index b9b03632..43338ddc 100644 --- a/Limelight/Base.lproj/iPad.storyboard +++ b/Limelight/Base.lproj/iPad.storyboard @@ -198,8 +198,8 @@ - - + + @@ -958,7 +958,7 @@ ICAgICAgICAgICAgICA - + diff --git a/Limelight/Base.lproj/iPhone.storyboard b/Limelight/Base.lproj/iPhone.storyboard index 278e400f..5b74ce52 100644 --- a/Limelight/Base.lproj/iPhone.storyboard +++ b/Limelight/Base.lproj/iPhone.storyboard @@ -218,8 +218,8 @@ ICAgICAgICAgICAgIA - - + + @@ -961,7 +961,7 @@ ICAgICAgICAgICAgIA - + @@ -1011,13 +1011,13 @@ ICAgICAgICAgICAgIA - + - + diff --git a/Limelight/Localization/Localizable.xcstrings b/Limelight/Localization/Localizable.xcstrings index 8e6f156f..74ae4514 100644 --- a/Limelight/Localization/Localizable.xcstrings +++ b/Limelight/Localization/Localizable.xcstrings @@ -191,6 +191,29 @@ } } }, + "Alias label (optional)" : { + "extractionState" : "manual", + "localizations" : { + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "别名标签 (可留空)" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "别名标签 (可留空)" + } + }, + "zh-HK" : { + "stringUnit" : { + "state" : "translated", + "value" : "别名标签 (可留空)" + } + } + } + }, "Ball: assumed touch point. Cross: indicator location" : { "extractionState" : "manual", "localizations" : { @@ -703,48 +726,48 @@ } } }, - "Enter the command & key label" : { + "Enter the command & alias label" : { "extractionState" : "manual", "localizations" : { "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "输入按键命令和键帽标签" + "value" : "输入控件命令和别名标签" } }, "zh-Hant" : { "stringUnit" : { "state" : "translated", - "value" : "输入按键命令和键帽标签" + "value" : "输入控件命令和别名标签" } }, "zh-HK" : { "stringUnit" : { "state" : "translated", - "value" : "输入按键命令和键帽标签" + "value" : "输入控件命令和别名标签" } } } }, - "Enter the name you want to save this controller profile as" : { + "Enter the name you want to save this profile as" : { "extractionState" : "manual", "localizations" : { "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "将当前虚拟手柄布局另存为" + "value" : "将当前布局另存为" } }, "zh-Hant" : { "stringUnit" : { "state" : "translated", - "value" : "将当前虚拟手柄布局另存为" + "value" : "将当前布局另存为" } }, "zh-HK" : { "stringUnit" : { "state" : "translated", - "value" : "将当前虚拟手柄布局另存为" + "value" : "将当前布局另存为" } } } @@ -1008,29 +1031,6 @@ } } }, - "Key label (optional)" : { - "extractionState" : "manual", - "localizations" : { - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "键帽标签 (可留空)" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "键帽标签 (可留空)" - } - }, - "zh-HK" : { - "stringUnit" : { - "state" : "translated", - "value" : "键帽标签 (可留空)" - } - } - } - }, "Launch App" : { "extractionState" : "manual", "localizations" : { @@ -1354,25 +1354,25 @@ } } }, - "New Keyboard Button" : { + "New On-Screen Widget" : { "extractionState" : "manual", "localizations" : { "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "新建屏显按键" + "value" : "新建屏显控件" } }, "zh-Hant" : { "stringUnit" : { "state" : "translated", - "value" : "新建屏显按键" + "value" : "新建屏显控件" } }, "zh-HK" : { "stringUnit" : { "state" : "translated", - "value" : "新建屏显按键" + "value" : "新建屏显控件" } } } @@ -1515,25 +1515,25 @@ } } }, - "On-Screen Controls & Buttons" : { + "On-Screen Controls & Widgets" : { "extractionState" : "manual", "localizations" : { "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "屏显虚拟手柄与按键" + "value" : "屏显虚拟手柄与控件" } }, "zh-Hant" : { "stringUnit" : { "state" : "translated", - "value" : "屏显虚拟手柄与按键" + "value" : "屏显虚拟手柄与控件" } }, "zh-HK" : { "stringUnit" : { "state" : "translated", - "value" : "屏显虚拟手柄与按键" + "value" : "屏显虚拟手柄与控件" } } } @@ -2286,25 +2286,25 @@ } } }, - "Tap %d fingers to change on-screen controller layout in stream view, or change the number of fingers required to:" : { + "Tap %d fingers to change layout in stream view, or change the number of fingers required to:" : { "extractionState" : "manual", "localizations" : { "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "在串流视图中轻按%d根手指修改虚拟手柄布局, 或将手势需要的手指数量改为:" + "value" : "在串流视图中轻按%d根手指修改布局, 或将手势需要的手指数量改为:" } }, "zh-Hant" : { "stringUnit" : { "state" : "translated", - "value" : "在串流视图中轻按%d根手指修改虚拟手柄布局, 或将手势需要的手指数量改为:" + "value" : "在串流视图中轻按%d根手指修改布局, 或将手势需要的手指数量改为:" } }, "zh-HK" : { "stringUnit" : { "state" : "translated", - "value" : "在串流视图中轻按%d根手指修改虚拟手柄布局, 或将手势需要的手指数量改为:" + "value" : "在串流视图中轻按%d根手指修改布局, 或将手势需要的手指数量改为:" } } } diff --git a/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m b/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m index 8f4b4506..f19f52e9 100644 --- a/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m +++ b/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m @@ -308,8 +308,8 @@ - (IBAction) addTapped:(id)sender{ - UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"New Keyboard Button"] - message:[LocalizationHelper localizedStringForKey:@"Enter the command & key label"] + UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"New On-Screen Widget"] + message:[LocalizationHelper localizedStringForKey:@"Enter the command & alias label"] preferredStyle:UIAlertControllerStyleAlert]; [alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) { @@ -320,7 +320,7 @@ }]; [alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) { - textField.placeholder = [LocalizationHelper localizedStringForKey:@"Key label (optional)"]; + textField.placeholder = [LocalizationHelper localizedStringForKey:@"Alias label (optional)"]; textField.keyboardType = UIKeyboardTypeASCIICapable; textField.autocorrectionType = UITextAutocorrectionTypeNo; textField.spellCheckingType = UITextSpellCheckingTypeNo; diff --git a/Limelight/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m b/Limelight/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m index 19f46832..4e1c6750 100644 --- a/Limelight/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m +++ b/Limelight/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m @@ -74,7 +74,7 @@ const double NAV_BAR_HEIGHT = 50; /* Loads the OSC profile that user selected, dismisses this VC, then tells the presenting view controller to lay out the on screen buttons according to the selected profile's instructions */ - (IBAction) duplicateTapped:(id)sender { - UIAlertController * inputNameAlertController = [UIAlertController alertControllerWithTitle: [LocalizationHelper localizedStringForKey:@"Enter the name you want to save this controller profile as"] message: @"" preferredStyle:UIAlertControllerStyleAlert]; + UIAlertController * inputNameAlertController = [UIAlertController alertControllerWithTitle: [LocalizationHelper localizedStringForKey:@"Enter the name you want to save this profile as"] message: @"" preferredStyle:UIAlertControllerStyleAlert]; [inputNameAlertController addTextFieldWithConfigurationHandler:^(UITextField *textField) { // pop up notification with text field where user can enter the text they wish to name their OSC layout profile textField.placeholder = [LocalizationHelper localizedStringForKey:@"name"]; textField.textColor = [UIColor lightGrayColor]; diff --git a/Limelight/ViewControllers/SettingsViewController.m b/Limelight/ViewControllers/SettingsViewController.m index becfb918..4a46a85a 100644 --- a/Limelight/ViewControllers/SettingsViewController.m +++ b/Limelight/ViewControllers/SettingsViewController.m @@ -586,7 +586,7 @@ BOOL isCustomResolution(CGSize res) { - (void)showCustomOSCTip { UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"Rebase in Stream View"] - message:[LocalizationHelper localizedStringForKey:@"Tap %d fingers to change on-screen controller layout in stream view, or change the number of fingers required to:", self->oscLayoutFingers] + message:[LocalizationHelper localizedStringForKey:@"Tap %d fingers to change layout in stream view, or change the number of fingers required to:", self->oscLayoutFingers] preferredStyle:UIAlertControllerStyleAlert]; [alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) { @@ -659,7 +659,7 @@ BOOL isCustomResolution(CGSize res) { //if (self.layoutOnScreenControlsVC.isBeingPresented == NO) } else{ - [self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls & Buttons"]]; + [self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls & Widgets"]]; } justEnteredSettingsViewDoNotOpenOscLayoutTool = false; } @@ -727,7 +727,7 @@ BOOL isCustomResolution(CGSize res) { } - (void) touchModeChanged { - // Disable On-Screen Controls & Buttons in non-relative touch mode + // Disable On-Screen Controls & Widgets in non-relative touch mode bool oscSelectorEnabled = [self.touchModeSelector selectedSegmentIndex] == RELATIVE_TOUCH || [self.touchModeSelector selectedSegmentIndex] == REGULAR_NATIVE_TOUCH || [self.touchModeSelector selectedSegmentIndex] == ABSOLUTE_TOUCH; bool customOscEnabled = [self isOnScreenControllerOrButtonEnabled] && [self.onscreenControlSelector selectedSegmentIndex] == OnScreenControlsLevelCustom; bool isNativeTouch = [self.touchModeSelector selectedSegmentIndex] == PURE_NATIVE_TOUCH || [self.touchModeSelector selectedSegmentIndex] == REGULAR_NATIVE_TOUCH; @@ -751,7 +751,7 @@ BOOL isCustomResolution(CGSize res) { //if (self.layoutOnScreenControlsVC.isBeingPresented == NO) } else{ - [self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls & Buttons"]]; + [self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"On-Screen Controls & Widgets"]]; } [self updateTouchModeLabel]; } diff --git a/Limelight/mul.lproj/iPad.xcstrings b/Limelight/mul.lproj/iPad.xcstrings index faf57fc7..2efc76ab 100644 --- a/Limelight/mul.lproj/iPad.xcstrings +++ b/Limelight/mul.lproj/iPad.xcstrings @@ -1478,31 +1478,31 @@ } }, "LGV-5y-piG.text" : { - "comment" : "Class = \"UILabel\"; text = \"On-Screen Controls & Button \"; ObjectID = \"LGV-5y-piG\";", + "comment" : "Class = \"UILabel\"; text = \"On-Screen Controls & Widgets \"; ObjectID = \"LGV-5y-piG\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { "stringUnit" : { "state" : "new", - "value" : "On-Screen Controls & Button " + "value" : "On-Screen Controls & Widgets " } }, "zh-Hans" : { "stringUnit" : { "state" : "needs_review", - "value" : "屏幕虚拟手柄" + "value" : "屏幕虚拟手柄与控件" } }, "zh-Hant" : { "stringUnit" : { "state" : "needs_review", - "value" : "屏幕虚拟手柄" + "value" : "屏幕虚拟手柄与控件" } }, "zh-HK" : { "stringUnit" : { "state" : "needs_review", - "value" : "屏幕虚拟手柄" + "value" : "屏幕虚拟手柄与控件" } } } @@ -1928,31 +1928,31 @@ } }, "Q2V-XF-4jq.title" : { - "comment" : "Class = \"UINavigationItem\"; title = \"Controller & Button Profiles\"; ObjectID = \"Q2V-XF-4jq\";", + "comment" : "Class = \"UINavigationItem\"; title = \"Controller & Widget Profiles\"; ObjectID = \"Q2V-XF-4jq\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { "stringUnit" : { "state" : "new", - "value" : "Controller & Button Profiles" + "value" : "Controller & Widget Profiles" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", - "value" : "屏显手柄与按键布局" + "state" : "needs_review", + "value" : "屏显手柄与控件布局" } }, "zh-Hant" : { "stringUnit" : { - "state" : "translated", - "value" : "屏显手柄与按键布局" + "state" : "needs_review", + "value" : "屏显手柄与控件布局" } }, "zh-HK" : { "stringUnit" : { - "state" : "translated", - "value" : "屏显手柄与按键布局" + "state" : "needs_review", + "value" : "屏显手柄与控件布局" } } } diff --git a/Limelight/mul.lproj/iPhone.xcstrings b/Limelight/mul.lproj/iPhone.xcstrings index 5a8fb16c..55346544 100644 --- a/Limelight/mul.lproj/iPhone.xcstrings +++ b/Limelight/mul.lproj/iPhone.xcstrings @@ -302,31 +302,31 @@ } }, "5pN-Sn-SCN.title" : { - "comment" : "Class = \"UINavigationItem\"; title = \"Controller & Button Profiles\"; ObjectID = \"5pN-Sn-SCN\";", + "comment" : "Class = \"UINavigationItem\"; title = \"Controller & Widget Profiles\"; ObjectID = \"5pN-Sn-SCN\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { "stringUnit" : { "state" : "new", - "value" : "Controller & Button Profiles" + "value" : "Controller & Widget Profiles" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", - "value" : "屏显手柄与按键布局" + "state" : "needs_review", + "value" : "屏显手柄与控件布局" } }, "zh-Hant" : { "stringUnit" : { - "state" : "translated", - "value" : "屏显手柄与按键布局" + "state" : "needs_review", + "value" : "屏显手柄与控件布局" } }, "zh-HK" : { "stringUnit" : { - "state" : "translated", - "value" : "屏显手柄与按键布局" + "state" : "needs_review", + "value" : "屏显手柄与控件布局" } } } @@ -1262,31 +1262,31 @@ } }, "HZT-dd-DuQ.text" : { - "comment" : "Class = \"UILabel\"; text = \"On-Screen Controls & Buttons \"; ObjectID = \"HZT-dd-DuQ\";", + "comment" : "Class = \"UILabel\"; text = \"On-Screen Controls & Widgets \"; ObjectID = \"HZT-dd-DuQ\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { "stringUnit" : { "state" : "new", - "value" : "On-Screen Controls & Buttons " + "value" : "On-Screen Controls & Widgets " } }, "zh-Hans" : { "stringUnit" : { - "state" : "needs_review", - "value" : "屏幕虚拟手柄" + "state" : "translated", + "value" : "屏幕虚拟手柄与控件" } }, "zh-Hant" : { "stringUnit" : { - "state" : "needs_review", - "value" : "屏幕虚拟手柄" + "state" : "translated", + "value" : "屏幕虚拟手柄与控件" } }, "zh-HK" : { "stringUnit" : { - "state" : "needs_review", - "value" : "屏幕虚拟手柄" + "state" : "translated", + "value" : "屏幕虚拟手柄与控件" } } }