diff --git a/browser/base/content/browser-tabview.js b/browser/base/content/browser-tabview.js
index 5a52b9f91f5b..4450ec4feb13 100644
--- a/browser/base/content/browser-tabview.js
+++ b/browser/base/content/browser-tabview.js
@@ -24,7 +24,7 @@ let TabView = {
     delete this.windowTitle;
     let brandBundle = document.getElementById("bundle_brand");
     let brandShortName = brandBundle.getString("brandShortName");
-    let title = gNavigatorBundle.getFormattedString("tabView2.title", [brandShortName]);
+    let title = gNavigatorBundle.getFormattedString("tabview.title", [brandShortName]);
     return this.windowTitle = title;
   },
 
@@ -310,11 +310,13 @@ let TabView = {
 
     if (!title.trim()) {
       let topChildLabel = groupItem.getTopChild().tab.label;
+      let childNum = groupItem.getChildren().length;
 
-      if (groupItem.getChildren().length > 1) {
+      if (childNum > 1) {
+        let num = childNum - 1;
         title =
-          gNavigatorBundle.getFormattedString("tabview2.moveToUnnamedGroup.label",
-            [topChildLabel, groupItem.getChildren().length - 1]);
+          gNavigatorBundle.getString("tabview.moveToUnnamedGroup.label");
+        title = PluralForm.get(num, title).replace("#1", topChildLabel).replace("#2", num);
       } else {
         title = topChildLabel;
       }
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index ce6ed2aa47f5..b88ea0658cfa 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -305,8 +305,13 @@ ctrlTab.showAll.label=;Show all #1 tabs
 addKeywordTitleAutoFill=Search %S
 
 # TabView
-tabView2.title=%S - Group Your Tabs
-tabview2.moveToUnnamedGroup.label=%S and %S more
+# LOCALIZATION NOTE (tabview.title): %S is the application name.
+tabview.title=%S - Group Your Tabs
+# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the page title of the first tab in the unnamed group, 
+# #2 is the number of remaining tabs.
+tabview.moveToUnnamedGroup.label=#1 and 1 more;#1 and #2 more
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Default
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=The default theme.