From be80356f1ac9c4449f2f8982bcae431a67168fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Tue, 8 Jul 2014 15:56:34 +0200
Subject: [PATCH] Bug 1032139 - Make the 'Translations by' string localizable,
 r=felipe.

---
 browser/components/preferences/content.xul             |  3 ++-
 browser/components/preferences/in-content/content.xul  |  4 +++-
 browser/components/translation/translation-infobar.xml |  3 ++-
 .../en-US/chrome/browser/preferences/content.dtd       | 10 ++++++++++
 browser/locales/en-US/chrome/browser/translation.dtd   |  8 ++++++++
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/browser/components/preferences/content.xul b/browser/components/preferences/content.xul
index 89ad253a4e80..fcddb544f3de 100644
--- a/browser/components/preferences/content.xul
+++ b/browser/components/preferences/content.xul
@@ -149,10 +149,11 @@
                         label="&translateWebPages.label;." accesskey="&translateWebPages.accesskey;"
                         onsyncfrompreference="return gContentPane.updateButtons('translateButton',
                                               'browser.translation.detectLanguage');"/>
-              <label>Übersetzungen von</label>
+              <label>&translation.options.attribution.beforeLogo;</label>
               <image id="translationAttributionImage" aria-label="Microsoft Translator"
                      onclick="gContentPane.openTranslationProviderAttribution()"
                      src="chrome://browser/content/microsoft-translator-attribution.png"/>
+              <label>&translation.options.attribution.afterLogo;</label>
             </hbox>
             <button id="translateButton" label="&translateExceptions.label;"
                     oncommand="gContentPane.showTranslationExceptions();"
diff --git a/browser/components/preferences/in-content/content.xul b/browser/components/preferences/in-content/content.xul
index 47d56c1720e8..bff3928807da 100644
--- a/browser/components/preferences/in-content/content.xul
+++ b/browser/components/preferences/in-content/content.xul
@@ -139,11 +139,13 @@
                 label="&translateWebPages.label;." accesskey="&translateWebPages.accesskey;"
                 onsyncfrompreference="return gContentPane.updateButtons('translateButton',
                                               'browser.translation.detectLanguage');"/>
-      <label>Übersetzungen von</label>
+      <label>&translation.options.attribution.beforeLogo;</label>
       <separator orient="vertical" class="thin"/>
       <image id="translationAttributionImage" aria-label="Microsoft Translator"
              onclick="gContentPane.openTranslationProviderAttribution()"
              src="chrome://browser/content/microsoft-translator-attribution.png"/>
+      <separator orient="vertical" class="thin"/>
+      <label>&translation.options.attribution.afterLogo;</label>
     </hbox>
     <button id="translateButton" label="&translateExceptions.label;"
             oncommand="gContentPane.showTranslationExceptions();"
diff --git a/browser/components/translation/translation-infobar.xml b/browser/components/translation/translation-infobar.xml
index 57bd4babc1d4..0143abde0676 100644
--- a/browser/components/translation/translation-infobar.xml
+++ b/browser/components/translation/translation-infobar.xml
@@ -113,9 +113,10 @@
                             accesskey="&translation.options.preferences.accesskey;"/>
               <xul:menuitem class="translation-attribution subviewbutton panel-subview-footer"
                             oncommand="document.getBindingParent(this).openProviderAttribution();">
-                <xul:label>Übersetzungen von</xul:label>
+                <xul:label>&translation.options.attribution.beforeLogo;</xul:label>
                 <xul:image src="chrome://browser/content/microsoft-translator-attribution.png"
                            aria-label="Microsoft Translator"/>
+                <xul:label>&translation.options.attribution.afterLogo;</xul:label>
               </xul:menuitem>
             </xul:menupopup>
           </xul:button>
diff --git a/browser/locales/en-US/chrome/browser/preferences/content.dtd b/browser/locales/en-US/chrome/browser/preferences/content.dtd
index a2ab3a153ea8..5966084114a0 100644
--- a/browser/locales/en-US/chrome/browser/preferences/content.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/content.dtd
@@ -32,3 +32,13 @@
 <!ENTITY translateWebPages.accesskey  "T">
 <!ENTITY translateExceptions.label    "Exceptions…">
 <!ENTITY translateExceptions.accesskey "x">
+
+<!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo,
+  -                     translation.options.attribution.afterLogo):
+  -  These 2 strings are displayed before and after a 'Microsoft Translator'
+  -  logo.
+  -  The translations for these strings should match the translations in
+  -  browser/translation.dtd
+  -->
+<!ENTITY translation.options.attribution.beforeLogo "Translations by">
+<!ENTITY translation.options.attribution.afterLogo "">
diff --git a/browser/locales/en-US/chrome/browser/translation.dtd b/browser/locales/en-US/chrome/browser/translation.dtd
index 2a8ed0135b59..dbcd4ac05d3f 100644
--- a/browser/locales/en-US/chrome/browser/translation.dtd
+++ b/browser/locales/en-US/chrome/browser/translation.dtd
@@ -56,3 +56,11 @@
 <!ENTITY translation.options.neverForSite.accesskey "e">
 <!ENTITY translation.options.preferences.label  "Translation preferences">
 <!ENTITY translation.options.preferences.accesskey "T">
+
+<!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo,
+  -                     translation.options.attribution.afterLogo):
+  -  These 2 strings are displayed before and after a 'Microsoft Translator'
+  -  logo.
+  -->
+<!ENTITY translation.options.attribution.beforeLogo "Translations by">
+<!ENTITY translation.options.attribution.afterLogo "">