From 6ac55a6c0ec2d12d3e03f66dca77d17db7657b1f Mon Sep 17 00:00:00 2001 From: Siqi LIU Date: Mon, 12 Aug 2013 00:38:22 +0800 Subject: localization for literal strings Change-Id: I0fcafd5e29f6f5c75118bc6eda0ecae33cc1f6e3 --- ios/.DS_Store | Bin 15364 -> 15364 bytes ios/iosremote/UIBarButtonItem+Theme.h | 17 +- ios/iosremote/UIBarButtonItem+Theme.m | 17 +- ios/iosremote/en.lproj/iPad_autosize.storyboard | 553 ++++++++++++++++++ ios/iosremote/fr.lproj/Localizable.strings | Bin 0 -> 4918 bytes ios/iosremote/fr.lproj/iPad_autosize.storyboard | 553 ++++++++++++++++++ ios/iosremote/iPad_autosize.storyboard | 633 --------------------- ios/iosremote/iosremote.xcodeproj/project.pbxproj | 177 ++++-- .../xcdebugger/Breakpoints.xcbkptlist | 6 +- .../iosremote/BasePresentationViewController.m | 4 +- .../iosremote/Communication/CommunicationManager.m | 25 +- ios/iosremote/iosremote/Communication/SlideShow.m | 4 +- .../iosremote/Communication/pinValidation_vc.m | 2 +- ios/iosremote/iosremote/LibONavigationController.h | 14 +- ios/iosremote/iosremote/LibONavigationController.m | 14 +- .../iosremote/UIViewController+LibOStyling.h | 14 +- .../iosremote/UIViewController+LibOStyling.m | 14 +- .../iosremote/en.lproj/Localizable.strings | Bin 0 -> 5846 bytes .../iosremote/en.lproj/iPhone_autoSize.storyboard | 96 +--- ios/iosremote/iosremote/fr.lproj/InfoPlist.strings | 2 + .../iosremote/fr.lproj/iPhone_autoSize.storyboard | 546 ++++++++++++++++++ ios/iosremote/iosremote/newServer_vc.m | 19 +- ios/iosremote/iosremote/serverList_vc.m | 15 +- ios/iosremote/iosremote/slideShowPreviewTable_vc.m | 2 +- .../iosremote/slideShowPreviewTable_vc_ipad.m | 2 +- .../iosremote/slideShowPreviewTable_vc_iphone.m | 2 +- .../iosremote/slideShowSwipeInList_ipad.m | 6 - .../iosremote/slideShowSwipeInList_iphone.m | 6 +- ios/iosremote/iosremote/slideShow_vc_iphone.m | 15 +- ios/iosremote/iosremote/timer_clear_btn.png | Bin 4814 -> 3970 bytes ios/iosremote/iosremote/timer_clear_btn@2x.png | Bin 0 -> 6655 bytes ios/iosremote/iosremote/timer_pause_btn.png | Bin 4756 -> 3975 bytes ios/iosremote/iosremote/timer_pause_btn@2x.png | Bin 0 -> 6682 bytes ios/iosremote/iosremote/timer_resume_btn.png | Bin 4937 -> 4260 bytes ios/iosremote/iosremote/timer_resume_btn@2x.png | Bin 0 -> 9844 bytes ios/iosremote/iosremote/timer_start_btn.png | Bin 4812 -> 4182 bytes ios/iosremote/iosremote/timer_start_btn@2x.png | Bin 0 -> 7252 bytes .../iosremote/zh-Hans.lproj/InfoPlist.strings | 2 + .../zh-Hans.lproj/iPhone_autoSize.storyboard | 546 ++++++++++++++++++ ios/iosremote/zh-Hans.lproj/Localizable.strings | Bin 0 -> 4832 bytes .../zh-Hans.lproj/iPad_autosize.storyboard | 553 ++++++++++++++++++ 41 files changed, 2989 insertions(+), 870 deletions(-) create mode 100644 ios/iosremote/en.lproj/iPad_autosize.storyboard create mode 100644 ios/iosremote/fr.lproj/Localizable.strings create mode 100644 ios/iosremote/fr.lproj/iPad_autosize.storyboard delete mode 100644 ios/iosremote/iPad_autosize.storyboard create mode 100644 ios/iosremote/iosremote/en.lproj/Localizable.strings create mode 100644 ios/iosremote/iosremote/fr.lproj/InfoPlist.strings create mode 100644 ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard create mode 100644 ios/iosremote/iosremote/timer_clear_btn@2x.png create mode 100644 ios/iosremote/iosremote/timer_pause_btn@2x.png create mode 100644 ios/iosremote/iosremote/timer_resume_btn@2x.png create mode 100644 ios/iosremote/iosremote/timer_start_btn@2x.png create mode 100644 ios/iosremote/iosremote/zh-Hans.lproj/InfoPlist.strings create mode 100644 ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard create mode 100644 ios/iosremote/zh-Hans.lproj/Localizable.strings create mode 100644 ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard diff --git a/ios/.DS_Store b/ios/.DS_Store index 6ebde5e66f1f..8f456fbba6e4 100644 Binary files a/ios/.DS_Store and b/ios/.DS_Store differ diff --git a/ios/iosremote/UIBarButtonItem+Theme.h b/ios/iosremote/UIBarButtonItem+Theme.h index 5fa5b74dd181..70935f9c30c2 100644 --- a/ios/iosremote/UIBarButtonItem+Theme.h +++ b/ios/iosremote/UIBarButtonItem+Theme.h @@ -1,12 +1,11 @@ -// -// UIBarButtonItem+Theme.h -// VLC for iOS -// -// Created by Romain Goyet on 14/06/13. -// Copyright (c) 2013 Applidium. All rights reserved. -// -// Refer to the COPYING file of the official project for license. -// +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #import diff --git a/ios/iosremote/UIBarButtonItem+Theme.m b/ios/iosremote/UIBarButtonItem+Theme.m index 4f125fc477ee..ccc64150eef6 100644 --- a/ios/iosremote/UIBarButtonItem+Theme.m +++ b/ios/iosremote/UIBarButtonItem+Theme.m @@ -1,12 +1,11 @@ -// -// UIBarButtonItem+Theme.m -// VLC for iOS -// -// Created by Romain Goyet on 14/06/13. -// Copyright (c) 2013 Applidium. All rights reserved. -// -// Refer to the COPYING file of the official project for license. -// +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #import "UIBarButtonItem+Theme.h" diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard new file mode 100644 index 000000000000..fae43a059d9a --- /dev/null +++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard @@ -0,0 +1,553 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ios/iosremote/fr.lproj/Localizable.strings b/ios/iosremote/fr.lproj/Localizable.strings new file mode 100644 index 000000000000..510012ad6fd9 Binary files /dev/null and b/ios/iosremote/fr.lproj/Localizable.strings differ diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard new file mode 100644 index 000000000000..fae43a059d9a --- /dev/null +++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard @@ -0,0 +1,553 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ios/iosremote/iPad_autosize.storyboard b/ios/iosremote/iPad_autosize.storyboard deleted file mode 100644 index 1c261b3c8202..000000000000 --- a/ios/iosremote/iPad_autosize.storyboard +++ /dev/null @@ -1,633 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index a11fc1b506fa..482568621a8c 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -52,6 +52,8 @@ 57FE71E31785C61400B50125 /* pinValidation_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 57FE71E21785C61400B50125 /* pinValidation_vc.m */; }; 57FE71E917861A9000B50125 /* slideShowPreviewTable_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 57FE71E817861A9000B50125 /* slideShowPreviewTable_vc.m */; }; 8C0323AB17A943720037432E /* UIImageView+setImageAnimated.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */; }; + 8C06B31D17B7EC83002F5CF8 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8C06B31B17B7EC83002F5CF8 /* Localizable.strings */; }; + 8C06B31E17B7ED1E002F5CF8 /* iPad_autosize.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8C06B32017B7ED1E002F5CF8 /* iPad_autosize.storyboard */; }; 8C0DC83A17A4177C0099E5AE /* nextButton_pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */; }; 8C0DC83B17A4177C0099E5AE /* nextButton_pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83717A4177C0099E5AE /* nextButton_pressed@2x.png */; }; 8C0DC83C17A4177C0099E5AE /* previousButton_pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */; }; @@ -102,7 +104,6 @@ 8CAD659C17A3EFE700CFB661 /* arrow_right.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659817A3EFE700CFB661 /* arrow_right.png */; }; 8CAD659D17A3EFE700CFB661 /* arrow_right@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659917A3EFE700CFB661 /* arrow_right@2x.png */; }; 8CAD65A017A3F76300CFB661 /* slideShowSwipeInList_ipad.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */; }; - 8CCA024917A2909B0051EA53 /* iPad_autosize.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8CCA024817A2909B0051EA53 /* iPad_autosize.storyboard */; }; BE9EBD071765BF0800283FD2 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE9EBD061765BF0800283FD2 /* CoreImage.framework */; }; /* End PBXBuildFile section */ @@ -174,6 +175,16 @@ 57FE71E817861A9000B50125 /* slideShowPreviewTable_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = slideShowPreviewTable_vc.m; sourceTree = ""; }; 8C0323A917A943720037432E /* UIImageView+setImageAnimated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImageView+setImageAnimated.h"; path = "iosremote/UIImageView+setImageAnimated.h"; sourceTree = ""; }; 8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImageView+setImageAnimated.m"; path = "iosremote/UIImageView+setImageAnimated.m"; sourceTree = ""; }; + 8C06B31C17B7EC83002F5CF8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = iosremote/en.lproj/Localizable.strings; sourceTree = ""; }; + 8C06B31F17B7ED1E002F5CF8 /* en */ = {isa = PBXFileReference; lastKnownFileType = file; name = en; path = en.lproj/iPad_autosize.storyboard; sourceTree = ""; }; + 8C06B32117B7ED2A002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = fr; path = fr.lproj/iPhone_autoSize.storyboard; sourceTree = ""; }; + 8C06B32217B7ED2A002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file; name = fr; path = fr.lproj/iPad_autosize.storyboard; sourceTree = ""; }; + 8C06B32317B7ED2B002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; + 8C06B32417B7ED2B002F5CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = ""; }; + 8C06B32517B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "zh-Hans"; path = "zh-Hans.lproj/iPhone_autoSize.storyboard"; sourceTree = ""; }; + 8C06B32617B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file; name = "zh-Hans"; path = "zh-Hans.lproj/iPad_autosize.storyboard"; sourceTree = ""; }; + 8C06B32717B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; + 8C06B32817B7ED33002F5CF8 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nextButton_pressed.png; sourceTree = ""; }; 8C0DC83717A4177C0099E5AE /* nextButton_pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nextButton_pressed@2x.png"; sourceTree = ""; }; 8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = previousButton_pressed.png; sourceTree = ""; }; @@ -195,8 +206,6 @@ 8C19F42617B04E7C005BDB61 /* navBarBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = navBarBackground.png; sourceTree = ""; }; 8C19F42917B04EC6005BDB61 /* UINavigationController+Theme.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationController+Theme.h"; sourceTree = ""; }; 8C19F42A17B04EC6005BDB61 /* UINavigationController+Theme.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+Theme.m"; sourceTree = ""; }; - 8C19F42B17B04EC6005BDB61 /* UIBarButtonItem+Theme.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIBarButtonItem+Theme.h"; sourceTree = ""; }; - 8C19F42C17B04EC6005BDB61 /* UIBarButtonItem+Theme.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIBarButtonItem+Theme.m"; sourceTree = ""; }; 8C19F42D17B05089005BDB61 /* LibONavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibONavigationController.h; path = iosremote/LibONavigationController.h; sourceTree = ""; }; 8C19F42E17B05089005BDB61 /* LibONavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LibONavigationController.m; path = iosremote/LibONavigationController.m; sourceTree = ""; }; 8C19F43217B056B3005BDB61 /* navBarButtonNormal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "navBarButtonNormal@2x.png"; path = "iosremote/navBarButtonNormal@2x.png"; sourceTree = ""; }; @@ -248,7 +257,6 @@ 8CAD659917A3EFE700CFB661 /* arrow_right@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrow_right@2x.png"; path = "iosremote/arrow_right@2x.png"; sourceTree = ""; }; 8CAD659E17A3F76300CFB661 /* slideShowSwipeInList_ipad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slideShowSwipeInList_ipad.h; path = iosremote/slideShowSwipeInList_ipad.h; sourceTree = ""; }; 8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = slideShowSwipeInList_ipad.m; path = iosremote/slideShowSwipeInList_ipad.m; sourceTree = ""; }; - 8CCA024817A2909B0051EA53 /* iPad_autosize.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = iPad_autosize.storyboard; sourceTree = ""; }; BE9EBD061765BF0800283FD2 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -307,51 +315,8 @@ 57AEEDAA1788D7B2007F4F97 /* Ressources */ = { isa = PBXGroup; children = ( - 8C19F44C17B20426005BDB61 /* add@2x.png */, - 8C19F44817B1FEFD005BDB61 /* gear_transparent_bg.png */, - 8C19F44917B1FEFE005BDB61 /* gear_transparent_bg@2x.png */, - 8C19F44317B1F21B005BDB61 /* gear_pressed.png */, - 8C19F44417B1F21B005BDB61 /* gear_pressed@2x.png */, - 8C19F43F17B1E961005BDB61 /* gear.png */, - 8C19F44017B1E961005BDB61 /* gear@2x.png */, - 8C19F43C17B1D935005BDB61 /* add.png */, - 8C19F43717B145AD005BDB61 /* backButton.png */, - 8C19F43817B145AD005BDB61 /* backButton@2x.png */, - 8C19F43217B056B3005BDB61 /* navBarButtonNormal@2x.png */, - 8C19F42517B04E7C005BDB61 /* navBarBackground@2x.png */, - 8C19F42617B04E7C005BDB61 /* navBarBackground.png */, - 8C26E5D117A5AFE8007DA4B7 /* slideshowRail.png */, - 8C26E5D217A5AFE8007DA4B7 /* slideshowRail@2x.png */, - 8C0DC84617A45B160099E5AE /* libO_icon.png */, - 8C0DC83E17A4185A0099E5AE /* nextButton_normal.png */, - 8C0DC83F17A4185A0099E5AE /* nextButton_normal@2x.png */, - 8C0DC84017A4185A0099E5AE /* previousButton_normal.png */, - 8C0DC84117A4185A0099E5AE /* previousButton_normal@2x.png */, - 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */, - 8C0DC83717A4177C0099E5AE /* nextButton_pressed@2x.png */, - 8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */, - 8C0DC83917A4177C0099E5AE /* previousButton_pressed@2x.png */, - 8CAD659617A3EFE700CFB661 /* arrow_left.png */, - 8CAD659717A3EFE700CFB661 /* arrow_left@2x.png */, - 8CAD659817A3EFE700CFB661 /* arrow_right.png */, - 8CAD659917A3EFE700CFB661 /* arrow_right@2x.png */, - 8C1A170017A2854300B4BB3C /* iosremote_ipad_icon@2x.png */, - 8C1A16FE17A2853F00B4BB3C /* iosremote_ipad_icon.png */, - 8C1A16FC17A2853700B4BB3C /* iosremote_iphone_icon.png */, - 8C1A16FA17A2853100B4BB3C /* iosremote_iphone_icon@2x.png */, - 57CC48C4178B42A400075DE4 /* timer_pause_btn.png */, - 57CC48C5178B42A400075DE4 /* timer_resume_btn.png */, - 571BFAD0178AADA200EF1BDB /* more_icon.png */, - 57AEEDB417899BB4007F4F97 /* slide_finished.png */, - 57AEEDB017895BF5007F4F97 /* pointer_pushed.png */, - 57AEEDAE17895B67007F4F97 /* pointer.png */, - 57867A581787510700EBBE52 /* pushed_next_button.png */, - 57867A591787510700EBBE52 /* released_next_button.png */, - 57867A5C178752CD00EBBE52 /* pushed_previous_button.png */, - 57867A5D178752CD00EBBE52 /* released_previous_button.png */, - 57867A531787172A00EBBE52 /* impress.jpeg */, - 571D4805178B2F080063D93B /* timer_clear_btn.png */, - 571D4806178B2F080063D93B /* timer_start_btn.png */, + 8C06B31A17B7EC6C002F5CF8 /* localizations */, + 8C06B31917B7EC62002F5CF8 /* assets */, ); name = Ressources; sourceTree = ""; @@ -415,6 +380,66 @@ path = iosremote; sourceTree = ""; }; + 8C06B31917B7EC62002F5CF8 /* assets */ = { + isa = PBXGroup; + children = ( + 8C19F44C17B20426005BDB61 /* add@2x.png */, + 8C19F44817B1FEFD005BDB61 /* gear_transparent_bg.png */, + 8C19F44917B1FEFE005BDB61 /* gear_transparent_bg@2x.png */, + 8C19F44317B1F21B005BDB61 /* gear_pressed.png */, + 8C19F44417B1F21B005BDB61 /* gear_pressed@2x.png */, + 8C19F43F17B1E961005BDB61 /* gear.png */, + 8C19F44017B1E961005BDB61 /* gear@2x.png */, + 8C19F43C17B1D935005BDB61 /* add.png */, + 8C19F43717B145AD005BDB61 /* backButton.png */, + 8C19F43817B145AD005BDB61 /* backButton@2x.png */, + 8C19F43217B056B3005BDB61 /* navBarButtonNormal@2x.png */, + 8C19F42517B04E7C005BDB61 /* navBarBackground@2x.png */, + 8C19F42617B04E7C005BDB61 /* navBarBackground.png */, + 8C26E5D117A5AFE8007DA4B7 /* slideshowRail.png */, + 8C26E5D217A5AFE8007DA4B7 /* slideshowRail@2x.png */, + 8C0DC84617A45B160099E5AE /* libO_icon.png */, + 8C0DC83E17A4185A0099E5AE /* nextButton_normal.png */, + 8C0DC83F17A4185A0099E5AE /* nextButton_normal@2x.png */, + 8C0DC84017A4185A0099E5AE /* previousButton_normal.png */, + 8C0DC84117A4185A0099E5AE /* previousButton_normal@2x.png */, + 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */, + 8C0DC83717A4177C0099E5AE /* nextButton_pressed@2x.png */, + 8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */, + 8C0DC83917A4177C0099E5AE /* previousButton_pressed@2x.png */, + 8CAD659617A3EFE700CFB661 /* arrow_left.png */, + 8CAD659717A3EFE700CFB661 /* arrow_left@2x.png */, + 8CAD659817A3EFE700CFB661 /* arrow_right.png */, + 8CAD659917A3EFE700CFB661 /* arrow_right@2x.png */, + 8C1A170017A2854300B4BB3C /* iosremote_ipad_icon@2x.png */, + 8C1A16FE17A2853F00B4BB3C /* iosremote_ipad_icon.png */, + 8C1A16FC17A2853700B4BB3C /* iosremote_iphone_icon.png */, + 8C1A16FA17A2853100B4BB3C /* iosremote_iphone_icon@2x.png */, + 57CC48C4178B42A400075DE4 /* timer_pause_btn.png */, + 57CC48C5178B42A400075DE4 /* timer_resume_btn.png */, + 571BFAD0178AADA200EF1BDB /* more_icon.png */, + 57AEEDB417899BB4007F4F97 /* slide_finished.png */, + 57AEEDB017895BF5007F4F97 /* pointer_pushed.png */, + 57AEEDAE17895B67007F4F97 /* pointer.png */, + 57867A581787510700EBBE52 /* pushed_next_button.png */, + 57867A591787510700EBBE52 /* released_next_button.png */, + 57867A5C178752CD00EBBE52 /* pushed_previous_button.png */, + 57867A5D178752CD00EBBE52 /* released_previous_button.png */, + 57867A531787172A00EBBE52 /* impress.jpeg */, + 571D4805178B2F080063D93B /* timer_clear_btn.png */, + 571D4806178B2F080063D93B /* timer_start_btn.png */, + ); + name = assets; + sourceTree = ""; + }; + 8C06B31A17B7EC6C002F5CF8 /* localizations */ = { + isa = PBXGroup; + children = ( + 8C06B31B17B7EC83002F5CF8 /* Localizable.strings */, + ); + name = localizations; + sourceTree = ""; + }; 8C0DC84E17A511C60099E5AE /* Application */ = { isa = PBXGroup; children = ( @@ -492,8 +517,6 @@ 8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */, 8C19F42917B04EC6005BDB61 /* UINavigationController+Theme.h */, 8C19F42A17B04EC6005BDB61 /* UINavigationController+Theme.m */, - 8C19F42B17B04EC6005BDB61 /* UIBarButtonItem+Theme.h */, - 8C19F42C17B04EC6005BDB61 /* UIBarButtonItem+Theme.m */, 8C19F42D17B05089005BDB61 /* LibONavigationController.h */, 8C19F42E17B05089005BDB61 /* LibONavigationController.m */, 8C19F43417B10D48005BDB61 /* UIViewController+LibOStyling.h */, @@ -528,7 +551,7 @@ children = ( 8C0DC84E17A511C60099E5AE /* Application */, 8CAD658217A2E81F00CFB661 /* Controllers */, - 8CCA024817A2909B0051EA53 /* iPad_autosize.storyboard */, + 8C06B32017B7ED1E002F5CF8 /* iPad_autosize.storyboard */, ); name = iPad; sourceTree = ""; @@ -595,6 +618,7 @@ 57C6E3EB175E06E800E8BC5F /* Sources */, 57C6E3EC175E06E800E8BC5F /* Frameworks */, 57C6E3ED175E06E800E8BC5F /* Resources */, + 8C06B32917B7F1C0002F5CF8 /* ShellScript */, ); buildRules = ( ); @@ -621,6 +645,8 @@ hasScannedForEncodings = 0; knownRegions = ( en, + fr, + "zh-Hans", ); mainGroup = 57C6E3E6175E06E800E8BC5F; productRefGroup = 57C6E3F0175E06E800E8BC5F /* Products */; @@ -660,7 +686,7 @@ 8C1A16FD17A2853700B4BB3C /* iosremote_iphone_icon.png in Resources */, 8C1A16FF17A2853F00B4BB3C /* iosremote_ipad_icon.png in Resources */, 8C1A170117A2854300B4BB3C /* iosremote_ipad_icon@2x.png in Resources */, - 8CCA024917A2909B0051EA53 /* iPad_autosize.storyboard in Resources */, + 8C06B31E17B7ED1E002F5CF8 /* iPad_autosize.storyboard in Resources */, 8CAD659A17A3EFE700CFB661 /* arrow_left.png in Resources */, 8CAD659B17A3EFE700CFB661 /* arrow_left@2x.png in Resources */, 8CAD659C17A3EFE700CFB661 /* arrow_right.png in Resources */, @@ -691,11 +717,28 @@ 8C19F44A17B1FEFE005BDB61 /* gear_transparent_bg.png in Resources */, 8C19F44B17B1FEFE005BDB61 /* gear_transparent_bg@2x.png in Resources */, 8C19F44D17B20427005BDB61 /* add@2x.png in Resources */, + 8C06B31D17B7EC83002F5CF8 /* Localizable.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 8C06B32917B7F1C0002F5CF8 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "python /Users/me/Documents/Coding/libreoffice/core/ios/iosremote/localize.py --mainIdiom=en --mainStoryboard=/Users/me/Documents/Coding/libreoffice/core/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard fr zh-Hans\n\npython /Users/me/Documents/Coding/libreoffice/core/ios/iosremote/localize.py --mainIdiom=en --mainStoryboard=/Users/me/Documents/Coding/libreoffice/core/ios/iosremote/en.lproj/iPad_autosize.storyboard fr zh-Hans"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 57C6E3EB175E06E800E8BC5F /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -745,6 +788,8 @@ isa = PBXVariantGroup; children = ( 57C6E3FC175E06E800E8BC5F /* en */, + 8C06B32417B7ED2B002F5CF8 /* fr */, + 8C06B32817B7ED33002F5CF8 /* zh-Hans */, ); name = InfoPlist.strings; sourceTree = ""; @@ -753,11 +798,33 @@ isa = PBXVariantGroup; children = ( 57DF0A84178FFFAB008B2D3D /* en */, + 8C06B32117B7ED2A002F5CF8 /* fr */, + 8C06B32517B7ED33002F5CF8 /* zh-Hans */, ); name = iPhone_autosize.storyboard; path = iosremote; sourceTree = ""; }; + 8C06B31B17B7EC83002F5CF8 /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + 8C06B31C17B7EC83002F5CF8 /* en */, + 8C06B32317B7ED2B002F5CF8 /* fr */, + 8C06B32717B7ED33002F5CF8 /* zh-Hans */, + ); + name = Localizable.strings; + sourceTree = ""; + }; + 8C06B32017B7ED1E002F5CF8 /* iPad_autosize.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 8C06B31F17B7ED1E002F5CF8 /* en */, + 8C06B32217B7ED2A002F5CF8 /* fr */, + 8C06B32617B7ED33002F5CF8 /* zh-Hans */, + ); + name = iPad_autosize.storyboard; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -787,7 +854,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; ONLY_ACTIVE_ARCH = YES; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; @@ -814,7 +881,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; diff --git a/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist index bbe3fd75c3f8..fccf9c51bbdf 100644 --- a/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ b/ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist @@ -8,11 +8,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "iosremote/Communication/CommunicationManager.m" - timestampString = "397412570.155324" + timestampString = "397929411.401893" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "77" - endingLineNumber = "77" + startingLineNumber = "78" + endingLineNumber = "78" landmarkName = "-connectionStatusHandler:" landmarkType = "5"> diff --git a/ios/iosremote/iosremote/BasePresentationViewController.m b/ios/iosremote/iosremote/BasePresentationViewController.m index 186e0e5a8e20..322708066e55 100644 --- a/ios/iosremote/iosremote/BasePresentationViewController.m +++ b/ios/iosremote/iosremote/BasePresentationViewController.m @@ -471,11 +471,11 @@ static BOOL isBlank = NO; - (IBAction)popOverUp:(id)sender { if (!isBlank) { [PopoverView showPopoverAtPoint:self.gearButton.frame.origin inView:self.view withStringArray: - [NSArray arrayWithObjects:@"Stop Presentation", @"Restart", @"Blank Screen", nil] + [NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", @"Popover option"), NSLocalizedString(@"Restart", @"Popover option"), NSLocalizedString(@"Blank Screen", @"Popover option"), nil] delegate:self]; } else { [PopoverView showPopoverAtPoint:self.gearButton.frame.origin inView:self.view withStringArray: - [NSArray arrayWithObjects:@"Stop Presentation", @"Restart", @"Resume from blank Screen", nil] + [NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", @"Popover option"), NSLocalizedString(@"Restart", @"Popover option"), NSLocalizedString(@"Resume from blank Screen", @"Popover option"), nil] delegate:self]; } [UIView animateWithDuration:0.24 animations:^{ diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.m b/ios/iosremote/iosremote/Communication/CommunicationManager.m index d0cbe5276ea5..cfa4a39fa921 100644 --- a/ios/iosremote/iosremote/Communication/CommunicationManager.m +++ b/ios/iosremote/iosremote/Communication/CommunicationManager.m @@ -64,11 +64,11 @@ self.state = DISCONNECTED; if ([self.delegate isKindOfClass:[server_list_vc class]]){ dispatch_async(dispatch_get_main_queue(), ^{ - UIAlertView *message = [[UIAlertView alloc] initWithTitle:@"Failed to reach server" - message:@"Please verify your IP address and make sure that LibreOffice Impress is running with impress remote feature enabled. " + UIAlertView *message = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Failed to reach server", @"Connection failure title") + message:NSLocalizedString(@"Failed to reach server Msg", @"Connection failure message") delegate:self - cancelButtonTitle:@"OK" - otherButtonTitles:@"Help", nil]; + cancelButtonTitle:NSLocalizedString(@"OK", nil) + otherButtonTitles:NSLocalizedString(@"Help", nil), nil]; [message show]; }); } else { @@ -76,10 +76,11 @@ BasePresentationViewController *bpvc = [[(MainSplitViewController *)[self.delegate presentingViewController] viewControllers] objectAtIndex:1]; [bpvc didReceiveDisconnection]; dispatch_async(dispatch_get_main_queue(), ^{ - UIAlertView *message = [[UIAlertView alloc] initWithTitle:@"Connection Lost" - message:@"Oups, connection lost...Please try to reconnect to your computer. " + UIAlertView *message = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Connection Lost", @"Connection Lost Alert title") + message:NSLocalizedString(@"Connection Lost Msg", @"Connection Lost Alert Msg") + //@"Oups, connection lost...Please try to reconnect to your computer. " delegate:nil - cancelButtonTitle:@"OK" + cancelButtonTitle:NSLocalizedString(@"OK", nil) otherButtonTitles:nil]; [message show]; }); @@ -93,14 +94,10 @@ [alertView dismissWithClickedButtonIndex:0 animated:YES]; }else if (buttonIndex == 1){ [alertView dismissWithClickedButtonIndex:0 animated:YES]; - UIAlertView *message = [[UIAlertView alloc] initWithTitle:@"Pairing instructions" - message:@"1. Launch your LibreOffice Impress on your Computer\n\n" - @"2. Enable Preferences - LibreOffice Impress - General - Enable remote control\n\n" - @"3. Enable Preferences - LibreOffice Impress - Advanced - Enable Experimental Features\n\n" - @"4. Make sure your Computer and your device are connected to the same WiFi network and Enter your Computer's IP address\n\n" - @"5. Connect and Enjoy!\n\n" + UIAlertView *message = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Pairing Instructions", @"Pairing instructions Alert Title") + message:NSLocalizedString(@"Pairing Instructions Msg", nil) delegate:nil - cancelButtonTitle:@"OK" + cancelButtonTitle:NSLocalizedString(@"OK", nil) otherButtonTitles:nil]; [message show]; } diff --git a/ios/iosremote/iosremote/Communication/SlideShow.m b/ios/iosremote/iosremote/Communication/SlideShow.m index 6cff90ce8003..988af3ae4b6e 100644 --- a/ios/iosremote/iosremote/Communication/SlideShow.m +++ b/ios/iosremote/iosremote/Communication/SlideShow.m @@ -159,11 +159,11 @@ NSString *sTitle; if (index >= self.size) { if ([view isKindOfClass:[UIImageView class]]) - [(UIImageView* )view setImage:[UIImage imageNamed:@"slide_finished.png"]]; + [(UIImageView* )view setImage:[UIImage imageNamed:@"slide_finished"]]; else if ([view isKindOfClass:[UITableViewCell class]]) { UIImageView *image = (UIImageView *)[view viewWithTag:1]; - [image setImage:[UIImage imageNamed:@"slide_finished.png"]]; + [image setImage:[UIImage imageNamed:@"slide_finished"]]; } else if ([view isKindOfClass:[UIWebView class]]) [(UIWebView* )view loadHTMLString: @"SlideShow finished" baseURL:nil]; diff --git a/ios/iosremote/iosremote/Communication/pinValidation_vc.m b/ios/iosremote/iosremote/Communication/pinValidation_vc.m index efbec7b5cba9..157230a7aec1 100644 --- a/ios/iosremote/iosremote/Communication/pinValidation_vc.m +++ b/ios/iosremote/iosremote/Communication/pinValidation_vc.m @@ -39,7 +39,7 @@ self.comManager = [CommunicationManager sharedComManager]; [self.pinLabel setText:[NSString stringWithFormat:@"%@", [self.comManager getPairingPin]]]; - UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:@"Connect" style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; + UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Connect", @"Back button to the connect page on navbar") style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; self.navigationItem.leftBarButtonItem = backButton; } diff --git a/ios/iosremote/iosremote/LibONavigationController.h b/ios/iosremote/iosremote/LibONavigationController.h index 4e940f42312b..499f9fc9f036 100644 --- a/ios/iosremote/iosremote/LibONavigationController.h +++ b/ios/iosremote/iosremote/LibONavigationController.h @@ -1,10 +1,10 @@ -// -// LibONavigationController.h -// iosremote -// -// Created by Siqi Liu on 8/5/13. -// Copyright (c) 2013 libreoffice. All rights reserved. -// +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #import diff --git a/ios/iosremote/iosremote/LibONavigationController.m b/ios/iosremote/iosremote/LibONavigationController.m index efe2929e6973..d3bda4431e13 100644 --- a/ios/iosremote/iosremote/LibONavigationController.m +++ b/ios/iosremote/iosremote/LibONavigationController.m @@ -1,10 +1,10 @@ -// -// LibONavigationController.m -// iosremote -// -// Created by Siqi Liu on 8/5/13. -// Copyright (c) 2013 libreoffice. All rights reserved. -// +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #import "LibONavigationController.h" #import "UINavigationController+Theme.h" diff --git a/ios/iosremote/iosremote/UIViewController+LibOStyling.h b/ios/iosremote/iosremote/UIViewController+LibOStyling.h index dbd8dc193da0..cfd3d58084c5 100644 --- a/ios/iosremote/iosremote/UIViewController+LibOStyling.h +++ b/ios/iosremote/iosremote/UIViewController+LibOStyling.h @@ -1,10 +1,10 @@ -// -// UIViewController+LibOStyling.h -// iosremote -// -// Created by Siqi Liu on 8/6/13. -// Copyright (c) 2013 libreoffice. All rights reserved. -// +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #import diff --git a/ios/iosremote/iosremote/UIViewController+LibOStyling.m b/ios/iosremote/iosremote/UIViewController+LibOStyling.m index 26c0e5164c60..272f72615f2b 100644 --- a/ios/iosremote/iosremote/UIViewController+LibOStyling.m +++ b/ios/iosremote/iosremote/UIViewController+LibOStyling.m @@ -1,10 +1,10 @@ -// -// UIViewController+LibOStyling.m -// iosremote -// -// Created by Siqi Liu on 8/6/13. -// Copyright (c) 2013 libreoffice. All rights reserved. -// +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #import "UIViewController+LibOStyling.h" #import "ControlVariables.h" diff --git a/ios/iosremote/iosremote/en.lproj/Localizable.strings b/ios/iosremote/iosremote/en.lproj/Localizable.strings new file mode 100644 index 000000000000..8495ebef3a30 Binary files /dev/null and b/ios/iosremote/iosremote/en.lproj/Localizable.strings differ diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index b0ef430a458a..b061c5090799 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -1,7 +1,6 @@ - @@ -18,7 +17,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ios/iosremote/iosremote/newServer_vc.m b/ios/iosremote/iosremote/newServer_vc.m index eb02ebd5a12b..6c534a475378 100644 --- a/ios/iosremote/iosremote/newServer_vc.m +++ b/ios/iosremote/iosremote/newServer_vc.m @@ -34,17 +34,17 @@ NSString *serverName = [self.nameCell.textField text]; NSString *serverAddr = [self.addrCell.textField text]; if ([serverAddr isValidIPAddress]) { - if (!serverName) { + if (!serverName || [serverName isEqualToString:@""]) { serverName = [[self fetchSSIDInfo] valueForKey:@"SSID"]; } NSLog(@"New server name:%@ ip:%@", serverName, serverAddr); [self.comManager addServersWithName:serverName AtAddress:serverAddr]; [self.navigationController popViewControllerAnimated:YES]; } else { - UIAlertView *message = [[UIAlertView alloc] initWithTitle:@"Invalid IP Address" - message:@"A valid IP address should be like this: \"192.168.1.1\"" + UIAlertView *message = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Invalid IP Address", @"Invalid IP Address Alert title") + message:NSLocalizedString(@"Invalid IP Address Msg", @"Invalid IP Address Alert message") delegate:nil - cancelButtonTitle:@"OK" + cancelButtonTitle:NSLocalizedString(@"OK", @"OK Button on Alert view") otherButtonTitles:nil]; [message show]; } @@ -66,7 +66,6 @@ - (id)fetchSSIDInfo { NSArray *ifs = (__bridge_transfer id)CNCopySupportedInterfaces(); id info = nil; - NSLog(@"Obtaining Wifi SSID"); for (NSString *ifnam in ifs) { info = (__bridge_transfer id)CNCopyCurrentNetworkInfo((__bridge CFStringRef)ifnam); NSLog(@"%@ => %@", ifnam, info); @@ -83,12 +82,12 @@ - (void)viewDidLoad { self.comManager = [CommunicationManager sharedComManager]; - [self setNameCell: [self newDetailCellWithTag:ServerName]]; - [self setAddrCell: [self newDetailCellWithTag:ServerAddr]]; + [self setNameCell:[self newDetailCellWithTag:ServerName]]; + [self setAddrCell:[self newDetailCellWithTag:ServerAddr]]; [self setTitle:@"New Server"]; - UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:@"Cancel" style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; + UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Cancel", nil) style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; self.navigationItem.leftBarButtonItem = backButton; @@ -238,14 +237,14 @@ { cell = [self nameCell]; text = [self.server serverName]; - placeholder = @"Name (optional)"; + placeholder = NSLocalizedString(@"Name (optional)", @"EditableTableViewCell placeholder"); keyboardType = UIKeyboardTypeDefault; } else { cell = [self addrCell]; text = [self.server serverAddress]; - placeholder = @"IP Address"; + placeholder = NSLocalizedString(@"IP Address", @"EditableTableViewCell placeholder"); keyboardType = UIKeyboardTypeNumbersAndPunctuation; } break; diff --git a/ios/iosremote/iosremote/serverList_vc.m b/ios/iosremote/iosremote/serverList_vc.m index 8f4bb9d166bc..445e31afda9f 100644 --- a/ios/iosremote/iosremote/serverList_vc.m +++ b/ios/iosremote/iosremote/serverList_vc.m @@ -54,10 +54,10 @@ -(void) netService:(NSNetService *)sender didNotResolve:(NSDictionary *)errorDict { NSLog(@"Failed to resolve"); - UIAlertView *message = [[UIAlertView alloc] initWithTitle:@"Failed to reach the computer" - message:@"Please restart your application or wait the application to refresh. " + UIAlertView *message = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Failed to reach your computer", nil) + message:NSLocalizedString(@"Please consider restart LibreOffice Impress on your computer.", nil) delegate:self - cancelButtonTitle:@"OK" + cancelButtonTitle:NSLocalizedString(@"OK", nil) otherButtonTitles:nil]; [self disableSpinner]; [message show]; @@ -158,7 +158,7 @@ self.serverTable.dataSource = self; self.serverTable.delegate = self; - [self setTitle:@"Impress Remote"]; + [self setTitle:NSLocalizedString(@"Impress Remote", @"App name displayed on navbar")]; } @@ -185,6 +185,7 @@ }]; NSLog(@"Clear auto discovered servers"); [self.comManager.autoDiscoveryServers removeAllObjects]; + [self.serverTable reloadData]; self.serviceBrowser = [[NSNetServiceBrowser alloc] init]; [self.serviceBrowser setDelegate:self]; [self.serviceBrowser searchForServicesOfType:@"_impressremote._tcp" inDomain:@"local"]; @@ -272,10 +273,10 @@ switch (section) { case 0: - sectionName = [NSString stringWithFormat:@"Detected connections"]; + sectionName = [NSString stringWithFormat:NSLocalizedString(@"Detected Connections", @"Server list section title")]; break; case 1: - sectionName = [NSString stringWithFormat:@"Custom connections"]; + sectionName = [NSString stringWithFormat:NSLocalizedString(@"Custom Connections", @"Server list section title")]; break; } UILabel *sectionHeader; @@ -302,7 +303,7 @@ sectionFooter.backgroundColor = [UIColor clearColor]; sectionFooter.font = kAppSmallTextFont; sectionFooter.textColor = kTintColor; - sectionFooter.text = @"In case your computer does not appear in the section above, manually add a computer with its IP address."; + sectionFooter.text = NSLocalizedString(@"Customize server config instruction", @"Displayed when no customized server is available"); UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.bounds.size.width, [self tableView:tableView heightForHeaderInSection:section])]; [view addSubview:sectionFooter]; diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m index c39e449d2ffc..f181b313f4aa 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m @@ -114,7 +114,7 @@ self.modalViewController.view.backgroundColor = [UIColor clearColor]; _startButton.frame = CGRectMake(30.0, 50.0, 470.0, 50.0); } - [_startButton setTitle:@"Start Presentation" forState:UIControlStateNormal]; + [_startButton setTitle:NSLocalizedString(@"Start Presentation", nil) forState:UIControlStateNormal]; [_startButton setTitleColor:kTintColor forState:UIControlStateNormal]; [_startButton setTitleColor:[UIColor lightGrayColor] forState:UIControlStateHighlighted]; [_startButton addTarget:self action:@selector(startPresentationAction:) forControlEvents:UIControlEventTouchUpInside]; diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m b/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m index 3787c29b2360..ca09716fc721 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m @@ -58,7 +58,7 @@ NSLog(@"Received: %@", self.comManager.interpreter.slideShow.title); }]; - UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:@"Connect" style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; + UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Connect", nil) style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; self.navigationItem.leftBarButtonItem = backButton; } diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m b/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m index 3f44b7f4a521..e1cf5089fb7d 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m @@ -31,7 +31,7 @@ NSLog(@"Received: %@", self.comManager.interpreter.slideShow.title); }]; - UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:@"Connect" style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; + UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Connect", nil) style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; self.navigationItem.leftBarButtonItem = backButton; } diff --git a/ios/iosremote/iosremote/slideShowSwipeInList_ipad.m b/ios/iosremote/iosremote/slideShowSwipeInList_ipad.m index 7b3d56b7877e..753dbb6352e5 100644 --- a/ios/iosremote/iosremote/slideShowSwipeInList_ipad.m +++ b/ios/iosremote/iosremote/slideShowSwipeInList_ipad.m @@ -122,12 +122,6 @@ dispatch_queue_t backgroundQueue; return [self.slideshow size]; } -- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section -{ - return @"Slides"; -} - - - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { static NSString *CellIdentifier = @"slide"; diff --git a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m index 28a00a7be4a6..6de77bc75289 100644 --- a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m +++ b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m @@ -46,7 +46,7 @@ dispatch_queue_t backgroundQueue; [self.stopWatch start]; } - UIImageView *tempImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"slideshowRail.png"]]; + UIImageView *tempImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"slideshowRail"]]; [tempImageView setFrame:self.tableView.frame]; self.tableView.backgroundView = tempImageView; @@ -112,10 +112,10 @@ dispatch_queue_t backgroundQueue; { switch (section) { case 0: - return @"Stop Watch"; + return NSLocalizedString(@"Stop Watch", @"Sidebar section header"); break; case 1: - return @"Slides"; + return NSLocalizedString(@"Slides", @"Sidebar section header"); default: break; } diff --git a/ios/iosremote/iosremote/slideShow_vc_iphone.m b/ios/iosremote/iosremote/slideShow_vc_iphone.m index b53be8715bab..87cedecbe986 100644 --- a/ios/iosremote/iosremote/slideShow_vc_iphone.m +++ b/ios/iosremote/iosremote/slideShow_vc_iphone.m @@ -132,6 +132,7 @@ } } +// Not localized for now since this is subject to fundemental changes - (IBAction)pointerAction:(id)sender { if (self.count == 0 || self.count == 1){ CGPoint p; @@ -292,7 +293,7 @@ self.revealViewController.navigationItem.rightBarButtonItem = backButton; - self.revealButtonItem = [[UIBarButtonItem alloc] initWithImage: [UIImage imageNamed:@"more_icon.png"] + self.revealButtonItem = [[UIBarButtonItem alloc] initWithImage: [UIImage imageNamed:@"more_icon"] style:UIBarButtonItemStyleBordered target:self.revealViewController action:@selector( revealToggle: )]; @@ -316,9 +317,17 @@ - (void) popOverStart:(id)sender { if (!isBlank) { - [PopoverView showPopoverAtPoint: CGPointMake(self.navigationController.view.frame.size.width - 20, 0) inView:self.view withTitle:@"More" withStringArray:[NSArray arrayWithObjects:@"Stop Presentation", @"Restart", @"Blank Screen", nil] delegate:self]; + [PopoverView showPopoverAtPoint: CGPointMake(self.navigationController.view.frame.size.width - 20, 0) + inView:self.view + withTitle:NSLocalizedString(@"More", @"Popover title") + withStringArray:[NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", nil), NSLocalizedString(@"Restart", nil), NSLocalizedString(@"Blank Screen", nil), nil] + delegate:self]; } else { - [PopoverView showPopoverAtPoint: CGPointMake(self.navigationController.view.frame.size.width - 20, 0) inView:self.view withTitle:@"More" withStringArray:[NSArray arrayWithObjects:@"Stop Presentation", @"Restart", @"Resume from blank screen", nil] delegate:self]; + [PopoverView showPopoverAtPoint: CGPointMake(self.navigationController.view.frame.size.width - 20, 0) + inView:self.view + withTitle:@"More" + withStringArray:[NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", nil), NSLocalizedString(@"Restart", nil), NSLocalizedString(@"Resume from blank screen", nil), nil] + delegate:self]; } } diff --git a/ios/iosremote/iosremote/timer_clear_btn.png b/ios/iosremote/iosremote/timer_clear_btn.png index 2c74717cadd5..92d5e54bce64 100644 Binary files a/ios/iosremote/iosremote/timer_clear_btn.png and b/ios/iosremote/iosremote/timer_clear_btn.png differ diff --git a/ios/iosremote/iosremote/timer_clear_btn@2x.png b/ios/iosremote/iosremote/timer_clear_btn@2x.png new file mode 100644 index 000000000000..eb41194fb16a Binary files /dev/null and b/ios/iosremote/iosremote/timer_clear_btn@2x.png differ diff --git a/ios/iosremote/iosremote/timer_pause_btn.png b/ios/iosremote/iosremote/timer_pause_btn.png index c2829d5f06a5..ff155abfc58a 100644 Binary files a/ios/iosremote/iosremote/timer_pause_btn.png and b/ios/iosremote/iosremote/timer_pause_btn.png differ diff --git a/ios/iosremote/iosremote/timer_pause_btn@2x.png b/ios/iosremote/iosremote/timer_pause_btn@2x.png new file mode 100644 index 000000000000..cdcc54375e29 Binary files /dev/null and b/ios/iosremote/iosremote/timer_pause_btn@2x.png differ diff --git a/ios/iosremote/iosremote/timer_resume_btn.png b/ios/iosremote/iosremote/timer_resume_btn.png index fc980b11b71f..1ff1681093d3 100644 Binary files a/ios/iosremote/iosremote/timer_resume_btn.png and b/ios/iosremote/iosremote/timer_resume_btn.png differ diff --git a/ios/iosremote/iosremote/timer_resume_btn@2x.png b/ios/iosremote/iosremote/timer_resume_btn@2x.png new file mode 100644 index 000000000000..47dc5597c4cd Binary files /dev/null and b/ios/iosremote/iosremote/timer_resume_btn@2x.png differ diff --git a/ios/iosremote/iosremote/timer_start_btn.png b/ios/iosremote/iosremote/timer_start_btn.png index 6253566730d8..0ba1051da474 100644 Binary files a/ios/iosremote/iosremote/timer_start_btn.png and b/ios/iosremote/iosremote/timer_start_btn.png differ diff --git a/ios/iosremote/iosremote/timer_start_btn@2x.png b/ios/iosremote/iosremote/timer_start_btn@2x.png new file mode 100644 index 000000000000..9164857d24b3 Binary files /dev/null and b/ios/iosremote/iosremote/timer_start_btn@2x.png differ diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/InfoPlist.strings b/ios/iosremote/iosremote/zh-Hans.lproj/InfoPlist.strings new file mode 100644 index 000000000000..477b28ff8f86 --- /dev/null +++ b/ios/iosremote/iosremote/zh-Hans.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard new file mode 100644 index 000000000000..b061c5090799 --- /dev/null +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard @@ -0,0 +1,546 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ios/iosremote/zh-Hans.lproj/Localizable.strings b/ios/iosremote/zh-Hans.lproj/Localizable.strings new file mode 100644 index 000000000000..43c53679a0a8 Binary files /dev/null and b/ios/iosremote/zh-Hans.lproj/Localizable.strings differ diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard new file mode 100644 index 000000000000..fae43a059d9a --- /dev/null +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard @@ -0,0 +1,553 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit