Permalink
Browse files

Bug 811328 - Remove all references of 'Firefox' in Gaia code

  • Loading branch information...
1 parent 6adc6c7 commit 68019a3c0ef7becd139c73cbba6b3510b2d5e4b0 @vingtetun vingtetun committed Nov 28, 2012
View
1 Makefile
@@ -269,6 +269,7 @@ define run-js-command
const GAIA_APP_SRCDIRS = "$(GAIA_APP_SRCDIRS)"; \
const GAIA_LOCALES_PATH = "$(GAIA_LOCALES_PATH)"; \
const BUILD_APP_NAME = "$(BUILD_APP_NAME)"; \
+ const PRODUCTION = "$(PRODUCTION)"; \
const GAIA_ENGINE = "xpcshell"; \
'; \
$(XULRUNNERSDK) $(XPCSHELLSDK) -e "$$JS_CONSTS" -f build/utils.js "build/$(strip $1).js"
View
11 apps/browser/about.html
@@ -4,21 +4,22 @@
<meta charset="utf-8">
<meta http-equiv="pragma" content="no-cache">
<meta name="viewport" content="width=device-width, user-scalable=no">
- <title data-l10n-id="about-firefox">About Firefox</title>
+ <title data-l10n-id="about-browser">About Browser</title>
<link rel="stylesheet" href="style/about.css" type="text/css">
<!-- Localization -->
+ <link rel="resource" type="application/l10n" href="shared/locales/branding.ini">
<link rel="resource" type="application/l10n" href="locales/locales.ini">
<!-- Shared code -->
<script type="application/javascript" src="shared/js/l10n.js"></script>
</head>
<body>
- <h1 data-l10n-id="firefox">Firefox</h1>
+ <h1 data-l10n-id="browser">Browser</h1>
<ul>
- <li><a data-l10n-id="support-about" href="http://support.mozilla.org/1/firefox-os/1.0/firefox-os/en-US">Support</a></li>
- <li><a data-l10n-id="faq-about" href="https://www.mozilla.org/en-US/firefox/mobile/faq/?os=firefox-os">FAQ</a></li>
+ <li><a data-l10n-id="support-about" href="">Support</a></li>
+ <li><a data-l10n-id="faq-about" href="">FAQ</a></li>
<li><a data-l10n-id="credits-about" href="http://www.mozilla.org/credits/">Credits</a></li>
</ul>
- <p data-l10n-id="trademark-about">Firefox and the Firefox logos are trademarks of the Mozilla Foundation</p>
+ <p data-l10n-id="trademark-about2">Browser and the Browser logos are trademarks of the Mozilla Foundation</p>
</body>
</html>
View
9 apps/browser/index.html
@@ -10,6 +10,7 @@
<link rel="stylesheet" href="shared/style/headers.css">
<link rel="stylesheet" href="style/authentication_dialog.css" type="text/css">
<!-- Localization -->
+ <link rel="resource" type="application/l10n" href="shared/locales/branding.ini">
<link rel="resource" type="application/l10n" href="locales/locales.ini">
<!-- Shared code -->
<link rel="stylesheet" type="text/css" href="shared/style/buttons.css">
@@ -36,7 +37,7 @@
<div id="frames">
<div id="startscreen" class="hidden">
- <h1 data-l10n-id="firefox">Firefox</h1>
+ <h1 data-l10n-id="browser">Browser</h1>
<h2 data-l10n-id="top-sites">Top Sites</h2>
<div id="start-screen-top-sites">
<ul id="top-site-thumbnails">
@@ -207,12 +208,12 @@ <h1 l10n-id="login-to-a-website">Login to a website</h1>
<section role="region" id="settings" class="skin-organic">
<header id="settings-header">
<button id="settings-done-button"><span class="icon icon-back"></span></button>
- <h1 data-l10n-id="firefox-settings">Firefox Settings</h1>
+ <h1 data-l10n-id="browser-settings">Browser Settings</h1>
</header>
<ul>
<li>
- <button id="about-firefox-button"
- data-l10n-id="about-firefox" class="icon icon-view">About Firefox</button>
+ <button id="about-browser-button"
+ data-l10n-id="about-browser" class="icon icon-view">About Browser</button>
</li>
</ul>
<header>
View
4 apps/browser/js/browser.js
@@ -80,7 +80,7 @@ var Browser = {
this.newTabButton.addEventListener('click', this.handleNewTab.bind(this));
this.settingsDoneButton.addEventListener('click',
this.showPageScreen.bind(this));
- this.aboutFirefoxButton.addEventListener('click',
+ this.aboutBrowserButton.addEventListener('click',
this.showAboutPage.bind(this));
this.clearHistoryButton.addEventListener('click',
this.handleClearHistory.bind(this));
@@ -162,7 +162,7 @@ var Browser = {
'bookmarks-tab', 'history-tab', 'back-button', 'forward-button',
'bookmark-button', 'ssl-indicator', 'tabs-badge', 'throbber', 'frames',
'tabs-list', 'main-screen', 'settings-button', 'settings-done-button',
- 'about-firefox-button', 'clear-history-button', 'crashscreen',
+ 'about-browser-button', 'clear-history-button', 'crashscreen',
'close-tab', 'try-reloading', 'bookmark-menu', 'bookmark-menu-add',
'bookmark-menu-remove', 'bookmark-menu-cancel', 'bookmark-menu-edit',
'bookmark-entry-sheet', 'bookmark-entry-sheet-cancel',
View
10 apps/browser/locales/browser.en-US.properties
@@ -36,14 +36,14 @@ month-10=November
month-11=December
# Start Page
-firefox=Firefox
-firefox-start=Firefox start
+browser={{browserBrandShortName}}
+browser-start={{browserBrandShortName}} start
top-sites=Top sites
start-browsing=Enter a search term or Web address to start browsing.
# Settings
-firefox-settings=Settings
-about-firefox=About Firefox
+browser-settings=Settings
+about-browser=About {{browserBrandShortName}}
privacy-and-security=Privacy & Security
clear-browsing-history=Clear browsing history
confirm-clear-browsing-history=Clear browsing history?
@@ -57,7 +57,7 @@ faq-about=FAQ
faq-about.href=https://www.mozilla.org/en-US/firefox/mobile/faq/?os=firefox-os
credits-about=Credits
credits-about.href=http://mozilla.org/credits/
-trademark-about=Firefox and the Firefox logos are trademarks of the Mozilla Foundation.
+trademark-about2={{browserBrandShortName}} and the {{browserBrandShortName}} logos are trademarks of the Mozilla Foundation.
# Bookmarks
bookmarks=Bookmarks
View
38 apps/communications/ftu/css/style.css
@@ -547,66 +547,66 @@ html, body {
/*
About your rights
*/
-#welcome_firefox {
+#welcome_browser {
padding: 1.5rem 3rem 0 3rem;
width: calc(100% - 6rem);
}
-#welcome_firefox p {
+#welcome_browser p {
margin: 0;
color: #000;
padding: 0 0 2rem 0;
font-size: 1.35rem;
line-height: 1.8rem;
}
-#welcome_firefox #firefox_logo_horizontal {
+#welcome_browser #browser_logo_horizontal {
margin: 1rem 0;
}
-#welcome_firefox label {
+#welcome_browser label {
position: absolute;
margin: -1.5rem 0 0 -1.5rem;
}
-#welcome_firefox section a {
+#welcome_browser section a {
font-size: 1.35rem;
line-height: 1.8rem;
color: #000;
text-decoration: underline;
font-weight: 500;
}
-#welcome_firefox #firefox_os_privacy_links {
+#welcome_browser #browser_os_privacy_links {
margin-bottom: 3rem;
display: block;
overflow: hidden;
}
-#welcome_firefox #firefox_os_privacy_links a {
+#welcome_browser #browser_os_privacy_links a {
width: 50%;
float: left;
}
-#welcome_firefox #firefox_os_privacy_links a:last-child {
+#welcome_browser #browser_os_privacy_links a:last-child {
float: right;
}
-#welcome_firefox #form_share_statistics {
+#welcome_browser #form_share_statistics {
clear: both;
}
-#welcome_firefox #form_share_statistics label {
+#welcome_browser #form_share_statistics label {
width: auto;
height: auto;
margin: 0 3rem 0 0;
}
-#welcome_firefox #form_share_statistics span {
+#welcome_browser #form_share_statistics span {
top: 1rem;
left: 1rem;
}
-#welcome_firefox #form_share_statistics p {
+#welcome_browser #form_share_statistics p {
width: calc(100% - 3.5rem);
float: right;
}
@@ -615,39 +615,39 @@ html, body {
Privacy policies
*/
-#firefox_privacy {
+#browser_privacy {
padding: 1.5rem 3rem 0 3rem;
width: calc(100% - 6rem);
}
-#firefox_privacy img {
+#browser_privacy img {
vertical-align: middle;
}
-#firefox_privacy .logo_container {
+#browser_privacy .logo_container {
margin: 1rem 0 2.5rem 0;
}
-#firefox_privacy .logo_title {
+#browser_privacy .logo_title {
font-size: 1.8rem;
margin-left: 1rem;
font-weight: 500;
}
-#firefox_privacy p {
+#browser_privacy p {
margin: 0;
color: #000;
padding: 0 0 2rem 0;
font-size: 1.35rem;
line-height: 1.8rem;
}
-#firefox_privacy a {
+#browser_privacy a {
margin-left: 0.3rem;
}
-#firefox_privacy input {
+#browser_privacy input {
margin-bottom: 2rem;
}
View
45 apps/communications/ftu/index.html
@@ -16,9 +16,10 @@
<link rel="stylesheet" type="text/css" href="/ftu/css/fb_extensions.css">
<link rel="stylesheet" type="text/css" href="/facebook/style/curtain_frame.css">
- <title>Welcome to Firefox OS</title>
+ <title>Welcome to Browser OS</title>
<!-- Localization -->
+ <link rel="resource" type="application/l10n" href="/shared/locales/branding.ini"/>
<link rel="resource" type="application/l10n" href="/ftu/locales/locales.ini"/>
<link rel="resource" type="application/l10n" href="/shared/locales/date.ini"/>
<script type="text/javascript" src="/shared/js/l10n.js"></script>
@@ -76,7 +77,7 @@ <h1 id="main_title"></h1>
<li>wifi</li>
<li>configure network</li>
<li>date and time</li>
- <li>firefox privacy</li>
+ <li>browser privacy</li>
</ol>
<article role="main">
<section role="region" id="languages">
@@ -203,26 +204,26 @@ <h2 data-l10n-id="otherAccount">Other accounts</h2>
</article>
</section>
<section role="region" id="about-your-rights">
- <p data-l10n-id="about-your-rights-0">
- Mozilla Firefox is free and open source software, built by a community
+ <p data-l10n-id="about-your-rights-part-0">
+ Mozilla Browser OS is free and open source software, built by a community
of thousands from all over the world. There are a few things you should
know:
</p>
- <p data-l10n-id="about-your-rights-1">
- Firefox is made available to you under the terms of the Mozilla Public
- License. This means you may use, copy and distribute Firefox to others.
- You are also welcome to modify the source code of Firefox as you want to
+ <p data-l10n-id="about-your-rights-part-1">
+ Browser OS is made available to you under the terms of the Mozilla Public
+ License. This means you may use, copy and distribute Browser OS to others.
+ You are also welcome to modify the source code of Browser OS as you want to
meet your needs. The Mozilla Public License also gives you the right to
distribute your modified versions.
</p>
- <p data-l10n-id="about-your-rights-2">
+ <p data-l10n-id="about-your-rights-part-2">
You are not granted any trademark rights or licenses to the trademarks
of the Mozilla Foundation or any party, including without Temporary Text
- limitation the Firefox name or logo. Additional information on
+ limitation the Browser OS name or logo. Additional information on
trademarks may be found Only here.
</p>
- <p data-l10n-id="about-your-rights-3">
- Some features in Firefox, such as the Crash Reporter, give you the
+ <p data-l10n-id="about-your-rights-part-3">
+ Some features in Browser OS, such as the Crash Reporter, give you the
option to provide feedback to Mozilla. By choosing to submit feedback,
you give Mozilla permission to use the feedback to improve its products,
to publish the feedback on its websites, and to distribute the feedback.
@@ -231,13 +232,13 @@ <h2 data-l10n-id="otherAccount">Other accounts</h2>
<section role="region" id="about-your-privacy">
<p data-l10n-id="aboutYourPrivacy">About you privacy</p>
</section>
- <section role="region" id="firefox_privacy">
+ <section role="region" id="browser_privacy">
<section class="logo_container">
- <img src="css/images/firefox64.png">
+ <img src="css/images/browser64.png">
<span class="logo_title">De todos. Para Todos.</span>
</section>
- <p data-l10n-id="mozillaCommunity">
- When you use Firefox OS, you become
+ <p data-l10n-id="mozillaCommunity2">
+ When you use Browser OS, you become
part of a global community helping to
build a brighter future for the Web.
If you’d like to know more about the
@@ -252,19 +253,19 @@ <h2 data-l10n-id="otherAccount">Other accounts</h2>
Learn how Mozilla handle your information in our <a>privacy policy</a>.
</p>
</section>
- <section role="region" id="welcome_firefox">
- <section id="firefox_logo_horizontal">
+ <section role="region" id="welcome_browser">
+ <section id="browser_logo_horizontal">
<img src="css/images/logosmall.png">
</section>
- <p data-l10n-id="welcomeFirefox">
- Welcome to Firefox OS, the free and
+ <p data-l10n-id="welcomeBrowser">
+ Welcome to Browser OS, the free and
open source operating system from
Mozilla. Our mission is to promote
openness, innovation and opportunity
by keeping the power of the Web in
your hands.
</p>
- <section id="firefox_os_privacy_links">
+ <section id="browser_os_privacy_links">
<a href="#about-your-rights" data-l10n-id="aboutYourRights"> About Your Rights </a>
<a href="#about-your-privacy" data-l10n-id="aboutYourPrivacy"> About Your Privacy </a>
</section>
@@ -273,7 +274,7 @@ <h2 data-l10n-id="otherAccount">Other accounts</h2>
<input type="checkbox" name="enable_statistic" />
<span></span>
<p data-l10n-id="collaborate">
- I want to help make Firefox OS faster and
+ I want to help make Browser OS faster and
easier to use by sharing information about
my phone's performance. Learn more
</p>
View
8 apps/communications/ftu/js/navigation.js
@@ -30,12 +30,12 @@ var steps = {
},
6: {
onlyForward: false,
- hash: '#welcome_firefox',
+ hash: '#welcome_browser',
requireSIM: false
},
7: {
onlyForward: false,
- hash: '#firefox_privacy',
+ hash: '#browser_privacy',
requireSIM: false
}
};
@@ -139,9 +139,9 @@ var Navigation = {
fbOption.classList.add('disabled');
}
break;
- case '#welcome_firefox':
+ case '#welcome_browser':
UIManager.progressBar.className = 'step-state step-6';
- UIManager.mainTitle.innerHTML = _('firefoxPrivacyChoices');
+ UIManager.mainTitle.innerHTML = _('browserPrivacyChoices');
break;
case '#about-your-rights':
UIManager.progressBar.className = 'step-state step-6';
View
20 apps/communications/ftu/locales/ftu.en-US.properties
@@ -95,23 +95,23 @@ otherAccount = Other accounts
#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
# About your rights
#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-about-your-rights-0=Mozilla Firefox is free and open source software, built by a community of thousands from all over the world. There are a few things you should know:
-about-your-rights-1=Firefox is made available to you under the terms of the Mozilla Public License. This means you may use, copy and distribute Firefox to others. You are also welcome to modify the source code of Firefox as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.
-about-your-rights-2=You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without Temporary Text limitation the Firefox name or logo. Additional information on trademarks may be found only here.
-about-your-rights-3=Some features in Firefox, such as the Crash Reporter, give you the option to provide feedback to Mozilla. By choosing to submit feedback, you give Mozilla permission to use the feedback to improve its products, to publish the feedback on its websites and to distribute the feedback.
+about-your-rights-part-0={{brandFullName}} is free and open source software, built by a community of thousands from all over the world. There are a few things you should know:
+about-your-rights-part-1={{brandShortName}} is made available to you under the terms of the Mozilla Public License. This means you may use, copy and distribute {{brandShortName}} to others. You are also welcome to modify the source code of {{brandShortName}} as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.
+about-your-rights-part-2=You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without Temporary Text limitation the {{brandShortName}} name or logo. Additional information on trademarks may be found only here.
+about-your-rights-part-3=Some features in {{brandShortName}}, such as the Crash Reporter, give you the option to provide feedback to Mozilla. By choosing to submit feedback, you give Mozilla permission to use the feedback to improve its products, to publish the feedback on its websites and to distribute the feedback.
#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-# Firefox privacy
+# OS privacy
#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-welcomeFirefox = Welcome to Firefox OS, the free and open source operating system from Mozilla. Our mission is to promote openness, innovation and opportunity by keeping the power of the Web in your hands.
+welcomeBrowser = Welcome to {{brandShortName}}, the free and open source operating system from Mozilla. Our mission is to promote openness, innovation and opportunity by keeping the power of the Web in your hands.
learnHow = Learn how Mozilla handles your information in our
aboutYourRights = About Your Rights
aboutYourPrivacy = About Your Privacy
-mozillaCommunity = When you use Firefox OS, you become part of a global community helping to build a brighter future for the Web. If you’d like to know more about the Mozilla community, our other products and events near you, please enter your email address below.
-collaborate = I want to help make Firefox OS faster and easier to use by sharing information about my phone's performance. Learn more.
+mozillaCommunity2 = When you use {{brandShortName}}, you become part of a global community helping to build a brighter future for the Web. If you’d like to know more about the Mozilla community, our other products and events near you, please enter your email address below.
+collaborate = I want to help make {{brandShortName}} faster and easier to use by sharing information about my phone's performance. Learn more.
emailAddress = Email address
-firefoxPrivacyChoices = Firefox Privacy Choices
+browserPrivacyChoices = {{brandShortName}} Privacy Choices
#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
# Navigation bar
@@ -123,7 +123,7 @@ join=join
skip=Skip
#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-# Welcome firefox
+# Welcome OS
#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
thatsIt = That's it!
startYourPhone = Start your phone tour!
View
115 apps/communications/ftu/locales/ftu.es.properties
@@ -1,115 +0,0 @@
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-# PIN Code
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-
-pincode=PIN Code
-type_pin=Type your pin code
-done=Done
-
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-# Language
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-
-language=Idioma
-english=Inglés
-dvorak=Inglés (Dvorak)
-spanish=Español
-portuguese=Portugués de Brasil
-french=Francés
-italian=Italiano
-arabic=Árabe
-greek=Greek
-hebrew=Hebreo
-jp-kanji=Japanese
-jp-kanji-desc=Kanji
-traditionalChinese=Chino tradicional
-traditionalChinese-desc=Zhuyin
-simplifiedChinese=Chino simplificado
-simplifiedChinese-desc=Pinyin
-
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-# Wifi
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-
-wifi=Wi-Fi
-shortStatus-connecting = conectando…
-shortStatus-associated = obteniendo dirección IP…
-shortStatus-connected = conectado.
-shortStatus-connectingfailed = Conexión fallida.
-shortStatus-disconnected = Desconectado.
-securedBy=Seguridad {{capabilities}}
-security = seguridad
-securityNone = ninguna
-securityOpen = abierta
-identity=Usuario
-password=Contraseña
-refresh = Refrescar
-noWifiFound = No hay redes disponibles.
-join = Conectar
-
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-# Date & Time
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-
-dateAndTime = Fecha & hora
-setTimeAutomatically = Establecer automáticamente
-timezoneMessage = Zona horaria
-dateMessage = Fecha
-timeMessage = Hora
-timeZone = Zona horaria
-change = Cambiar
-
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-# Import contacts
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-
-simContacts-import = Importar contactos de la SIM
-simContacts-importing = Importando contactos de la SIM...
-simContacts-reading = Leyendo contactos de la SIM...
-simContacts-storing = Guardando contactos de la SIM
-simContacts-error = No se pudieron importar contactos de la SIM
-simContacts-imported = Se han importado {{n}}contactos de la SIM
-importContacts = Importar contactos
-importSim = Importar contactos de la SIM
-importFb = Importar contactos de Facebook
-facebook-stats = {{imported}}/{{total}} amigos importados
-notImportedYet = Aún no importados
-otherAccount = Otras cuentas
-
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-# About your rights
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-about-your-rights-0=Mozilla Firefox es un proyecto software libre,desarrollado por una gran comunidad de usuarios distribuidos por todo el mundo. Hay algunas cosas que deberías saber.
-about-your-rights-1=Firefox está disponible bajo los términos de la licencia 'Mozilla Public License'. Esto significa que puedes usar, copiar y distribuir Firefox a otros. Además estás totalmente invitado a modificar el código fuente de Firefox a tu gusto. La licencia de Mozilla Firefox permite, además, que distrubuyas tu código modificado.
-about-your-rights-2=You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without Temporary Text limitation the Firefox name or logo. Additional information on trademarks may be found Only here.
-about-your-rights-3=Some features in Firefox, such as the Crash Reporter, give you the option to provide feedback to Mozilla. By choosing to submit feedback, you give Mozilla permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.
-
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-# Firefox privacy
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-
-welcomeFirefox = Bienvenido a Firefox OS, el sistema operativo software libre de Mozilla.Nuestra misión es promover el software libre con proyectos innovadores que permitan que todo el poder de la web esté en tus manos.
-learnHow = Aprende acerca de cómo mozilla usa esta información en
-aboutYourRights = Sobre tus derechos
-aboutYourPrivacy = Sobre tu privacidad
-mozillaCommunity = Cuando usas Firefox OS, estás siendo parte de una comunidad global de usuarios que aspira a crear un increíble futuro para la web. Si te gustaría conocer más acerca de la comunidad de Mozilla, otros productos y todos los eventos cerca de tí, introduce tu dirección de correo electrónico.
-collaborate = Quiero ayudar a hacer Firefox OS más rapido y fácil de usar compartiendo información acerca del rendimiento de mi teléfono. Aprender más.
-emailAddress = Email address
-firefoxPrivacyChoices = Información de Firefox
-
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-# Navigation bar
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-
-back=atrás
-next=siguiente
-join=conectar
-
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-# Welcome firefox
-#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
-
-startYourPhone = ¡Disfruta Firefox OS!
-enjoyYourPhone = Estás preparado para usar tu nuevo teléfono.
-optionsAvailable = Puedes modificar el idioma, fecha & hora así como la configuración WiFi en la aplicación de 'Ajustes'.
-letsGo = ¡Comenzar!
View
45 apps/settings/index.html
@@ -29,6 +29,7 @@
-->
<!-- Localization -->
+ <link rel="resource" type="application/l10n" href="shared/locales/branding.ini"/>
<link rel="resource" type="application/l10n" href="locales/locales.ini"/>
<link rel="resource" type="application/l10n" href="shared/locales/date.ini"/>
<link rel="resource" type="application/l10n" href="shared/locales/permissions.ini"/>
@@ -1648,26 +1649,26 @@ <h1 data-l10n-id="about-your-rights"> About Your Rights </h1>
</header>
<ul>
- <li class="description" data-l10n-id="about-your-rights2-0">
- Firefox OS is built on free and open source software by a community
+ <li class="description" data-l10n-id="about-your-rights-0">
+ Browser OS is built on free and open source software by a community
of thousands from all over the world. There are a few things you
should know:
</li>
- <li class="description" data-l10n-id="about-your-rights2-1">
- Firefox OS is made available to you under the terms of several open
+ <li class="description" data-l10n-id="about-your-rights-1">
+ Browser OS is made available to you under the terms of several open
source licenses including the Mozilla Public License. A device
- running Firefox OS may also contain proprietary software from third
+ running Browser OS may also contain proprietary software from third
parties. Any code provided under open licenses give you the right
to modify the source code and distribute your modified versions as
long as you comply with their terms.
</li>
- <li class="description" data-l10n-id="about-your-rights2-2">
+ <li class="description" data-l10n-id="about-your-rights-2">
You are not granted any trademark rights or licenses to the
trademarks of the Mozilla Foundation or any party, including
- without limitation the Firefox name or logo.
+ without limitation the Browser name or logo.
</li>
- <li class="description" data-l10n-id="about-your-rights2-3">
- Some features in Firefox OS, such as the Crash Reporter, give you
+ <li class="description" data-l10n-id="about-your-rights-3">
+ Some features in Browser OS, such as the Crash Reporter, give you
the option to provide feedback to Mozilla. By choosing to submit
feedback, you give Mozilla permission to use the feedback to improve
its products, to publish the feedback on its websites, and to
@@ -1688,8 +1689,8 @@ <h1 data-l10n-id="about-your-privacy"> About Your Privacy </h1>
</header>
<ul>
- <li class="privacy-menuitem privacy-firefoxOS">
- <a href="https://www.mozilla.org/legal/privacy/firefox.html">Firefox OS</a>
+ <li class="privacy-menuitem privacy-browserOS">
+ <a href="https://www.mozilla.org/legal/privacy/firefox.html">Browser OS</a>
</li>
<li class="privacy-menuitem privacy-everythingME">
<a href="http://corp.everything.me/#/privacy">everything.me</a>
@@ -1795,11 +1796,11 @@ <h2 data-l10n-id="softwareUpdates"> Software Updates </h2>
</ul>
<header>
- <h2 data-l10n-id="aboutFirefoxOS"> About Firefox OS </h2>
+ <h2 data-l10n-id="aboutBrowserOS"> About Browser OS </h2>
</header>
<ul>
- <li class="description" data-l10n-id="firefox-os-desc">
- Firefox OS is the free and open source operating system from Mozilla.
+ <li class="description" data-l10n-id="browser-os-desc">
+ Browser OS is the free and open source operating system from Mozilla.
Our mission is to promote openness, innovation and opportunity by
keeping the power of the Web in your hands.
</li>
@@ -1982,11 +1983,11 @@ <h1 data-l10n-id="accessibility"> Accessibility </h1>
-->
</section>
- <!-- Device :: Improve Firefox OS :: Crash Reports-->
+ <!-- Device :: Improve Browser OS :: Crash Reports-->
<section role="region" hidden id="crashReports">
<!--
<header>
- <a href="#improveFirefoxOS"><span class="icon icon-back">back</span></a>
+ <a href="#improveBrowserOS"><span class="icon icon-back">back</span></a>
<h1 data-l10n-id="crashReports"> Crash Reports </h1>
</header>
@@ -2002,12 +2003,12 @@ <h1 data-l10n-id="crashReports"> Crash Reports </h1>
-->
</section>
- <!-- Device :: Improve Firefox OS -->
- <section role="region" hidden id="improveFirefoxOS">
+ <!-- Device :: Improve Browser OS -->
+ <section role="region" hidden id="improveBrowserOS">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
- <h1 data-l10n-id="improveFirefoxOS">Improve Firefox OS</h1>
+ <h1 data-l10n-id="improveBrowserOS">Improve Browser OS</h1>
</header>
<ul>
@@ -2024,8 +2025,8 @@ <h2 data-l10n-id="performanceData">Performance Data</h2>
<ul>
<li>
<label for="" class="description">
- <span data-l10n-id="performanceDataInfo">
- Make Firefox OS faster and easier to use by sharing
+ <span data-l10n-id="performanceDataInfo2">
+ Make Browser OS faster and easier to use by sharing
information over Wi-Fi about your phone’s performance.
</span>
<a href="https://support.mozilla.org/kb/how-can-i-help-submitting-mobile-performance-data" data-l10n-id="learn-more" class="link-text">Learn More</a>
@@ -2274,7 +2275,7 @@ <h2 data-l10n-id="device">Device</h2>
<a id="menuItem-accessibility" class="menu-item" href="#accessibility" data-l10n-id="accessibility">Accessibility</a>
</li>
<li>
- <a id="menuItem-improveFirefoxOS" class="menu-item" href="#improveFirefoxOS" data-l10n-id="improveFirefoxOS">Improve Firefox OS</a>
+ <a id="menuItem-improveBrowserOS" class="menu-item" href="#improveBrowserOS" data-l10n-id="improveBrowserOS">Improve Browser OS</a>
</li>
<li>
<a id="menuItem-help" class="menu-item" href="#help" data-l10n-id="help">Help</a>
View
22 apps/settings/locales/settings.en-US.properties
@@ -398,19 +398,19 @@ update-status = Update status
checking-for-update = Checking for updates…
no-updates = No updates were found
retry-when-online = Network is offline. Will check again when the network is online.
-already-latest-version = This is already the latest version of Firefox OS
-aboutFirefoxOS = About Firefox OS
-firefox-os-desc = Firefox OS is the free and open source operating system from Mozilla. Our mission is to promote openness, innovation and opportunity by keeping the power of the Web in your hands.
+already-latest-version = This is already the latest version of {{brandShortName}}
+aboutBrowserOS = About {{brandShortName}}
+browser-os-desc = {{brandShortName}} is the free and open source operating system from Mozilla. Our mission is to promote openness, innovation and opportunity by keeping the power of the Web in your hands.
learn-more=Learn More
reset-phone=Reset Phone
reset-warning-1= CAUTION: Resetting will erase all your data, including any apps you've purchased.
reset-warning-2= The phone will be restored to its factory condition. None of your settings or data will be saved.
# Localization note: the licensing* strings below aren’t ready for translation yet.
about-your-rights = About your rights
-about-your-rights2-0 = Firefox OS is built on free and open source software by a community of thousands from all over the world. There are a few things you should know:
-about-your-rights2-1 = Firefox OS is made available to you under the terms of several open source licenses including the Mozilla Public License. A device running Firefox OS may also contain proprietary software from third parties. Any code provided under open licenses give you the right to modify the source code and distribute your modified versions as long as you comply with their terms.
-about-your-rights2-2 = You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo.
-about-your-rights2-3 = Some features in Firefox OS, such as the Crash Reporter, give you the option to provide feedback to Mozilla. By choosing to submit feedback, you give Mozilla permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.
+about-your-rights-0 = {{brandShortName}} is built on free and open source software by a community of thousands from all over the world. There are a few things you should know:
+about-your-rights-1 = {{brandShortName}} is made available to you under the terms of several open source licenses including the Mozilla Public License. A device running {{brandShortName}} may also contain proprietary software from third parties. Any code provided under open licenses give you the right to modify the source code and distribute your modified versions as long as you comply with their terms.
+about-your-rights-2 = You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the {{brandShortName}} name or logo.
+about-your-rights-3 = Some features in {{brandShortName}}, such as the Crash Reporter, give you the option to provide feedback to Mozilla. By choosing to submit feedback, you give Mozilla permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.
about-your-privacy = About your privacy
about-licensing = Licensing
licensing-1 = Binaries of this product have been made available to you by the Mozilla Project, under the Mozilla Public License 2.0 (MPL). Know your rights.
@@ -467,19 +467,19 @@ accessibility=Accessibility
invertColors=Invert colors
screenReader=Screen reader
-# Device :: Improve Firefox OS
-improveFirefoxOS=Improve Firefox OS
+# Device :: Improve Browser OS
+improveBrowserOS=Improve {{brandShortName}}
sendMozillaFeedback=Send Mozilla Feedback
performanceData=Performance data
-performanceDataInfo=Make Firefox OS faster and easier to use by sharing information over Wi-Fi about your phone’s performance.
+performanceDataInfo2=Make {{brandShortName}} faster and easier to use by sharing information over Wi-Fi about your phone’s performance.
sharePerformanceData=Submit performance data
crashReports=Crash reports
crashReportInfo=Sending Mozilla a report when a crash occurs helps us fix the problem for everyone. Reports are sent over Wi-Fi only.
alwaysSendReport=Always send a report
neverSendReport=Never send a report
askToSendReport=Ask me when a crash occurs
-# Device :: Improve Firefox OS :: Crash Reports
+# Device :: Improve Browser OS :: Crash Reports
# Localization note (crash-reports-description-*): These strings are also included in system.properties
crash-reports-description-1=A crash report contains some details about the crash and your device, as well as a snapshot of the state of your device when it crashed.
crash-reports-description-2=This may include things like open pages and apps, text typed into forms and the content of open messages, recent browsing history, or geolocation used by an open app.
View
4 apps/settings/style/icons.css
@@ -105,7 +105,7 @@
background-image: -moz-image-rect(url(images/icons_sprite.png), 120, 90, 150, 60);
}
-#menuItem-improveFirefoxOS {
+#menuItem-improveBrowserOS {
background-image: -moz-image-rect(url(images/icons_sprite.png), 120, 120, 150, 90);
}
@@ -283,7 +283,7 @@
background-position: right 3rem top 50%; /* same position as for Wi-Fi signal levels */
}
-.privacy-firefoxOS {
+.privacy-browserOS {
background-image: -moz-image-rect(url(images/privacy_sprite.png), 0, 32, 32, 0);
}
View
4 apps/settings/style/settings.css
@@ -229,10 +229,10 @@ ul li > label .range-icons.brightness {
/******************************************************************************
- * Improve Firefox OS
+ * Improve Browser OS
*/
-#improveFirefoxOS .link-text {
+#improveBrowserOS .link-text {
white-space: nowrap;
}
View
1 apps/system/index.html
@@ -179,6 +179,7 @@
<link rel="stylesheet" type="text/css" href="style/themes/default/menus.css">
<link rel="stylesheet" type="text/css" href="style/themes/default/buttons.css">
<link rel="stylesheet" type="text/css" href="style/themes/default/banner.css">
+ <link rel="resource" type="application/l10n" href="shared/locales/branding.ini">
<link rel="resource" type="application/l10n" href="locales/locales.ini">
<link rel="resource" type="application/l10n" href="shared/locales/date.ini">
<link rel="resource" type="application/l10n" href="shared/locales/permissions.ini">
View
4 apps/system/js/crash_reporter.js
@@ -26,7 +26,7 @@ var CrashReporter = (function() {
// This function should only ever be called once.
function showDialog(crashID, isChrome) {
- var title = isChrome ? _('crash-dialog-os') :
+ var title = isChrome ? _('crash-dialog-os2') :
_('crash-dialog-app', { name: crashedAppName });
document.getElementById('crash-dialog-title').textContent = title;
@@ -76,7 +76,7 @@ var CrashReporter = (function() {
}
function showBanner(crashID, isChrome) {
- var message = isChrome ? _('crash-banner-os') :
+ var message = isChrome ? _('crash-banner-os2') :
_('crash-banner-app', { name: crashedAppName });
var button = null;
View
4 apps/system/locales/system.en-US.properties
@@ -155,7 +155,7 @@ battery-full=Battery full
add-to-home-screen=Add to Home Screen
# crash report dialog
-crash-dialog-os=Firefox OS just recovered from a crash
+crash-dialog2-os={{brandShortName}} just recovered from a crash
crash-dialog-app={{name}} just crashed
crash-dialog-message=Would you like to send Mozilla a report about the crash to help us fix the problem? (Reports are sent over Wi-Fi only.)
crash-info-link=What's in a crash report?
@@ -176,7 +176,7 @@ crash-reports-description-3-privacy=privacy policy
crash-reports-description-3-end=.
# crash notification banner
-crash-banner-os=Firefox OS just crashed.
+crash-banner-os2={{brandShortName}} just crashed.
crash-banner-app={{name}} just crashed.
crash-banner-report=Report
View
6 build/webapp-zip.js
@@ -42,6 +42,12 @@ const PR_EXCL = 0x80;
* @param {nsIFile} file file xpcom to add.
*/
function addToZip(zip, pathInZip, file) {
+
+ // Branding specific code
+ if (/shared\/locales\/branding$/.test(file.path)) {
+ file.append((PRODUCTION == 1) ? 'official' : 'unofficial');
+ }
+
if (!file.exists())
throw new Error('Can\'t add inexistent file to zip : ' + file.path);
View
2 shared/js/l10n.js
@@ -815,7 +815,7 @@
var arg = match[1];
var sub = '';
- if (arg in args) {
+ if (args && arg in args) {
sub = args[arg];
} else if (arg in gL10nData) {
sub = gL10nData[arg][gTextProp];
View
8 shared/locales/branding.ini
@@ -0,0 +1,8 @@
+@import url(branding/branding.en-US.properties)
+
+[fr]
+@import url(branding/branding.fr.properties)
+
+[zh-TW]
+@import url(branding/branding.zh-TW.properties)
+
View
4 shared/locales/branding/official/branding.en-US.properties
@@ -0,0 +1,4 @@
+
+brandShortName = Firefox OS
+browserBrandShortName = Firefox
+browserBrandFullName = Mozilla Firefox
View
4 shared/locales/branding/unofficial/branding.en-US.properties
@@ -0,0 +1,4 @@
+
+brandShortName = B2G OS
+browserBrandShortName = Web Browser
+browserBrandFullName = Mozilla Web Browser
View
4 tools/extensions/httpd/content/httpd.js
@@ -1438,6 +1438,10 @@ RequestReader.prototype =
var filePath = this._findRealPath(applicationName);
if (oldPath.indexOf("/shared/") === 0) {
filePath += "/../..";
+ if (oldPath.indexOf('/branding/') != -1) {
+ oldPath = oldPath.replace('branding',
+ 'branding/unofficial');
+ }
}
request._path = filePath + oldPath;
View
4 tools/extensions/httpd/install.rdf
@@ -12,12 +12,12 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>6.0</em:minVersion>
- <em:maxVersion>18.0.*</em:maxVersion>
+ <em:maxVersion>20.0.*</em:maxVersion>
</Description>
<Description>
<em:id>{3c2e2abc-06d4-11e1-ac3b-374f68613e61}</em:id>
<em:minVersion>6.0</em:minVersion>
- <em:maxVersion>19.0.*</em:maxVersion>
+ <em:maxVersion>20.0.*</em:maxVersion>
</Description>
</em:targetApplication>
<em:unpack>true</em:unpack>

0 comments on commit 68019a3

Please sign in to comment.