From 43aad4994f5c10887c1381a393ee6db8c325980f Mon Sep 17 00:00:00 2001
From: Fabien Cazenave <fabien@cazenave.cc>
Date: Fri, 7 Dec 2012 15:35:58 +0100
Subject: [PATCH] Bug 803533 - [Settings] Need call forwarding settings UI. -
 l10n follow-up, r=julienw

---
 apps/settings/index.html                        | 11 +++++------
 apps/settings/locales/settings.en-US.properties |  5 ++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/apps/settings/index.html b/apps/settings/index.html
index 4fbd5dbba1ab..89dc496c7f47 100644
--- a/apps/settings/index.html
+++ b/apps/settings/index.html
@@ -357,7 +357,6 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
           <a data-l10n-id="callForwardingNotReachable"> Forward when unreachable </a>
         </li>
       </ul>
-
       -->
     </section>
 
@@ -382,7 +381,6 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
           <a data-l10n-id="callForwardingNoReply"> Forward when unanswered </a>
         </li>
       </ul>
-
       -->
     </section>
 
@@ -407,7 +405,6 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
           <a data-l10n-id="callForwardingMobileBusy"> Forward when busy </a>
         </li>
       </ul>
-
       -->
     </section>
 
@@ -432,7 +429,6 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
           <a data-l10n-id="callForwardingUnconditional">Always forward</a>
         </li>
       </ul>
-
       -->
     </section>
 
@@ -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>
@@ -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>
@@ -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>
diff --git a/apps/settings/locales/settings.en-US.properties b/apps/settings/locales/settings.en-US.properties
index ba33df19a5fa..101607dccb31 100644
--- a/apps/settings/locales/settings.en-US.properties
+++ b/apps/settings/locales/settings.en-US.properties
@@ -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
@@ -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