Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Bug 803533 - [Settings] Need call forwarding settings UI. #6888

Merged
merged 1 commit into from Dec 7, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions apps/settings/index.html
Expand Up @@ -357,7 +357,6 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
<a data-l10n-id="callForwardingNotReachable"> Forward when unreachable </a>
</li>
</ul>

-->
</section>

Expand All @@ -382,7 +381,6 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
<a data-l10n-id="callForwardingNoReply"> Forward when unanswered </a>
</li>
</ul>

-->
</section>

Expand All @@ -407,7 +405,6 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
<a data-l10n-id="callForwardingMobileBusy"> Forward when busy </a>
</li>
</ul>

-->
</section>

Expand All @@ -432,7 +429,6 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
<a data-l10n-id="callForwardingUnconditional">Always forward</a>
</li>
</ul>

-->
</section>

Expand All @@ -441,8 +437,9 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
<h1 data-l10n-id="call"> Call Settings </h1>
<h1 data-l10n-id="callSettings"> Call Settings </h1>
</header>

<ul>
<li>
<label>
Expand All @@ -452,6 +449,7 @@ <h1 data-l10n-id="call"> Call Settings </h1>
<a data-l10n-id="callWaiting">Call Waiting</a>
</li>
</ul>

<header>
<h2 data-l10n-id="callForwarding"> Call Forwarding </h2>
</header>
Expand Down Expand Up @@ -2338,7 +2336,8 @@ <h2 data-l10n-id="networkAndConnectivity">Network &amp; Connectivity</h2>
</li>
<li>
<small id="call-desc" class="menu-item-desc"></small>
<a id="menuItem-call" class="menu-item" href="#call" data-l10n-id="call">Call</a>
<a id="menuItem-call" class="menu-item" href="#call"
data-l10n-id="callSettings">Call Settings</a>
</li>
<li>
<small id="data-desc" class="menu-item-desc"></small>
Expand Down
5 changes: 2 additions & 3 deletions apps/settings/locales/settings.en-US.properties
Expand Up @@ -87,14 +87,14 @@ wpsCancelMessage=Cancel WPS
wpsCancelFailedMessage=Failed to cancel WPS

# Connectivity :: Call
call=Call
callSettings=Call Settings
callWaiting=Call waiting
callForwarding=Call forwarding
callForwardingUnconditional=Always forward
callForwardingMobileBusy=Forward when busy
callForwardingNoReply=Forward when unanswered
callForwardingNotReachable=Forward when unreachable
callForwardingGetting=Getting network info...
callForwardingGetting=Getting network info
callForwardingQueryError=Error in query
callForwardingForwardingVoiceTo=Voice calls to
callForwardingNotForwarding=Disabled
Expand Down Expand Up @@ -213,7 +213,6 @@ select-tone=Select a tone
ring-tones=Ringtones
alert-tones=Alert tones
volume-and-tones=Volume & Tones
call=Call
other-sounds=Other sounds
alerts=Alerts
unlock-screen=Unlock screen
Expand Down