svn update

2025-12-22 01:30:25 +00:00 · 2011-02-02 03:07:42 +00:00
parent eb1a439619
commit 796c34baba
45 changed files with 453 additions and 300 deletions
--- a/extension/_locales/en/messages.json
+++ b/extension/_locales/en/messages.json
@@ -138,5 +138,27 @@
  "signed_out_message": {
    "message": "You are now signed out of Chrome to Phone.",
    "description": "Signed out message."
+  },
+  "request_message": {
+    "message": "The page at <b>$domain$</b> wants to send content to your phone.",
+    "description": "Confirmation when a page initiates a phone action. $domain$ is automatically replaced with the domain.",
+    "placeholders": {
+      "domain": {
+        "content": "$1",
+        "example": "google.com"
+      }
+    }    
+  },
+  "request_deny_message": {
+    "message": "Deny",
+    "description": "Deny a page's request to send content to your phone."
+  },
+  "request_allow_message": {
+    "message": "Allow",
+    "description": "Allow a page's request to send content to your phone."
+  },
+  "request_approve_message": {
+    "message": "Allow Forever",
+    "description": "Allow a page's request - and all subsequent requests - to send content to your phone."
  }
 }
--- a/extension/background.html
+++ b/extension/background.html
@@ -23,22 +23,32 @@
 function onClickHandler(info, tab) {
  var url = info.srcUrl;
  if (url == undefined) url = info.linkUrl;
-  if (url == undefined) url = tab.url;
+  if (url == undefined) url = info.url || tab.url;

  var msgType = info.mediaType;
  if (msgType == undefined) msgType = 'page';

-  var sel = info.selectionText;
-  if (sel == undefined) sel = '';
+  var sel = info.selectionText || '';

  var bg = chrome.extension.getBackgroundPage();
-  bg.sendToPhone(tab.title, url, msgType, sel, function(status) {
+  bg.sendToPhone(info.title || tab.title, url, msgType, sel, function(status) {
    if (status == STATUS_LOGIN_REQUIRED) {
      chrome.tabs.create({url: signInUrl});
    } 
  });
 }

+function isWhitelisted(domain) {
+  var domains = JSON.parse(localStorage.getItem('whitelist')) || {};
+  return domains[domain];
+}
+
+function addToWhitelist(domain) {
+  var domains = JSON.parse(localStorage.getItem('whitelist')) || {};
+  domains[domain] = true;
+  localStorage.setItem('whitelist', JSON.stringify(domains));
+}
+
 if (chrome.contextMenus) {
  chrome.contextMenus.create({'title': chrome.i18n.getMessage('app_name_short'),
                              'documentUrlPatterns': [ 'http://*/*', 'https://*/*' ],
@@ -46,7 +56,28 @@ if (chrome.contextMenus) {
                              'contexts': ['link', 'selection', 'image', 'video', 'audio']});
 }

-//initializeBrowserChannel();
+var lastRequest;
+
+// Handle content script requests.
+chrome.extension.onRequest.addListener(
+    function(info, sender, respond) {
+      var msgType = (info.selection && info.selection.length > 0) ? 'selection' : 'page';
+      var domain = info.url.match(/:\/\/(.[^/]+)/)[1];
+
+      if (isWhitelisted(domain)) {
+        sendToPhone(info.title, info.url, msgType, info.selection, function(status) {
+          alert('sent to phone!');
+          if (status == STATUS_LOGIN_REQUIRED) {
+            chrome.tabs.create({url: signInUrl});
+          }
+        });
+      } else {
+        var notification = webkitNotifications.createHTMLNotification('notification.html');
+        lastRequest = info;
+        notification.show();
+      }
+      respond();
+    });

 </script>

--- a/extension/content_script.js
+++ b/extension/content_script.js
@@ -14,19 +14,39 @@
 * limitations under the License.
 */

-var pageInfo = {
-  "url": document.location.href,
-  "title": document.title,
-  "selection": window.getSelection().toString()
-};
+function getPageInfo() {
+  var pageInfo = {
+    "url": document.location.href,
+    "title": document.title,
+    "selection": window.getSelection().toString()
+  };

-// URL overrides
-if (pageInfo.url.match(/^http[s]?:\/\/maps\.google\./) ||
-    pageInfo.url.match(/^http[s]?:\/\/www\.google\.[a-z]{2,3}(\.[a-z]{2})\/maps/)) {
-  var link = document.getElementById('link');
-  if (link && link.href) {
-    pageInfo.url = link.href;
+  // URL overrides.
+  if (pageInfo.url.match(/^http[s]?:\/\/maps\.google\./) ||
+      pageInfo.url.match(/^http[s]?:\/\/www\.google\.[a-z]{2,3}(\.[a-z]{2})\/maps/)) {
+    var link = document.getElementById('link');
+    if (link && link.href) {
+      pageInfo.url = link.href;
+    }
  }
+  return pageInfo;
 }

-chrome.extension.connect().postMessage(pageInfo);
+// Respond to extension requests with the current page info.
+chrome.extension.onRequest.addListener(
+   function(request, sender, sendResponse) {
+     if (request == 'run') {
+       sendResponse(getPageInfo());
+     }
+   });
+
+// Allow pages to initiate sending as well.
+var element = document.createElement('sendtophone');
+element.style.display='none';
+element.style.background='url(\'' + chrome.extension.getURL("icon_16.png") + '\')';
+element.addEventListener('sendToPhone', function() {
+  var pageInfo = getPageInfo();
+  pageInfo.selection = element.innerText;
+  chrome.extension.sendRequest(pageInfo, function(response) {});
+});
+document.head.appendChild(element);
--- a/extension/manifest.json
+++ b/extension/manifest.json
@@ -16,7 +16,7 @@
  },
  "background_page": "background.html",
  "permissions": [
-    "contextMenus", "tabs", "http://*/*", "https://*/*"
+    "contextMenus", "notifications", "tabs", "http://*/*", "https://*/*"
  ],
  "content_scripts": [ 
    {
--- a/extension/notification.html
+++ b/extension/notification.html
@@ -0,0 +1,93 @@
+<!--
+    Copyright 2010 Google Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<style type="text/css">
+body {
+  padding: 0px;
+  margin: 1px;
+  min-width: 320px;
+  overflow: hidden;
+  background-image: -webkit-gradient(radial, 50% 10%, 10, 50% 10%, 400, from(#f1f8eb), to(#FFF));
+}
+
+td {
+  font-family: verdana;
+  font-size: 12px;
+  color: black;
+}
+</style>
+
+<script>
+function loadHandler() {
+  var request = chrome.extension.getBackgroundPage().lastRequest;
+  if (!request) {
+    window.close();
+  }
+  var domain = request.url.match(/:\/\/(.[^/]+)/)[1];
+  document.getElementById('msg').innerHTML = chrome.i18n.getMessage('request_message', domain);
+  document.getElementById('deny').innerHTML = chrome.i18n.getMessage('request_deny_message');
+  document.getElementById('allow').innerHTML = chrome.i18n.getMessage('request_allow_message');
+  document.getElementById('approve').innerHTML = chrome.i18n.getMessage('request_approve_message');
+  document.getElementById('content').innerText = request.selection;
+  document.getElementById('allow').addEventListener("click", function () {
+    chrome.extension.getBackgroundPage().onClickHandler(request, null);
+    window.close();
+  });
+  document.getElementById('approve').addEventListener("click", function () {
+    chrome.extension.getBackgroundPage().addToWhitelist(domain);
+    chrome.extension.getBackgroundPage().onClickHandler(request, null);
+    window.close();
+  });
+}
+
+function sendToPhoneListener(status) {
+  if (status == STATUS_SUCCESS) {
+    document.getElementById('msg').innerHTML = chrome.i18n.getMessage('sent_message');
+    activateSignOutLink();  
+  } else if (status == STATUS_LOGIN_REQUIRED) {
+    var link = '<a href="#" onclick="chrome.tabs.create({url: \'' + signInUrl + '\'})">' +
+        chrome.i18n.getMessage('sign_in_message') + '</a>';
+    document.getElementById('msg').innerHTML =
+        chrome.i18n.getMessage('sign_in_required_message', link);
+    setSignOutVisibility(false);
+  } else if (status == STATUS_DEVICE_NOT_REGISTERED) {
+    document.getElementById('msg').innerHTML = chrome.i18n.getMessage('device_not_registered_message');
+    activateSignOutLink();
+  } else { 
+    document.getElementById('msg').innerHTML =  
+        chrome.i18n.getMessage('error_sending_message', req.responseText);
+    activateSignOutLink();
+  }
+}
+
+</script>
+
+<body onload="loadHandler()">
+<table>
+  <tr>
+    <td><img src="icon_48.png" style="margin-right: 4px;"/></td>
+    <td width="100%" valign="middle">
+      <div id="msg"></div>
+      <div id="content"></div>
+      <p>
+        <button id="deny" onclick="window.close();"></button>
+        <button id="allow"></button>
+        <button id="approve"></button>
+      </p>
+    </td>
+  </tr>
+</table> 
+</body>
--- a/extension/popup.html
+++ b/extension/popup.html
@@ -32,6 +32,9 @@ td {

 <script src="send_logic.js"></script>
 <script>
+// The popup has it's own sending process since it is the result of a user action.
+// These requests are automatically sent, and errors appear in the popup (rather
+// than a desktop notification.)
 function loadHandler() {
  document.getElementById('msg').innerHTML = chrome.i18n.getMessage('sending_message');
  document.getElementById('help').innerHTML = chrome.i18n.getMessage('help_message');
@@ -40,7 +43,10 @@ function loadHandler() {
  chrome.tabs.getSelected(null, function(tab) {
    if (tab.url.indexOf('http:') == 0 ||
        tab.url.indexOf('https:') == 0) {
-      chrome.tabs.executeScript(null, {file: "content_script.js"});
+      chrome.tabs.sendRequest(tab.id, 'run', function(response) {
+        var msgType = (info.selection && info.selection.length > 0) ? 'selection' : 'page';
+        sendToPhone(info.title, info.url, msgType, info.selection, sendToPhoneListener);
+      });
    } else {
      document.getElementById('msg').innerHTML = chrome.i18n.getMessage('invalid_scheme_message');
    }
@@ -67,15 +73,6 @@ function sendToPhoneListener(status) {
  }
 }

-chrome.extension.onConnect.addListener(function(port) {
-  // This will get called by the content script. We go through
-  // these hoops to get the optional text selection.
-  port.onMessage.addListener(function(info) {
-    var msgType = (info.selection && info.selection.length > 0) ? 'selection' : 'page';
-    sendToPhone(info.title, info.url, msgType, info.selection, sendToPhoneListener);
-  });
-});
-
 function activateSignOutLink() {
  setSignOutVisibility(true);
  var signOutLink = document.getElementById('signout');
--- a/third_party/firefox_sendtophone/chrome.manifest
+++ b/third_party/firefox_sendtophone/chrome.manifest
@@ -13,11 +13,10 @@ locale	sendtophone	hu		chrome/locale/hu/
 locale	sendtophone	it		chrome/locale/it/
 locale	sendtophone	ja-JP		chrome/locale/ja-JP/
 locale	sendtophone	nl		chrome/locale/nl/
-locale	sendtophone	pt-BR		chrome/locale/pt-BR/
 locale	sendtophone	ru		chrome/locale/ru/
 locale	sendtophone	sr		chrome/locale/sr/
 locale	sendtophone	sv		chrome/locale/sv/
-locale	sendtophone	zh-CN		chrome/locale/zh-CN/
+locale	sendtophone	zh		chrome/locale/zh/

 overlay   chrome://browser/content/browser.xul   chrome://sendtophone/content/ff-overlay.xul
 style chrome://global/content/customizeToolbar.xul chrome://sendtophone/skin/overlay.css
--- a/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
+++ b/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
@@ -111,7 +111,10 @@ sendtophone.showFirefoxContextMenu = function(event) {

  gContextMenu.showItem("context-sendtophone-text", gContextMenu.isTextSelected ||
  	(gContextMenu.onTextInput && gContextMenu.target.selectionEnd > gContextMenu.target.selectionStart) );
-
+  gContextMenu.showItem("context-sendtophone-email", (gContextMenu.isTextSelected ||
+  	(gContextMenu.onTextInput && gContextMenu.target.selectionEnd > gContextMenu.target.selectionStart))&&
+	this.detectEmail(this.selectText())
+	);
  gContextMenu.showItem("context-sendtophone-page",  !( gContextMenu.inDirList || gContextMenu.isContentSelected || gContextMenu.onTextInput || gContextMenu.onLink || gContextMenu.onImage ));

 };
--- a/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul
+++ b/third_party/firefox_sendtophone/chrome/content/ff-overlay.xul
@@ -61,6 +61,11 @@
 			accesskey="&sendtophoneContextText.accesskey;"
 			insertafter="context-searchselect"
 			oncommand="sendtophone.onMenuItemCommand(event, 'text')"/>
+		<menuitem id="context-sendtophone-email" label="&sendtophoneContextEmail.label;"
+			class="menuitem-iconic"
+			accesskey="&sendtophoneContextEmail.accesskey;"
+			insertafter="context-searchselect"
+			oncommand="sendtophone.onMenuItemCommand(event, 'email')"/>
 		<menuitem id="context-sendtophone-page" label="&sendtophoneContextPage.label;"
 			class="menuitem-iconic"
 			accesskey="&sendtophoneContextPage.accesskey;"
--- a/third_party/firefox_sendtophone/chrome/content/overlay.js
+++ b/third_party/firefox_sendtophone/chrome/content/overlay.js
@@ -62,6 +62,26 @@ var sendtophone = {
 		}
 	},

+	detectEmail: function ( email ){
+		var exEmail=/^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$/;
+		return email.match(exEmail);
+	},
+
+	selectText: function (){
+		var input = gContextMenu.target;
+		if (gContextMenu.onTextInput && input && input.value)
+		{
+			selectedText = input.value.substring(input.selectionStart, input.selectionEnd);
+		}
+		else
+		{
+			// Get the selection from the correct iframe
+			var focusedWindow = document.commandDispatcher.focusedWindow;
+			selectedText = focusedWindow.getSelection().toString();
+		}
+		return selectedText;
+	},	
+
 	onMenuItemCommand: function(e, type)
 	{
 		var title, url, selection = '';
@@ -99,17 +119,12 @@ var sendtophone = {
 			case 'text':
 				title = "Selection";
 				url = 'http://google.com/';
-				var input = gContextMenu.target;
-				if (gContextMenu.onTextInput && input && input.value)
-				{
-					selection = input.value.substring(input.selectionStart, input.selectionEnd);
-				}
-				else
-				{
-					// Get the selection from the correct iframe
-					var focusedWindow = document.commandDispatcher.focusedWindow;
-					selection = focusedWindow.getSelection().toString();
-				}
+				selection = this.selectText();
+
+			case 'email':
+				title = "Selected EMail Address";
+				url = "mailto:"+this.selectText();
+				selection = "";
 				break;

 			case 'pageButton':
--- a/third_party/firefox_sendtophone/chrome/locale/cs/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/cs/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Odeslat video do telefonu">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/de/overlay.dtd
@@ -1,4 +1,4 @@
-<!ENTITY sendtophoneToolbarButton.label "Fox to Phone">
+<!ENTITY sendtophoneToolbarButton.label "Fox To Phone">
 <!ENTITY sendtophoneToolbarButton.tooltip "Diese Seite auf Ihr Android Gerät schicken.">
 <!ENTITY sendtophoneContext.label "Link auf Android senden">
 <!ENTITY sendtophoneContext.accesskey "A">
@@ -10,15 +10,18 @@
 <!ENTITY sendtophoneContextPage.accesskey "A">
 <!ENTITY sendtophoneContextLogout.label "Abmelden">
 <!ENTITY sendtophoneContextLogout.accesskey "L">
-<!ENTITY sendtophoneOptions.title "Send To Phone Einstellungen">
+<!ENTITY sendtophoneOptions.title "Fox To Phone Einstellungen">
 <!ENTITY sendtophoneProtocols.label "Protokolle">
-<!ENTITY sendtophoneContextSendFile.label "Send files...">
+<!ENTITY sendtophoneContextSendFile.label "Dateien senden ...">
 <!ENTITY sendtophoneContextSendFile.accesskey "S">
-<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.label "Send Ordner ...">
 <!ENTITY sendtophoneContextSendFolder.accesskey "F">
-<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.label "Send dekodiert QR Link zum Android">
 <!ENTITY sendtophoneContextQrImage.accesskey "Q">
-<!ENTITY sendtophoneContextSendClipboard.label "Send Clipboard">
+<!ENTITY sendtophoneContextSendClipboard.label "Send Merkzettel">
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
-<!ENTITY sendtophoneContextVideo.label "Send Video to Android">
+<!ENTITY sendtophoneContextVideo.label "Senden Video zum Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Senden Email zum Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
+
--- a/third_party/firefox_sendtophone/chrome/locale/de/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/de/overlay.properties
@@ -11,13 +11,13 @@ marketLink=Market Link
 smsLink=SMS-Nummer
 smstoLink=SMS-Nummer
 telLink=Telefonnummer
-InvalidFile=Not a valid file
-SendFileToPhone=Send files to your phone.
-SendFolderToPhone=Send a folder to your phone.
-qrTitle=QR Image Link
-ConfirmQR=A QR image has been detected\n"%s"\nDo you want to send that instead of the page?
+InvalidFile=Nicht eine gültige Datei
+SendFileToPhone=Senden Sie Dateien auf Ihr Handy.
+SendFolderToPhone=Senden Sie einen Ordner auf Ihrem Telefon.
+qrTitle=QR-Bild Link
+ConfirmQR=Ein QR-Bild wurde erkannt\n"%s"\nMöchten Sie senden möchten, dass anstelle der Seite?
 RememberMyDecision=Auswahl merken
-qrContextMenu=Send "%s" to Android
-FileUploadsDisabled=It's not possible to upload files to the phone.
-FileTooBig=The file is too big.
+qrContextMenu=Senden "%s" auf Android
+FileUploadsDisabled=Es ist nicht möglich, Dateien auf das Telefon laden.
+FileTooBig=Die Datei ist zu groß.
 videoTitle=Video Link
--- a/third_party/firefox_sendtophone/chrome/locale/de/uploads.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/de/uploads.dtd
@@ -1 +1 @@
-<!ENTITY compressing.label "Compressing folder">
+<!ENTITY compressing.label "Komprimieren von Ordner">
--- a/third_party/firefox_sendtophone/chrome/locale/en-US/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/en-US/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/es/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Enviar video a Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/fr/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/fr/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/fr/overlay.properties
@@ -16,7 +16,6 @@ SendFileToPhone=Send files to your phone.
 SendFolderToPhone=Send a folder to your phone.
 qrTitle=QR Image Link
 ConfirmQR=A QR image has been detected\n"%s"\nDo you want to send that instead of the page?
-RememberMyDecision=Se souvenir de mon choix
 qrContextMenu=Send "%s" to Android
 FileUploadsDisabled=It's not possible to upload files to the phone.
 FileTooBig=The file is too big.
--- a/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Seol Video chun Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Seol riomhpost chun Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/ga-IE/overlay.properties
@@ -11,13 +11,12 @@ marketLink=Nasc chuig an Margadh
 smsLink=Uimhir SMS
 smstoLink=Uimhir SMS
 telLink=Uimhir Theileafóin
-InvalidFile=Gan comhad bailí
-SendFileToPhone=Seol comhad ar do ghuthán.
-SendFolderToPhone=Seol an fhillteáin le do ghuthán.
-qrTitle=Nasc íomhá QR
-ConfirmQR=Tá an íomhá QR a bhraitear\n"%s"\nAn bhfuil tú ag iarraidh a sheoladh go in ionad an leathanach seo?
-RememberMyDecision=Cuimhnigh mo chinneadh
-qrContextMenu=Seol "%s" ar do ghuthán.
-FileUploadsDisabled=Níl sé indéanta chun comhaid a uaslódáil chuig an bhfón.
-FileTooBig=Tá an comhad ró-mhór.
+InvalidFile=Not a valid file
+SendFileToPhone=Send files to your phone.
+SendFolderToPhone=Send a folder to your phone.
+qrTitle=QR Image Link
+ConfirmQR=A QR image has been detected\n"%s"\nDo you want to send that instead of the page?
+qrContextMenu=Send "%s" to Android
+FileUploadsDisabled=It's not possible to upload files to the phone.
+FileTooBig=The file is too big.
 videoTitle=Nasc Video
--- a/third_party/firefox_sendtophone/chrome/locale/hi-IN/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/hi-IN/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/hu/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/hu/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Videó küldése az Androidra">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/it/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.dtd
@@ -1,24 +1,26 @@
-<!ENTITY sendtophoneToolbarButton.label "Fox To Phone">
-<!ENTITY sendtophoneToolbarButton.tooltip "このページを Android に送信">
-<!ENTITY sendtophoneContext.label "リンクを Android に送信">
-<!ENTITY sendtophoneContext.accesskey "A">
-<!ENTITY sendtophoneContextImage.label "画像を Android に送信">
-<!ENTITY sendtophoneContextImage.accesskey "A">
-<!ENTITY sendtophoneContextText.label "選択したテキストを Android に送信">
-<!ENTITY sendtophoneContextText.accesskey "A">
-<!ENTITY sendtophoneContextPage.label "このページを Android に送信">
-<!ENTITY sendtophoneContextPage.accesskey "A">
-<!ENTITY sendtophoneContextLogout.label "ログアウト">
-<!ENTITY sendtophoneContextLogout.accesskey "L">
-<!ENTITY sendtophoneOptions.title "Fox to Phone の設定">
-<!ENTITY sendtophoneProtocols.label "プロトコル">
-<!ENTITY sendtophoneContextSendFile.label "送信するファイル...">
-<!ENTITY sendtophoneContextSendFile.accesskey "S">
-<!ENTITY sendtophoneContextSendFolder.label "送信するフォルダ...">
-<!ENTITY sendtophoneContextSendFolder.accesskey "F">
-<!ENTITY sendtophoneContextQrImage.label "解読した QR リンクを Android に送信">
-<!ENTITY sendtophoneContextQrImage.accesskey "Q">
-<!ENTITY sendtophoneContextSendClipboard.label "クリップボードを Android に送信">
-<!ENTITY sendtophoneContextSendClipboard.accesskey "C">
-<!ENTITY sendtophoneContextVideo.label "動画を Android に送信">
-<!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneToolbarButton.label "電話に送信">
+<!ENTITY sendtophoneToolbarButton.tooltip "送信あなたのAndroid携帯電話にこのページ">
+<!ENTITY sendtophoneContext.label "Androidへの送信このリンク">
+<!ENTITY sendtophoneContext.accesskey "A">
+<!ENTITY sendtophoneContextImage.label "Send this image to Android">
+<!ENTITY sendtophoneContextImage.accesskey "A">
+<!ENTITY sendtophoneContextText.label "Send this text to Android">
+<!ENTITY sendtophoneContextText.accesskey "A">
+<!ENTITY sendtophoneContextPage.label "Send this page to Android">
+<!ENTITY sendtophoneContextPage.accesskey "A">
+<!ENTITY sendtophoneContextLogout.label "Logout">
+<!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Fox to Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
+<!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
+<!ENTITY sendtophoneContextSendClipboard.label "Send Clipboard">
+<!ENTITY sendtophoneContextSendClipboard.accesskey "C">
+<!ENTITY sendtophoneContextVideo.label "Send Video to Android">
+<!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/ja-JP/overlay.properties
@@ -1,23 +1,22 @@
-extensions.sendtophone@martinezdelizarrondo.com.description=読んでいるページを Android 携帯へ送信します
-SendToPhoneTitle=Fox To Phone
-InvalidScheme=無効なスキームです。http:// か https:// のリンクを送って下さい。
-InfoSent=リンクを携帯電話に送信しています。
-ErrorOnSend=送信エラーが発生:
-LoginRequired=リンクを送信するためにログインが必要です。
-LoginSuccessful=ログインしました。
-DeviceNotRegistered=この Gmail アカウントを登録している携帯電話に chrometophone.apk をインストールして下さい
-LogoutSuccessful=ログアウトしました
-marketLink=マーケットへのリンク
-smsLink=SMS番号
-smstoLink=SMS番号
+extensions.sendtophone@martinezdelizarrondo.com.description=送信Android電話機に現在のページ
+SendToPhoneTitle=送信する電話
+InvalidScheme=無効なスキームは、ちょうどはhttp://またはhttps://のリンクを送ってください。
+InfoSent=リンクはあなたの携帯電話に送信されています。
+ErrorOnSend=これは、送信に失敗しました：
+LoginRequired=ログインリンクを送信するために必要です。
+LoginSuccessful=あなたはログインしている
+DeviceNotRegistered=は あなたの携帯電話にこのGmailアカウントに登録chrometophone.apkをインストールする必要があります
+LogoutSuccessful=あなたが記録されます。
+marketLink=市場へのリンク
+smsLink=SMSの番号
+smstoLink=SMSの番号
 telLink=電話番号
-InvalidFile=無効なファイル
-SendFileToPhone=ファイルを携帯電話へ送信します。
-SendFolderToPhone=フォルダを携帯電話へ送信します。
-qrTitle=QR 画像リンク
-ConfirmQR=QR 画像が解読されました\n"%s"\nこれをページの代わりに送信しますか？
-RememberMyDecision=決定を記憶
-qrContextMenu="%s" を Android に送信
-FileUploadsDisabled=このファイルは携帯電話へアップロード出来ません。
-FileTooBig=このファイルは大きすぎます。
-videoTitle=動画リンク
+InvalidFile=Not a valid file
+SendFileToPhone=Send files to your phone.
+SendFolderToPhone=Send a folder to your phone.
+qrTitle=QR Image Link
+ConfirmQR=A QR image has been detected\n"%s"\nDo you want to send that instead of the page?
+qrContextMenu=Send "%s" to Android
+FileUploadsDisabled=It's not possible to upload files to the phone.
+FileTooBig=The file is too big.
+videoTitle=Video Link
--- a/third_party/firefox_sendtophone/chrome/locale/ja-JP/uploads.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ja-JP/uploads.dtd
@@ -1 +1 @@
-<!ENTITY compressing.label "フォルダを圧縮">
+<!ENTITY compressing.label "Compressing folder">
--- a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
@@ -1,24 +1,22 @@
-<!ENTITY sendtophoneToolbarButton.label "Fox to Phone">
-<!ENTITY sendtophoneToolbarButton.tooltip "Verzend deze pagina naar uw Android-telefoon">
-<!ENTITY sendtophoneContext.label "Deze koppeling naar Android verzenden">
-<!ENTITY sendtophoneContext.accesskey "A">
-<!ENTITY sendtophoneContextImage.label "Deze afbeelding naar Android verzenden">
-<!ENTITY sendtophoneContextImage.accesskey "A">
-<!ENTITY sendtophoneContextText.label "Deze tekst naar Android verzenden">
-<!ENTITY sendtophoneContextText.accesskey "A">
-<!ENTITY sendtophoneContextPage.label "Deze pagina naar Android verzenden">
-<!ENTITY sendtophoneContextPage.accesskey "A">
-<!ENTITY sendtophoneContextLogout.label "Afmelden">
-<!ENTITY sendtophoneContextLogout.accesskey "L">
-<!ENTITY sendtophoneOptions.title "Fox to Phone-voorkeuren">
-<!ENTITY sendtophoneProtocols.label "Protocollen">
-<!ENTITY sendtophoneContextSendFile.label "Bestanden verzenden…">
-<!ENTITY sendtophoneContextSendFile.accesskey "z">
-<!ENTITY sendtophoneContextSendFolder.label "Map verzenden…">
-<!ENTITY sendtophoneContextSendFolder.accesskey "M">
-<!ENTITY sendtophoneContextQrImage.label "Gedecodeerde QR-koppeling naar Android verzenden">
-<!ENTITY sendtophoneContextQrImage.accesskey "Q">
-<!ENTITY sendtophoneContextSendClipboard.label "Klembord verzenden">
-<!ENTITY sendtophoneContextSendClipboard.accesskey "K">
-<!ENTITY sendtophoneContextVideo.label "Video naar Android verzenden">
-<!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneToolbarButton.label "Verzenden naar telefoon">
+<!ENTITY sendtophoneToolbarButton.tooltip "Verzend deze pagina naar uw Android-telefoon">
+<!ENTITY sendtophoneContext.label "Deze koppeling naar Android verzenden">
+<!ENTITY sendtophoneContext.accesskey "A">
+<!ENTITY sendtophoneContextImage.label "Deze afbeelding naar Android verzenden">
+<!ENTITY sendtophoneContextImage.accesskey "A">
+<!ENTITY sendtophoneContextText.label "Deze tekst naar Android verzenden">
+<!ENTITY sendtophoneContextText.accesskey "A">
+<!ENTITY sendtophoneContextPage.label "Deze pagina naar Android verzenden">
+<!ENTITY sendtophoneContextPage.accesskey "A">
+<!ENTITY sendtophoneContextLogout.label "Afmelden">
+<!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Voorkeuren voor verzenden naar telefoon">
+<!ENTITY sendtophoneProtocols.label "Protocollen">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
+<!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.properties
@@ -1,5 +1,5 @@
 extensions.sendtophone@martinezdelizarrondo.com.description=Verzendt de huidige pagina naar uw Android-telefoon
-SendToPhoneTitle=Fox to Phone
+SendToPhoneTitle=Verzenden naar telefoon
 InvalidScheme=Ongeldig protocol, verzend a.u.b. alleen koppelingen van het type http:// of https://.
 InfoSent=De koppeling is verzonden naar uw telefoon.
 ErrorOnSend=Er is een fout opgetreden bij het verzenden:
@@ -11,13 +11,12 @@ marketLink=Marktkoppeling
 smsLink=SMS-nummer
 smstoLink=SMS-nummer
 telLink=Telefoonnummer
-InvalidFile=Geen geldig bestand
-SendFileToPhone=Bestanden naar uw telefoon verzenden.
-SendFolderToPhone=Een map naar uw telefoon verzenden.
-qrTitle=QR-afbeeldingskoppeling
-ConfirmQR=Er is een QR-afbeelding gedetecteerd\n“%s”\nWilt u deze verzenden in plaats van de pagina?
-RememberMyDecision=Mijn keuze onthouden
-qrContextMenu=“%s” naar Android verzenden
-FileUploadsDisabled=Het is niet mogelijk om bestanden naar de telefoon te uploaden.
-FileTooBig=Het bestand is te groot.
-videoTitle=Videokoppeling
+InvalidFile=Not a valid file
+SendFileToPhone=Send files to your phone.
+SendFolderToPhone=Send a folder to your phone.
+qrTitle=QR Image Link
+ConfirmQR=A QR image has been detected\n"%s"\nDo you want to send that instead of the page?
+qrContextMenu=Send "%s" to Android
+FileUploadsDisabled=It's not possible to upload files to the phone.
+FileTooBig=The file is too big.
+videoTitle=Video Link
--- a/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.dtd
@@ -1,24 +0,0 @@
-<!ENTITY sendtophoneToolbarButton.label "Fox To Phone">
-<!ENTITY sendtophoneToolbarButton.tooltip "Envia esta página para seu celular Android">
-<!ENTITY sendtophoneContext.label "Enviar este link para o Android">
-<!ENTITY sendtophoneContext.accesskey "l">
-<!ENTITY sendtophoneContextImage.label "Enviar esta imagem para o Android">
-<!ENTITY sendtophoneContextImage.accesskey "i">
-<!ENTITY sendtophoneContextText.label "Enviar este texto para o Android">
-<!ENTITY sendtophoneContextText.accesskey "t">
-<!ENTITY sendtophoneContextPage.label "Enviar esta página para o Android">
-<!ENTITY sendtophoneContextPage.accesskey "g">
-<!ENTITY sendtophoneContextLogout.label "Logout">
-<!ENTITY sendtophoneContextLogout.accesskey "L">
-<!ENTITY sendtophoneOptions.title "Preferências do Fox To Phone">
-<!ENTITY sendtophoneProtocols.label "Protocolos">
-<!ENTITY sendtophoneContextSendFile.label "Enviar arquivos...">
-<!ENTITY sendtophoneContextSendFile.accesskey "a">
-<!ENTITY sendtophoneContextSendFolder.label "Enviar pasta...">
-<!ENTITY sendtophoneContextSendFolder.accesskey "p">
-<!ENTITY sendtophoneContextQrImage.label "Enviar link QR decodificado para o Android">
-<!ENTITY sendtophoneContextQrImage.accesskey "Q">
-<!ENTITY sendtophoneContextSendClipboard.label "Enviar área de transferência">
-<!ENTITY sendtophoneContextSendClipboard.accesskey "t">
-<!ENTITY sendtophoneContextVideo.label "Enviar vídeo para o Android">
-<!ENTITY sendtophoneContextVideo.accesskey "v">
--- a/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/pt-BR/overlay.properties
@@ -1,23 +0,0 @@
-extensions.sendtophone@martinezdelizarrondo.com.description=Envia a página atual para seu celular Android
-SendToPhoneTitle=Fox To Phone
-InvalidScheme=Esquema inválido. Por favor, só envie links http:// ou https://
-InfoSent=O link foi enviado para seu celular.
-ErrorOnSend=Houve um erro ao enviar:
-LoginRequired=É necessário fazer login para enviar o link.
-LoginSuccessful=Você se logou.
-DeviceNotRegistered=Você deve instalar o chrometophone.apk no celular registrado com essa conta do GMail
-LogoutSuccessful=Você se deslogou
-marketLink=Link de mercado
-smsLink=Número SMS
-smstoLink=Número SMS
-telLink=Número do celular
-InvalidFile=Não é um arquivo válido
-SendFileToPhone=Enviar arquivos para seu celular.
-SendFolderToPhone=Enviar uma pasta para seu celular.
-qrTitle=Link de imagem QR
-ConfirmQR=Uma imagem QR foi detectada\n"%s"\nVocê quer enviá-la ao invés da página?
-RememberMyDecision=Lembrar minha decisão
-qrContextMenu=Enviar "%s" para o Android
-FileUploadsDisabled=Não é possível enviar arquivos para o celular.
-FileTooBig=O arquivo é grande demais.
-videoTitle=Link para vídeo
--- a/third_party/firefox_sendtophone/chrome/locale/pt-BR/uploads.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/pt-BR/uploads.dtd
@@ -1 +0,0 @@
-<!ENTITY compressing.label "Compactando pasta">
--- a/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
@@ -1,24 +1,26 @@
-<!ENTITY sendtophoneToolbarButton.label "Fox To Phone">
-<!ENTITY sendtophoneToolbarButton.tooltip "Отправить страницу в телефон">
-<!ENTITY sendtophoneContext.label "Отправить ссылку в телефон">
-<!ENTITY sendtophoneContext.accesskey "A">
-<!ENTITY sendtophoneContextImage.label "Послать картинку в телефон">
-<!ENTITY sendtophoneContextImage.accesskey "A">
-<!ENTITY sendtophoneContextText.label "Отправить текст в телефон">
-<!ENTITY sendtophoneContextText.accesskey "A">
-<!ENTITY sendtophoneContextPage.label "Отправить страницу в телефон">
-<!ENTITY sendtophoneContextPage.accesskey "A">
-<!ENTITY sendtophoneContextLogout.label "Выйти">
-<!ENTITY sendtophoneContextLogout.accesskey "L">
-<!ENTITY sendtophoneOptions.title "Настройки Fox To Phone">
-<!ENTITY sendtophoneProtocols.label "Протоколы">
-<!ENTITY sendtophoneContextSendFile.label "Отправить файл(ы)…">
-<!ENTITY sendtophoneContextSendFile.accesskey "S">
-<!ENTITY sendtophoneContextSendFolder.label "Отправить папку…">
-<!ENTITY sendtophoneContextSendFolder.accesskey "F">
-<!ENTITY sendtophoneContextQrImage.label "Отправить QR-ссылку в телефон">
-<!ENTITY sendtophoneContextQrImage.accesskey "Q">
-<!ENTITY sendtophoneContextSendClipboard.label "Отправить содержимое буфера обмена в телефон">
-<!ENTITY sendtophoneContextSendClipboard.accesskey "C">
-<!ENTITY sendtophoneContextVideo.label "Отправить видео в телефон">
-<!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneToolbarButton.label "Отправить на телефон">
+<!ENTITY sendtophoneToolbarButton.tooltip "Отправить эту страницу к Android телефон">
+<!ENTITY sendtophoneContext.label "Отправить ссылку Android">
+<!ENTITY sendtophoneContext.accesskey "A">
+<!ENTITY sendtophoneContextImage.label "Послать это изображение Android">
+<!ENTITY sendtophoneContextImage.accesskey "A">
+<!ENTITY sendtophoneContextText.label "Отправить этот текст Android">
+<!ENTITY sendtophoneContextText.accesskey "A">
+<!ENTITY sendtophoneContextPage.label "Отправить эту страницу по Android">
+<!ENTITY sendtophoneContextPage.accesskey "A">
+<!ENTITY sendtophoneContextLogout.label "Выйти">
+<!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Fox To Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
+<!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
+<!ENTITY sendtophoneContextSendClipboard.label "Send Clipboard">
+<!ENTITY sendtophoneContextSendClipboard.accesskey "C">
+<!ENTITY sendtophoneContextVideo.label "Send Video to Android">
+<!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/ru/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/ru/overlay.properties
@@ -1,23 +1,22 @@
-extensions.sendtophone@martinezdelizarrondo.com.description=Отправляет страницу в телефон
-SendToPhoneTitle=Отправить в телефон
-InvalidScheme=Неверная ссылка. Отправлять можно только http и https ссылки
-InfoSent=Ссылка была отправлен в телефон
-ErrorOnSend=Ошибка отправки:
-LoginRequired=Необходимо войти на сайт Google для отправки ссылки
-LoginSuccessful=Вы вошли на сайт Google
-DeviceNotRegistered=Установите chrometophone.apk на Ваш телефон и зарегистрируйте в нем ваш Google-аккаунт
+extensions.sendtophone@martinezdelizarrondo.com.description=Отправляет текущую страницу в ваш телефон
+SendToPhoneTitle=Отправить на телефон
+InvalidScheme=Неверный схеме, пожалуйста, только отправить http:// или https: / / ссылки.
+InfoSent=Ссылку был отправлен на телефон.
+ErrorOnSend=Существовал ошибка отправки:
+LoginRequired=Войти необходимо отправить ссылку.
+LoginSuccessful=Вы прошли идентификацию
+DeviceNotRegistered=Вы должны установить chrometophone.apk телефона зарегистрирован на этот счет GMail
 LogoutSuccessful=Вы вышли из системы
-marketLink=Ссылка на Market
-smsLink=Телефон для отправки SMS
-smstoLink=Телефон для отправки SMS
-telLink=Номер телефона
-InvalidFile=Неправильный файл
-SendFileToPhone=Отправить файл(ы) в телефон
-SendFolderToPhone=Отправить папку в телефон
-qrTitle=QR-ссылка
-ConfirmQR=Обнаружена картинка с QR-ссылкой.\n"%s"\nВы хотите отправить ссылку вместо страницы?
-RememberMyDecision=Запомнить выбор
-qrContextMenu=Отправить "%s" в телефон
-FileUploadsDisabled=Невозможно загрузить файл(ы) на телефон
-FileTooBig=Файл слишком большой
-videoTitle=Ссылка на видео
+marketLink=Рынок Ссылка
+smsLink=Количество SMS
+smstoLink=Количество SMS
+telLink=номер телефона
+InvalidFile=Not a valid file
+SendFileToPhone=Send files to your phone.
+SendFolderToPhone=Send a folder to your phone.
+qrTitle=QR Image Link
+ConfirmQR=A QR image has been detected\n"%s"\nDo you want to send that instead of the page?
+qrContextMenu=Send "%s" to Android
+FileUploadsDisabled=It's not possible to upload files to the phone.
+FileTooBig=The file is too big.
+videoTitle=Video Link
--- a/third_party/firefox_sendtophone/chrome/locale/ru/uploads.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ru/uploads.dtd
@@ -1 +1 @@
-<!ENTITY compressing.label "Сжатие папки">
+<!ENTITY compressing.label "Compressing folder">
--- a/third_party/firefox_sendtophone/chrome/locale/sr/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/sr/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "Т">
 <!ENTITY sendtophoneContextVideo.label "Пошаљи видео на Андроид">
 <!ENTITY sendtophoneContextVideo.accesskey "Д">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/sr/uploads.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/sr/uploads.dtd
@@ -1 +1 @@
-<!ENTITY compressing.label "Сажимање фасцикле">
+<!ENTITY compressing.label "Compressing folder">
--- a/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/sv/overlay.dtd
@@ -22,3 +22,5 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Send Video to Android">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/sv/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/sv/overlay.properties
@@ -16,7 +16,6 @@ SendFileToPhone=Send files to your phone.
 SendFolderToPhone=Send a folder to your phone.
 qrTitle=QR Image Link
 ConfirmQR=A QR image has been detected\n"%s"\nDo you want to send that instead of the page?
-RememberMyDecision=Remember my decision
 qrContextMenu=Send "%s" to Android
 FileUploadsDisabled=It's not possible to upload files to the phone.
 FileTooBig=The file is too big.
--- a/third_party/firefox_sendtophone/chrome/locale/zh-CN/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/zh-CN/overlay.dtd
@@ -1,24 +0,0 @@
-<!ENTITY sendtophoneToolbarButton.label "Fox To Phone<6E><65><EFBFBD><EFBFBD>">
-<!ENTITY sendtophoneToolbarButton.tooltip "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҳ<EFBFBD>浽<EFBFBD><E6B5BD><EFBFBD>İ<EFBFBD>׿<EFBFBD>ֻ<EFBFBD>">
-<!ENTITY sendtophoneContext.label "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӵ<EFBFBD><D3B5><EFBFBD><EFBFBD>İ<EFBFBD>׿<EFBFBD>ֻ<EFBFBD>">
-<!ENTITY sendtophoneContext.accesskey "A">
-<!ENTITY sendtophoneContextImage.label "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͼƬ<CDBC><C6AC><EFBFBD><EFBFBD><EFBFBD>İ<EFBFBD>׿<EFBFBD>ֻ<EFBFBD>">
-<!ENTITY sendtophoneContextImage.accesskey "A">
-<!ENTITY sendtophoneContextText.label "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>İ<EFBFBD>׿<EFBFBD>ֻ<EFBFBD>">
-<!ENTITY sendtophoneContextText.accesskey "A">
-<!ENTITY sendtophoneContextPage.label "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҳ<EFBFBD>浽<EFBFBD><E6B5BD><EFBFBD>İ<EFBFBD>׿<EFBFBD>ֻ<EFBFBD>">
-<!ENTITY sendtophoneContextPage.accesskey "A">
-<!ENTITY sendtophoneContextLogout.label "<22>˳<EFBFBD><CBB3><EFBFBD>¼">
-<!ENTITY sendtophoneContextLogout.accesskey "L">
-<!ENTITY sendtophoneOptions.title "Fox To Phone <20><><EFBFBD><EFBFBD>">
-<!ENTITY sendtophoneProtocols.label "Э<><D0AD>">
-<!ENTITY sendtophoneContextSendFile.label "<22><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>...">
-<!ENTITY sendtophoneContextSendFile.accesskey "S">
-<!ENTITY sendtophoneContextSendFolder.label "<22><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>...">
-<!ENTITY sendtophoneContextSendFolder.accesskey "F">
-<!ENTITY sendtophoneContextQrImage.label "<22>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD>QR<51><52><EFBFBD>ӷ<EFBFBD><D3B7>͵<EFBFBD><CDB5><EFBFBD>׿<EFBFBD>ֻ<EFBFBD>">
-<!ENTITY sendtophoneContextQrImage.accesskey "Q">
-<!ENTITY sendtophoneContextSendClipboard.label "<22><><EFBFBD>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>">
-<!ENTITY sendtophoneContextSendClipboard.accesskey "C">
-<!ENTITY sendtophoneContextVideo.label "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD><EFBFBD>İ<EFBFBD>׿<EFBFBD>ֻ<EFBFBD>">
-<!ENTITY sendtophoneContextVideo.accesskey "V">
--- a/third_party/firefox_sendtophone/chrome/locale/zh-CN/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/zh-CN/overlay.properties
@@ -1,23 +0,0 @@
-extensions.sendtophone@martinezdelizarrondo.com.description=发送当前页面到您的Android手机
-SendToPhoneTitle=Fox To Phone
-InvalidScheme=无效的计划，请只发送http://或https：/ /链接。
-InfoSent=该链接已发送到您的手机。
-ErrorOnSend=发生一个错误发送：
-LoginRequired=登录后才可发送链接。
-LoginSuccessful=您已登录
-DeviceNotRegistered=您必须安装chrometophone.apk在您的手机从而注册此Gmail帐户
-LogoutSuccessful=您已经登出
-marketLink=市场链接
-smsLink=SMS号码
-smstoLink=SMS号码
-telLink=电话号码
-InvalidFile=不是一个有效的文件
-SendFileToPhone=发送文件到您的手机。
-SendFolderToPhone=发送到您的手机文件夹。
-qrTitle=QR图像链接
-ConfirmQR=一个QR图像被检测到了\n"%s"\n发送QR图像代替此页？
-RememberMyDecision=记住我的决定
-qrContextMenu=发送“％s”给Android
-FileUploadsDisabled=不能上传文件到手机上。
-FileTooBig=该文件太大了。
-videoTitle=视频链接
--- a/third_party/firefox_sendtophone/chrome/locale/zh-CN/uploads.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/zh-CN/uploads.dtd
@@ -1 +0,0 @@
-<!ENTITY compressing.label "ѹ<><D1B9><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>">
--- a/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/zh/overlay.dtd
@@ -0,0 +1,26 @@
+<!ENTITY sendtophoneToolbarButton.label "发送到手机">
+<!ENTITY sendtophoneToolbarButton.tooltip "发送给你的Android手机页面">
+<!ENTITY sendtophoneContext.label "此链接发送到Android">
+<!ENTITY sendtophoneContext.accesskey "A">
+<!ENTITY sendtophoneContextImage.label "Send this image to Android">
+<!ENTITY sendtophoneContextImage.accesskey "A">
+<!ENTITY sendtophoneContextText.label "Send this text to Android">
+<!ENTITY sendtophoneContextText.accesskey "A">
+<!ENTITY sendtophoneContextPage.label "Send this page to Android">
+<!ENTITY sendtophoneContextPage.accesskey "A">
+<!ENTITY sendtophoneContextLogout.label "Logout">
+<!ENTITY sendtophoneContextLogout.accesskey "L">
+<!ENTITY sendtophoneOptions.title "Fox To Phone Preferences">
+<!ENTITY sendtophoneProtocols.label "Protocols">
+<!ENTITY sendtophoneContextSendFile.label "Send files...">
+<!ENTITY sendtophoneContextSendFile.accesskey "S">
+<!ENTITY sendtophoneContextSendFolder.label "Send folder...">
+<!ENTITY sendtophoneContextSendFolder.accesskey "F">
+<!ENTITY sendtophoneContextQrImage.label "Send decoded QR Link to Android">
+<!ENTITY sendtophoneContextQrImage.accesskey "Q">
+<!ENTITY sendtophoneContextSendClipboard.label "Send Clipboard">
+<!ENTITY sendtophoneContextSendClipboard.accesskey "C">
+<!ENTITY sendtophoneContextVideo.label "Send Video to Android">
+<!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneContextEmail.label "Send this email to Android">
+<!ENTITY sendtophoneContextEmail.accesskey "E">
--- a/third_party/firefox_sendtophone/chrome/locale/zh/overlay.properties
+++ b/third_party/firefox_sendtophone/chrome/locale/zh/overlay.properties
@@ -0,0 +1,22 @@
+extensions.sendtophone@martinezdelizarrondo.com.description=发送当前页面到您的手机机器人
+SendToPhoneTitle=发送到手机
+InvalidScheme=无效的计划，请你只发送http://或https://联系。
+InfoSent=该链接已发送到您的手机。
+ErrorOnSend=它没有发送：
+LoginRequired=登录后才可发送的链接。
+LoginSuccessful=你登录
+DeviceNotRegistered=您必须安装到手机上的chrometophone.apk注册此Gmail帐户
+LogoutSuccessful=你是登出
+marketLink=市场链接
+smsLink=短信号码
+smstoLink=短信号码
+telLink=电话号码
+InvalidFile=Not a valid file
+SendFileToPhone=Send files to your phone.
+SendFolderToPhone=Send a folder to your phone.
+qrTitle=QR Image Link
+ConfirmQR=A QR image has been detected\n"%s"\nDo you want to send that instead of the page?
+qrContextMenu=Send "%s" to Android
+FileUploadsDisabled=It's not possible to upload files to the phone.
+FileTooBig=The file is too big.
+videoTitle=Video Link
--- a/third_party/firefox_sendtophone/chrome/locale/zh/uploads.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/zh/uploads.dtd
@@ -0,0 +1 @@
+<!ENTITY compressing.label "Compressing folder">
--- a/third_party/firefox_sendtophone/install.rdf
+++ b/third_party/firefox_sendtophone/install.rdf
@@ -4,7 +4,7 @@
    <em:id>sendtophone@martinezdelizarrondo.com</em:id>
    <em:type>2</em:type>
    <em:name>Fox To Phone</em:name>
-    <em:version>1.1.2</em:version>
+    <em:version>1.2</em:version>
    <em:creator>Alfonso &amp; Patrick</em:creator>
    <em:description>Send links to your Android 2.2 phone using the new C2DM service. Based on the ChromeToPhone extension.</em:description>

@@ -17,10 +17,6 @@
 	<em:contributor>Emanuel S. (German)</em:contributor>
 	<em:contributor>ДакСРБИЈА (Serbian)</em:contributor>
 	<em:contributor>Martin Zubek (Czech)</em:contributor>
-	<em:contributor>mjy (Japanese)</em:contributor>
-	<em:contributor>Marcelo Ghelman (ghelman.net) (Portuguese (Brazilian))</em:contributor>
-	<em:contributor>LA (Russian)</em:contributor>
-	<em:contributor>yongdong7 (Chinese simplified)</em:contributor>

    <em:targetApplication>
      <Description>
				`@@ -1 +0,0 @@`
				`<!ENTITY compressing.label "Compactando pasta">`
				`@@ -1 +0,0 @@`
				`<!ENTITY compressing.label "ѹ<><D1B9><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>">`
				`@@ -0,0 +1 @@`
				`<!ENTITY compressing.label "Compressing folder">`