wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1019719 - Follow-up. r=me

Browse Source
This commit is contained in:
Nick Alexander 2014-07-21 12:41:20 -07:00
parent 7213c2f407
commit 3a0974ba74
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mobile/android/base/locales/en-US/sync_strings.dtd
View File

@ -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 -->

5
mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java
View File

@ -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")) {