Bug 1019719 - Follow-up. r=me

mobile/android/base/locales/en-US/sync_strings.dtd

@@ -74,11 +74,11 @@
 <!-- Account strings -->
 <!ENTITY sync.account.label '&syncBrand.fullName.label; (deprecated)'>
 
-<!-- Localization note (sync.default.client.name): Default string of the "Device name" menu item upon setting up Firefox Sync.
-     The placeholder &formatS1 will be replaced by the name of the Firefox release channel and &formatS2 by the model name of the
-     Android device. Examples:
-     Aurora on GT-I1950
-     Fennec on MI 2S -->
+<!-- Localization note (sync.default.client.name): Default string of the "Device
+     name" menu item upon setting up Firefox Sync.  The placeholder &formatS1
+     will be replaced by the name of the Firefox release channel and &formatS2
+     by the model name of the Android device. Examples look like "Aurora on
+     GT-I1950" and "Fennec on MI 2S". -->
 <!ENTITY sync.default.client.name '&formatS1; on &formatS2;'>
 
 <!-- Bookmark folder strings -->

mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java

@@ -4,9 +4,9 @@
 
 package org.mozilla.gecko.sync;
 
+import org.mozilla.gecko.R;
 import org.mozilla.gecko.background.common.GlobalConstants;
 import org.mozilla.gecko.sync.delegates.ClientsDataDelegate;
-import org.mozilla.gecko.R;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -50,7 +50,8 @@ public class SharedPreferencesClientsDataDelegate implements ClientsDataDelegate
 
   @Override
   public String getDefaultClientName() {
-    String name = GlobalConstants.MOZ_APP_DISPLAYNAME;
+    String name = GlobalConstants.MOZ_APP_DISPLAYNAME; // The display name is never translated.
+    // Change "Firefox Aurora" or similar into "Aurora".
     if (name.contains("Aurora")) {
         name = "Aurora";
     } else if (name.contains("Beta")) {