diff --git a/.tx/config b/.tx/config index cf79ceeeb..3f7fcb407 100644 --- a/.tx/config +++ b/.tx/config @@ -4,7 +4,34 @@ minimum_perc = 1 [linphone-ios.localizablestrings] file_filter = Resources/.lproj/Localizable.strings -source_file = Resources/en.lproj/Localizable.strings +source_lang = en + +[linphone-ios.inappsettingsadvancedstrings] +file_filter = Settings/InAppSettings.bundle/.lproj/Advanced.strings +source_lang = en + +[linphone-ios.inappsettingsaudiostrings] +file_filter = Settings/InAppSettings.bundle/.lproj/Audio.strings +source_lang = en + +[linphone-ios.inappsettingscallstrings] +file_filter = Settings/InAppSettings.bundle/.lproj/Call.strings +source_lang = en + +[linphone-ios.inappsettingsnetworkstrings] +file_filter = Settings/InAppSettings.bundle/.lproj/Network.strings +source_lang = en + +[linphone-ios.inappsettingsrootstrings] +file_filter = Settings/InAppSettings.bundle/.lproj/Root.strings +source_lang = en + +[linphone-ios.inappsettingstunnelstrings] +file_filter = Settings/InAppSettings.bundle/.lproj/Tunnel.strings +source_lang = en + +[linphone-ios.inappsettingsvideostrings] +file_filter = Settings/InAppSettings.bundle/.lproj/Video.strings source_lang = en [linphone-ios.aboutviewcontrollerstrings] diff --git a/Classes/Base.lproj/AboutViewController.strings b/Classes/Base.lproj/AboutViewController.strings index 2f4d991a1..ba945f814 100644 Binary files a/Classes/Base.lproj/AboutViewController.strings and b/Classes/Base.lproj/AboutViewController.strings differ diff --git a/Classes/Base.lproj/ChatRoomViewController.strings b/Classes/Base.lproj/ChatRoomViewController.strings index e43729de3..93c9cfce9 100644 Binary files a/Classes/Base.lproj/ChatRoomViewController.strings and b/Classes/Base.lproj/ChatRoomViewController.strings differ diff --git a/Classes/Base.lproj/ChatViewController.strings b/Classes/Base.lproj/ChatViewController.strings index df5f383df..0a6a5b802 100644 Binary files a/Classes/Base.lproj/ChatViewController.strings and b/Classes/Base.lproj/ChatViewController.strings differ diff --git a/Classes/Base.lproj/ContactDetailsLabelViewController.strings b/Classes/Base.lproj/ContactDetailsLabelViewController.strings index 8b94d8006..c17ffbc07 100644 Binary files a/Classes/Base.lproj/ContactDetailsLabelViewController.strings and b/Classes/Base.lproj/ContactDetailsLabelViewController.strings differ diff --git a/Classes/Base.lproj/ContactDetailsViewController.strings b/Classes/Base.lproj/ContactDetailsViewController.strings index 03077eff7..ffc23233c 100644 Binary files a/Classes/Base.lproj/ContactDetailsViewController.strings and b/Classes/Base.lproj/ContactDetailsViewController.strings differ diff --git a/Classes/Base.lproj/ContactsViewController.strings b/Classes/Base.lproj/ContactsViewController.strings index c293d1ca7..933e3a629 100644 Binary files a/Classes/Base.lproj/ContactsViewController.strings and b/Classes/Base.lproj/ContactsViewController.strings differ diff --git a/Classes/Base.lproj/DialerViewController.strings b/Classes/Base.lproj/DialerViewController.strings index ec1ffab03..886464095 100644 Binary files a/Classes/Base.lproj/DialerViewController.strings and b/Classes/Base.lproj/DialerViewController.strings differ diff --git a/Classes/Base.lproj/DialerViewController~ipad.strings b/Classes/Base.lproj/DialerViewController~ipad.strings index ebef471b0..a3c0320f6 100644 Binary files a/Classes/Base.lproj/DialerViewController~ipad.strings and b/Classes/Base.lproj/DialerViewController~ipad.strings differ diff --git a/Classes/Base.lproj/FirstLoginViewController.strings b/Classes/Base.lproj/FirstLoginViewController.strings index 9a0f04f2d..389b7f246 100644 Binary files a/Classes/Base.lproj/FirstLoginViewController.strings and b/Classes/Base.lproj/FirstLoginViewController.strings differ diff --git a/Classes/Base.lproj/HistoryDetailsViewController.strings b/Classes/Base.lproj/HistoryDetailsViewController.strings index 9ea355e8d..f56548ff2 100644 Binary files a/Classes/Base.lproj/HistoryDetailsViewController.strings and b/Classes/Base.lproj/HistoryDetailsViewController.strings differ diff --git a/Classes/Base.lproj/HistoryViewController.strings b/Classes/Base.lproj/HistoryViewController.strings index 39300297a..d29c7a5b6 100644 Binary files a/Classes/Base.lproj/HistoryViewController.strings and b/Classes/Base.lproj/HistoryViewController.strings differ diff --git a/Classes/Base.lproj/ImageViewController.strings b/Classes/Base.lproj/ImageViewController.strings index c08d5260a..0c44ec8f9 100644 Binary files a/Classes/Base.lproj/ImageViewController.strings and b/Classes/Base.lproj/ImageViewController.strings differ diff --git a/Classes/Base.lproj/InCallViewController.strings b/Classes/Base.lproj/InCallViewController.strings index a592b9719..229e293de 100644 Binary files a/Classes/Base.lproj/InCallViewController.strings and b/Classes/Base.lproj/InCallViewController.strings differ diff --git a/Classes/Base.lproj/IncomingCallViewController.strings b/Classes/Base.lproj/IncomingCallViewController.strings index 1ea6da905..d880a031c 100644 Binary files a/Classes/Base.lproj/IncomingCallViewController.strings and b/Classes/Base.lproj/IncomingCallViewController.strings differ diff --git a/Classes/Base.lproj/IncomingCallViewController~ipad.strings b/Classes/Base.lproj/IncomingCallViewController~ipad.strings index c82d0111a..322b0100b 100644 Binary files a/Classes/Base.lproj/IncomingCallViewController~ipad.strings and b/Classes/Base.lproj/IncomingCallViewController~ipad.strings differ diff --git a/Classes/Base.lproj/WizardViewController.strings b/Classes/Base.lproj/WizardViewController.strings index 638e700a9..9f35116d1 100644 Binary files a/Classes/Base.lproj/WizardViewController.strings and b/Classes/Base.lproj/WizardViewController.strings differ diff --git a/Classes/Base.lproj/WizardViewController~ipad.strings b/Classes/Base.lproj/WizardViewController~ipad.strings index be01bf7ee..75a68e71e 100644 Binary files a/Classes/Base.lproj/WizardViewController~ipad.strings and b/Classes/Base.lproj/WizardViewController~ipad.strings differ diff --git a/Classes/Base.lproj/WizardViews.strings b/Classes/Base.lproj/WizardViews.strings index 8083292b3..302614eda 100644 Binary files a/Classes/Base.lproj/WizardViews.strings and b/Classes/Base.lproj/WizardViews.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UICallBar.strings b/Classes/LinphoneUI/Base.lproj/UICallBar.strings index 726f09e44..dd9323ebd 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UICallBar.strings and b/Classes/LinphoneUI/Base.lproj/UICallBar.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.strings b/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.strings index b4e261950..934dcf894 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.strings and b/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UICallCell.strings b/Classes/LinphoneUI/Base.lproj/UICallCell.strings index 9d9551217..d1f90f404 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UICallCell.strings and b/Classes/LinphoneUI/Base.lproj/UICallCell.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UIChatCell.strings b/Classes/LinphoneUI/Base.lproj/UIChatCell.strings index c16425967..7b10fdec3 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UIChatCell.strings and b/Classes/LinphoneUI/Base.lproj/UIChatCell.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings index 91f270f45..e6c0b4afb 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings and b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UIConferenceHeader.strings b/Classes/LinphoneUI/Base.lproj/UIConferenceHeader.strings index 7371f5243..25e0f0fda 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UIConferenceHeader.strings and b/Classes/LinphoneUI/Base.lproj/UIConferenceHeader.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UIContactCell.strings b/Classes/LinphoneUI/Base.lproj/UIContactCell.strings index b3ed706ee..5566c17f2 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UIContactCell.strings and b/Classes/LinphoneUI/Base.lproj/UIContactCell.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UIContactDetailsFooter.strings b/Classes/LinphoneUI/Base.lproj/UIContactDetailsFooter.strings index 85d6b67a3..d8404ad2e 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UIContactDetailsFooter.strings and b/Classes/LinphoneUI/Base.lproj/UIContactDetailsFooter.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings index 55ec8b262..5f67bbc47 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UIHistoryCell.strings b/Classes/LinphoneUI/Base.lproj/UIHistoryCell.strings index 4bdf055cb..832c06353 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UIHistoryCell.strings and b/Classes/LinphoneUI/Base.lproj/UIHistoryCell.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UIMainBar.strings b/Classes/LinphoneUI/Base.lproj/UIMainBar.strings index c472a605a..7dcd85f93 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UIMainBar.strings and b/Classes/LinphoneUI/Base.lproj/UIMainBar.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UIMainBar~ipad.strings b/Classes/LinphoneUI/Base.lproj/UIMainBar~ipad.strings index a12201c8a..670e50eb1 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UIMainBar~ipad.strings and b/Classes/LinphoneUI/Base.lproj/UIMainBar~ipad.strings differ diff --git a/Classes/LinphoneUI/Base.lproj/UIStateBar.strings b/Classes/LinphoneUI/Base.lproj/UIStateBar.strings index cce74a594..4056cdda2 100644 Binary files a/Classes/LinphoneUI/Base.lproj/UIStateBar.strings and b/Classes/LinphoneUI/Base.lproj/UIStateBar.strings differ diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index 81e470851..b57e244aa 100644 --- a/Resources/en.lproj/Localizable.strings +++ b/Resources/en.lproj/Localizable.strings @@ -43,6 +43,9 @@ /* No comment provided by engineer. */ "Answer" = "Answer"; +/* No comment provided by engineer. */ +"Application logs" = "Application logs"; + /* No comment provided by engineer. */ "Are you sure to want to clear your proxy setup?" = "Are you sure to want to clear your proxy setup?"; @@ -91,6 +94,9 @@ /* No comment provided by engineer. */ "Check issue" = "Check issue"; +/* No comment provided by engineer. */ +"Choose an action" = "Choose an action"; + /* No comment provided by engineer. */ "Choose the image size" = "Choose the image size"; @@ -112,12 +118,18 @@ /* No comment provided by engineer. */ "Continue video" = "Continue video"; +/* No comment provided by engineer. */ +"Debug" = "Debug"; + /* No comment provided by engineer. */ "Decline" = "Decline"; /* ICE has established a direct connection to the remote host */ "Direct connection" = "Direct connection"; +/* No comment provided by engineer. */ +"Disable logs" = "Disable logs"; + /* No comment provided by engineer. */ "Disabled, build from sources to enable" = "Disabled, build from sources to enable"; @@ -136,6 +148,9 @@ /* No comment provided by engineer. */ "Email addresses" = "Email addresses"; +/* No comment provided by engineer. */ +"Enable logs" = "Enable logs"; + /* Enter an address */ "Enter an address" = "Enter an address"; @@ -151,6 +166,9 @@ /* No comment provided by engineer. */ "Error" = "Error"; +/* No comment provided by engineer. */ +"Error: no mail account configured" = "Error: no mail account configured"; + /* ICE processing has failed */ "Failed" = "Failed"; @@ -340,6 +358,9 @@ /* No comment provided by engineer. */ "Select picture source" = "Select picture source"; +/* No comment provided by engineer. */ +"Send logs" = "Send logs"; + /* No comment provided by engineer. */ "Settings" = "Settings"; diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index 5b7ba9cfe..2466ee033 100644 Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ diff --git a/Settings/InAppSettings.bundle/Advanced.plist b/Settings/InAppSettings.bundle/Advanced.plist index 80632bbb7..ca86b640e 100644 --- a/Settings/InAppSettings.bundle/Advanced.plist +++ b/Settings/InAppSettings.bundle/Advanced.plist @@ -38,7 +38,7 @@ Title - + Other Type PSGroupSpecifier @@ -162,7 +162,7 @@ Type PSGroupSpecifier Title - + File sharing AutocapitalizationType @@ -174,7 +174,7 @@ Type PSTextFieldSpecifier Title - Sharing server + Server URL Key sharing_server_preference IASKTextAlignment diff --git a/Settings/InAppSettings.bundle/Root.plist b/Settings/InAppSettings.bundle/Root.plist index 62dbcc5ec..b3b012a6c 100644 --- a/Settings/InAppSettings.bundle/Root.plist +++ b/Settings/InAppSettings.bundle/Root.plist @@ -244,7 +244,7 @@ Title - + Development debug actions Type PSGroupSpecifier diff --git a/Settings/InAppSettings.bundle/ar.lproj/Advanced.strings b/Settings/InAppSettings.bundle/ar.lproj/Advanced.strings index 596d79598..b8b57af69 100644 --- a/Settings/InAppSettings.bundle/ar.lproj/Advanced.strings +++ b/Settings/InAppSettings.bundle/ar.lproj/Advanced.strings @@ -7,9 +7,6 @@ /* Console */ "Console" = "المُحاوِرة"; -/* */ -"" = ""; - /* Animations */ "Animations" = "رسوم حيوية"; diff --git a/Settings/InAppSettings.bundle/ar.lproj/Root.strings b/Settings/InAppSettings.bundle/ar.lproj/Root.strings index 030f39138..78b3224a7 100644 --- a/Settings/InAppSettings.bundle/ar.lproj/Root.strings +++ b/Settings/InAppSettings.bundle/ar.lproj/Root.strings @@ -43,9 +43,6 @@ /* Advanced */ "Advanced" = "متقدم"; -/* */ -"" = ""; - /* About */ "About" = "حول التطبيق"; @@ -62,4 +59,4 @@ "More options" = "الخيارات الأخرى"; /* Clear Account */ -"Clear Account" = "Clear Account"; \ No newline at end of file +"Clear Account" = "Clear Account"; diff --git a/Settings/InAppSettings.bundle/de.lproj/Tunnel.strings b/Settings/InAppSettings.bundle/de.lproj/Tunnel.strings new file mode 100644 index 000000000..0f1bacd32 Binary files /dev/null and b/Settings/InAppSettings.bundle/de.lproj/Tunnel.strings differ diff --git a/Settings/InAppSettings.bundle/en.lproj/Advanced.strings b/Settings/InAppSettings.bundle/en.lproj/Advanced.strings index c962e7a60..b43a5407d 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Advanced.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Advanced.strings @@ -1,55 +1,16 @@ -/* Debug */ "Debug" = "Debug"; - -/* Debug */ "Debug" = "Debug"; - -/* Console */ -"Console" = "Console"; - -/* */ -"" = ""; - -/* Animations */ +"Send Logs" = "Send Logs"; +"Clear Logs" = "Clear Logs"; +"Other" = "Other"; "Animations" = "Animations"; - -/* Rotation */ -"Rotation" = "Rotation"; - -/* Background mode */ "Background mode" = "Background mode"; - -/* Start at boot */ "Start at boot" = "Start at boot"; - -/* First login view */ +"Auto-answer after notification" = "Auto-answer after notification"; "First login view" = "First login view"; - -/* Expire */ "Expire" = "Expire"; - -/* Primary account */ -"Primary account" = "Standalone calls (no proxy)"; - -/* Display name */ +"Primary account" = "Primary account"; "Display name" = "Display name"; - -/* Sharing server */ -"Sharing server" = "Sharing server"; - -/* Username */ "Username" = "Username"; - -/* Rotation */ -"Rotation" = "Rotation"; - -/* Automatic */ -"Automatic" = "Automatic"; - -/* Portrait */ -"Portrait" = "Portrait"; - -/* Landscape */ -"Landscape" = "Landscape"; - -"Auto-answer after notification" = "Auto-answer after notification"; \ No newline at end of file +"File sharing" = "File sharing"; +"Server URL" = "Server URL"; diff --git a/Settings/InAppSettings.bundle/en.lproj/Audio.strings b/Settings/InAppSettings.bundle/en.lproj/Audio.strings index 86403612c..675c25120 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Audio.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Audio.strings @@ -1,56 +1,26 @@ -/* Codecs */ "Codecs" = "Codecs"; - -/* AMR */ -"AMR" = "AMR"; - -/* Speex 16Khz */ "Speex 16Khz" = "Speex 16Khz"; - -/* Speex 8Khz */ "Speex 8Khz" = "Speex 8Khz"; - -/* Silk 24Khz */ +"Opus 48kHz" = "Opus 48kHz"; "Silk 24Khz" = "Silk 24Khz"; - -/* Silk 16Khz */ "Silk 16Khz" = "Silk 16Khz"; - -/* G722 */ +"AAC-ELD 16kHz" = "AAC-ELD 16kHz"; +"AAC-ELD 22kHz" = "AAC-ELD 22kHz"; +"AAC-ELD 32kHz" = "AAC-ELD 32kHz"; +"AAC-ELD 44kHz" = "AAC-ELD 44kHz"; +"AAC-ELD 48kHz" = "AAC-ELD 48kHz"; +"AMR" = "AMR"; "G722" = "G722"; - -/* G729 */ "G729" = "G729"; - -/* GSM */ "GSM" = "GSM"; - -/* ILBC */ "ILBC" = "ILBC"; - -/* PCMU */ "PCMU" = "PCMU"; - -/* PCMA */ "PCMA" = "PCMA"; - -/* Advanced */ "Advanced" = "Advanced"; - -/* Playback gain */ "Playback gain" = "Playback gain"; - -/* Microphone gain */ "Microphone gain" = "Microphone gain"; - -/* Adaptive rate control */ "Adaptive rate control" = "Adaptive rate control"; - -/* Network bitrate limit */ -"Network bitrate limit" = "Network bitrate limit"; - -/* Voice processing */ -"Enable Voice Processing"="Enable Voice Processing"; - -/* Bass Boost / equalizer */ -"Enable Bass Boost"="Enable Bass Boost"; \ No newline at end of file +"Adaptive rate algorithm" = "Adaptive rate algorithm"; +"Codec bitrate limit" = "Codec bitrate limit"; +"Enable Voice Processing" = "Enable Voice Processing"; +"Enable Bass Boost" = "Enable Bass Boost"; diff --git a/Settings/InAppSettings.bundle/en.lproj/Call.strings b/Settings/InAppSettings.bundle/en.lproj/Call.strings index 58a723b05..a56e6ea0c 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Call.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Call.strings @@ -1,17 +1,7 @@ -/* Prefix */ "Prefix" = "Prefix"; - -/* Substitue + by 00 */ "Substitue + by 00" = "Substitue + by 00"; - -/* Send inband DTMFs */ "Send inband DTMFs" = "Send inband DTMFs"; - -/* Send SIP INFO DTMFs */ "Send SIP INFO DTMFs" = "Send SIP INFO DTMFs"; - -/* Incoming call timeout */ "Incoming call timeout" = "Incoming call timeout"; - -/* In call timeout */ -"In call timeout" = "In call timeout"; \ No newline at end of file +"In call timeout" = "In call timeout"; +"Voice mail URI" = "Voice mail URI"; diff --git a/Settings/InAppSettings.bundle/en.lproj/Network.strings b/Settings/InAppSettings.bundle/en.lproj/Network.strings index 0d4466218..603793659 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Network.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Network.strings @@ -1,65 +1,14 @@ -/* Wifi only */ -"Wifi only" = "Wifi only"; - -/* Edge optimization */ "Edge optimization" = "Edge optimization"; - -/* Stun Server */ +"Wifi only" = "Wifi only"; "Stun Server" = "Stun Server"; - -/* ICE */ "ICE" = "ICE"; - -/* Random Port */ "Random Port" = "Random Port"; - -/* Port */ "Port" = "Port"; - -/* Audio Port(s) */ "Audio Port(s)" = "Audio Port(s)"; - -/* Video Port(s) */ "Video Port(s)" = "Video Port(s)"; - -/* Transport */ -"Transport" = "Transport"; - -/* Media Encryption */ +"Use IPv6" = "Use IPv6"; "Media Encryption" = "Media Encryption"; - -/* Push Notifications */ "Push Notification" = "Push Notification"; - -/* Transport */ -"Transport" = "Transport"; - -/* UDP */ -"UDP" = "UDP"; - -/* TCP */ -"TCP" = "TCP"; - -/* TLS */ -"TLS" = "TLS"; - -/* None */ -"None" = "None"; - -/* SRTP */ -"SRTP" = "SRTP"; - -/* ZRTP */ -"ZRTP" = "ZRTP"; - -/* Limits */ "Limits" = "Limits"; - -/* Upload bandwidth */ "Upload bandwidth" = "Upload bandwidth"; - -/* Download bandwidth */ "Download bandwidth" = "Download bandwidth"; - -/* IPv6 */ -"Use IPv6" = "Use IPv6"; \ No newline at end of file diff --git a/Settings/InAppSettings.bundle/en.lproj/Root.strings b/Settings/InAppSettings.bundle/en.lproj/Root.strings index 442bf4709..50533b6fb 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Root.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Root.strings @@ -1,65 +1,26 @@ -/* SIP account */ "SIP account" = "SIP account"; - -/* Wizard */ -"Wizard" = "Run assistant"; - -/* User name */ +"Wizard" = "Wizard"; +"Clear Account" = "Clear Account"; "User name" = "User name"; - -/* User ID */ "User ID" = "User ID"; - -/* Password */ "Password" = "Password"; - -/* Domain */ "Domain" = "Domain"; - -/* Proxy */ "Proxy" = "Proxy"; - -/* Outbound proxy */ +"Transport" = "Transport"; "Outbound proxy" = "Outbound proxy"; - -/* Settings */ -"Settings" = "Settings"; - -/* Enable video */ -"Enable video" = "Enable video"; - -/* Audio */ -"Audio" = "Audio"; - -/* Video */ -"Video" = "Video"; - -/* Call */ -"Call" = "Call"; - -/* Network */ -"Network" = "Network"; - -/* Advanced */ -"Advanced" = "Advanced"; - -/* */ -"" = ""; - -/* About */ -"About" = "About"; - -/* Quit */ -"Quit" = "Quit"; - -/* Release */ -"Release" = "Release"; - -/* Clear cache */ -"Clear cache" = "Clear cache"; - -/* More options */ +"AVPF" = "AVPF"; "More options" = "More options"; - -/* Clear Account */ -"Clear Account" = "Clear Account"; \ No newline at end of file +"Settings" = "Settings"; +"Enable video" = "Enable video"; +"Audio" = "Audio"; +"Video" = "Video"; +"Call" = "Call"; +"Network" = "Network"; +"Tunnel" = "Tunnel"; +"Advanced" = "Advanced"; +"Development debug actions" = "Development debug actions"; +"About" = "About"; +"Quit" = "Quit"; +"Exit" = "Exit"; +"Clear cache" = "Clear cache"; +"Battery alert" = "Battery alert"; diff --git a/Settings/InAppSettings.bundle/en.lproj/Tunnel.strings b/Settings/InAppSettings.bundle/en.lproj/Tunnel.strings index 3e4f1957c..dc1f514a4 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Tunnel.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Tunnel.strings @@ -1,20 +1,3 @@ -/* Auto */ -"Auto" = "Auto"; - -/* Address */ -"Address" = "Address"; - -/* Mode */ "Mode" = "Mode"; - -/* Off */ -"Off" = "Off"; - -/* On */ -"On" = "On"; - -/* Port */ +"Address" = "Address"; "Port" = "Port"; - -/* WWAN */ -"WWAN" = "WWAN"; \ No newline at end of file diff --git a/Settings/InAppSettings.bundle/en.lproj/Video.strings b/Settings/InAppSettings.bundle/en.lproj/Video.strings index 3d8acf107..675d4dc4f 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Video.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Video.strings @@ -1,27 +1,9 @@ -/* Automatically start video */ "Automatically start" = "Automatically start"; - -/* Automatically accept video */ "Automatically accept" = "Automatically accept"; - -/* Show self view */ "Show self view" = "Show self view"; - -/* Show preview */ "Show preview" = "Show preview"; - -/* Preferred video size */ "Preferred video size" = "Preferred video size"; - -/* Codecs */ "Codecs" = "Codecs"; - -/* mpeg4 */ "mpeg4" = "mpeg4"; - -/* h264 */ "h264" = "h264"; - -/* VP8 */ "VP8" = "VP8"; - diff --git a/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings b/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings index b73671ef1..25ab1bf7e 100644 --- a/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings +++ b/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings @@ -7,9 +7,6 @@ /* Console */ "Console" = "Console"; -/* */ -"" = ""; - /* Animations */ "Animations" = "Animations"; @@ -52,4 +49,4 @@ /* Landscape */ "Landscape" = "Paysage"; -"Auto-answer after notification" = "Réponse auto. sur notification"; \ No newline at end of file +"Auto-answer after notification" = "Réponse auto. sur notification"; diff --git a/Settings/InAppSettings.bundle/fr.lproj/Root.strings b/Settings/InAppSettings.bundle/fr.lproj/Root.strings index 46244e4a1..36b38c814 100644 --- a/Settings/InAppSettings.bundle/fr.lproj/Root.strings +++ b/Settings/InAppSettings.bundle/fr.lproj/Root.strings @@ -43,9 +43,6 @@ /* Advanced */ "Advanced" = "Avancées"; -/* */ -"" = ""; - /* About */ "About" = "À Propos"; @@ -62,4 +59,4 @@ "More options" = "Plus d'options"; /* Clear Account */ -"Clear Account" = "Effacer le compte"; \ No newline at end of file +"Clear Account" = "Effacer le compte"; diff --git a/Settings/InAppSettings.bundle/ja.lproj/Network.strings b/Settings/InAppSettings.bundle/ja.lproj/Network.strings new file mode 100644 index 000000000..acf7d260e Binary files /dev/null and b/Settings/InAppSettings.bundle/ja.lproj/Network.strings differ diff --git a/Settings/InAppSettings.bundle/ja.lproj/Tunnel.strings b/Settings/InAppSettings.bundle/ja.lproj/Tunnel.strings new file mode 100644 index 000000000..76caed716 Binary files /dev/null and b/Settings/InAppSettings.bundle/ja.lproj/Tunnel.strings differ diff --git a/Settings/InAppSettings.bundle/nl.lproj/Network.strings b/Settings/InAppSettings.bundle/nl.lproj/Network.strings new file mode 100644 index 000000000..acf7d260e Binary files /dev/null and b/Settings/InAppSettings.bundle/nl.lproj/Network.strings differ diff --git a/Settings/InAppSettings.bundle/nl.lproj/Tunnel.strings b/Settings/InAppSettings.bundle/nl.lproj/Tunnel.strings new file mode 100644 index 000000000..325ff1ba7 Binary files /dev/null and b/Settings/InAppSettings.bundle/nl.lproj/Tunnel.strings differ diff --git a/Settings/InAppSettings.bundle/ru.lproj/Advanced.strings b/Settings/InAppSettings.bundle/ru.lproj/Advanced.strings index bc18bd31d..951eaf99f 100644 --- a/Settings/InAppSettings.bundle/ru.lproj/Advanced.strings +++ b/Settings/InAppSettings.bundle/ru.lproj/Advanced.strings @@ -7,9 +7,6 @@ /* Console */ "Console" = "Консоль"; -/* */ -"" = ""; - /* Animations */ "Animations" = "Анимации"; @@ -52,4 +49,4 @@ /* Landscape */ "Landscape" = "Альбомный"; -"Auto-answer after notification" = "Auto-answer after notification"; \ No newline at end of file +"Auto-answer after notification" = "Auto-answer after notification"; diff --git a/Settings/InAppSettings.bundle/ru.lproj/Root.strings b/Settings/InAppSettings.bundle/ru.lproj/Root.strings index 58b135b33..f4d6ffab3 100644 --- a/Settings/InAppSettings.bundle/ru.lproj/Root.strings +++ b/Settings/InAppSettings.bundle/ru.lproj/Root.strings @@ -43,9 +43,6 @@ /* Advanced */ "Advanced" = "Дополнительный"; -/* */ -"" = ""; - /* About */ "About" = "О программе"; @@ -62,4 +59,4 @@ "More options" = "Дополнительный счет"; /* Clear Account */ -"Clear Account" = "Clear Account"; \ No newline at end of file +"Clear Account" = "Clear Account"; diff --git a/Settings/InAppSettings.bundle/ru.lproj/Tunnel.strings b/Settings/InAppSettings.bundle/ru.lproj/Tunnel.strings new file mode 100644 index 000000000..dbe83c1a2 Binary files /dev/null and b/Settings/InAppSettings.bundle/ru.lproj/Tunnel.strings differ diff --git a/Settings/InAppSettings.bundle/zh_TW.lproj/Tunnel.strings b/Settings/InAppSettings.bundle/zh_TW.lproj/Tunnel.strings new file mode 100644 index 000000000..f20f577cb Binary files /dev/null and b/Settings/InAppSettings.bundle/zh_TW.lproj/Tunnel.strings differ diff --git a/Tools/generate_strings_files.sh b/Tools/generate_strings_files.sh index 9619883c6..e3f5df17d 100755 --- a/Tools/generate_strings_files.sh +++ b/Tools/generate_strings_files.sh @@ -4,47 +4,86 @@ root_directory=$(cd "$(dirname $0)" && pwd)/../ set -e -# The 2 only specific cases of the application: since we are length limited for push -# notifications, the ID is not matching the English translation... so we must keep -# the translations! -localizable_en=$root_directory/Resources/en.lproj/Localizable.strings -IC_MSG_EN=$(sed -nE 's/"IC_MSG" = "(.*)";/\1/p' $localizable_en) -IM_MSG_EN=$(sed -nE 's/"IM_MSG" = "(.*)";/\1/p' $localizable_en) -rm -f $localizable_en -find $root_directory/Classes -name '*.m' | xargs genstrings -u -a -o $(dirname $localizable_en) -iconv -f utf-16 -t utf-8 $localizable_en > $localizable_en.tmp -mv $localizable_en.tmp $localizable_en -sed -i.bak "s/= \"IC_MSG\";/= \"$IC_MSG_EN\";/" $localizable_en -sed -i.bak "s/= \"IM_MSG\";/= \"$IM_MSG_EN\";/" $localizable_en -rm $localizable_en.bak +if [ $# != 0 ]; then + echo "No argument needed. This script will (re)generate .strings file from .xib files and register them in the transifex config file located in .tx/config." + exit 0 +fi -to_utf8=$(mktemp -t linphone) +##### 1. Generate Localizable.strings from source files (.m) +function generate_localizable_from_sources { + localizable_en=$root_directory/Resources/en.lproj/Localizable.strings + # The 2 only specific cases of the application: since we are length limited for push + # notifications, the ID is not matching the English translation... so we must keep + # the translations! + IC_MSG_EN=$(sed -nE 's/"IC_MSG" = "(.*)";/\1/p' $localizable_en) + IM_MSG_EN=$(sed -nE 's/"IM_MSG" = "(.*)";/\1/p' $localizable_en) + rm -f $localizable_en + find $root_directory/Classes -name '*.m' | xargs genstrings -u -a -o $(dirname $localizable_en) + iconv -f utf-16 -t utf-8 $localizable_en > $localizable_en.tmp + mv $localizable_en.tmp $localizable_en + sed -i.bak "s/= \"IC_MSG\";/= \"$IC_MSG_EN\";/" $localizable_en + sed -i.bak "s/= \"IM_MSG\";/= \"$IM_MSG_EN\";/" $localizable_en + rm $localizable_en.bak +} -find $root_directory/Classes -not -path "$root_directory/Classes/KIF/*" -name Base.lproj -exec find {} -name '*.xib' \; | while read -r xibfile; do - stringsfile="${xibfile/.xib/.strings}" +##### 2. Generate .strings for all XIB files +function generate_strings_from_xib { + to_utf8_file=$(mktemp -t linphone) + find $root_directory/Classes -not -path "$root_directory/Classes/KIF/*" -name Base.lproj -exec find {} -name '*.xib' \; | while read -r xibfile; do + stringsfile="${xibfile/.xib/.strings}" - ibtool --generate-strings-file "$stringsfile" "$xibfile" + ibtool --generate-strings-file "$stringsfile" "$xibfile" - # remove if empty - iconv -f utf-16 -t utf-8 "$stringsfile" > "$to_utf8" - if [ ! -s "$to_utf8" ]; then - echo "$(basename "$stringsfile") is empty, removing" - rm "$stringsfile" - else - echo "$(basename "$xibfile")->$(basename "$stringsfile")" + # remove if empty + iconv -f utf-16 -t utf-8 "$stringsfile" > "$to_utf8_file" + if [ ! -s "$to_utf8_file" ]; then + echo "$(basename "$stringsfile") is empty, removing" + rm "$stringsfile" + else + echo "$(basename "$xibfile")->$(basename "$stringsfile")" - res_name=$(basename "$stringsfile" | tr -d '_.~-' | tr '[:upper:]' '[:lower:]') - dir_name=$(echo $(dirname "$stringsfile") | sed -E "s|$root_directory/||") - # if not registered in transifex config file, register it + res_name=$(basename "$stringsfile" | tr -d '_.~-' | tr '[:upper:]' '[:lower:]') + dir_name=$(echo $(dirname "$stringsfile") | sed -E "s|$root_directory/||") + # if not registered in transifex config file, register it + if ! grep -q $res_name $root_directory/.tx/config; then + echo "not found in .tx/config, adding it" + echo " + [linphone-ios.$res_name] + file_filter = $(echo $dir_name| sed 's/Base.lproj/.lproj/')/$(basename "$stringsfile") + source_file = $dir_name/$(basename "$stringsfile") + source_lang = en + " >> $root_directory/.tx/config + fi + fi + done + rm $to_utf8_file +} + +##### 3. Generate .strings for all InAppSettings PLIST files +function generate_strings_from_inappsettings_plist { + tmp_file=$(mktemp -t linphone) + find $root_directory/Settings/InAppSettings.bundle -name '*.plist' | while read -r plistfile; do + echo $plistfile + plistfilestrings="$(basename ${plistfile/.plist/.strings})" + printf '' > $tmp_file + while read title; do + echo "\"$title\" = \"$title\";" >> $tmp_file + done <<< "$(grep -e '>Title<' $plistfile -A 1 | sed -nE 's|.*(.*).*|\1|p')" + + mv $tmp_file $root_directory/Settings/InAppSettings.bundle/en.lproj/$plistfilestrings + + res_name=$(echo "$plistfilestrings" | tr -d '_.~-' | tr '[:upper:]' '[:lower:]') if ! grep -q $res_name $root_directory/.tx/config; then echo "not found in .tx/config, adding it" echo " [linphone-ios.$res_name] -file_filter = $(echo $dir_name| sed 's/Base.lproj/.lproj/')/$(basename "$stringsfile") -source_file = $dir_name/$(basename "$stringsfile") +file_filter = Settings/InAppSettings.bundle/.lproj/$plistfilestrings source_lang = en " >> $root_directory/.tx/config fi - fi -done -rm $to_utf8 + done +} + +# generate_localizable_from_sources +# generate_strings_from_xib +generate_strings_from_inappsettings_plist