[mail][suite] Report en-US changes to region.properties (Bug 531285) + missing strings from Bug 1205727.
authorTheo Chevalier <theo.chevalier11@gmail.com>
Sun, 13 Dec 2015 00:39:59 +0100
changeset 5543 604c47045c30fc32e3c16b59b67a05000fb2ba3f
parent 5542 b01d875013ec64f0dba8353e23f8d81da0a2afc6
child 5544 d0e9a21a100766fccd1b6f009dc8e3bd44cb4e5e
child 5545 661304c55fbc38fd7c2dc12c51686e99157f3964
child 5547 6cc9480baf4b2d9c75284a137b77b11a2269679e
push id4256
push usertheo.chevalier11@gmail.com
push dateSat, 12 Dec 2015 23:41:41 +0000
bugs531285, 1205727
[mail][suite] Report en-US changes to region.properties (Bug 531285) + missing strings from Bug 1205727.
chat/xmpp.properties
mail/chrome/messenger-region/region.properties
suite/chrome/mailnews/region.properties
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -234,13 +234,15 @@ gtalk.usernameHint=adresse électronique
 #  string defined in imAccounts.properties when the user is
 #  configuring a Odnoklassniki account.
 odnoklassniki.usernameHint=identifiant du profil
 
 # LOCALZIATION NOTE (command.*):
 #  These are the help messages for each command.
 command.join3=%S [&lt;canal&gt;[@&lt;serveur&gt;][/&lt;pseudo&gt;]] [&lt;mot de passe&gt;] : Rejoindre un canal, en fournissant si besoin un pseudo différent ou le mot de passe du canal.
 command.part2=%S [&lt;message&gt;] : Quitter le canal actuel avec un message facultatif.
-command.topic=%S [&lt;nouveau sujet&gt;]: Définir le sujet du canal.
-command.ban=%S &lt;nick&gt;[&lt;message&gt;]: Bannir quelqu'un du canal. Vous devez être administrateur du canal pour affectuer cette action.
-command.kick=%S &lt;nick&gt;[&lt;message&gt;]: Éjecter quelqu'un du canal. Vous devez être administrateur du canal pour affectuer cette action.
-command.nick=%S &lt;new nickname&gt;: Changer votre pseudo.
-command.msg=%S &lt;nick&gt; &lt;message&gt;: Envoyer un message privé à un participant du canal.
+command.topic=%S [&lt;nouveau sujet&gt;] : Définir le sujet du canal.
+command.ban=%S &lt;pseudo&gt;[&lt;message&gt;] : Bannir quelqu'un du canal. Vous devez être administrateur du canal pour effectuer cette action.
+command.kick=%S &lt;pseudo&gt;[&lt;message&gt;] : Éjecter quelqu'un du canal. Vous devez être administrateur du canal pour effectuer cette action.
+command.invite=%S &lt;jid&gt;[&lt;message&gt;] : Inviter un utilisateur à rejoindre le canal actuel avec un message facultatif.
+command.me=%S &lt;action à réaliser&gt; : Réaliser une action.
+command.nick=%S &lt;nouveau pseudo&gt; : Changer votre pseudo.
+command.msg=%S &lt;pseudo&gt; &lt;message&gt; : Envoyer un message privé à un participant du canal.
--- a/mail/chrome/messenger-region/region.properties
+++ b/mail/chrome/messenger-region/region.properties
@@ -6,20 +6,29 @@
 browser.search.defaultenginename=Bing
 
 # Search engine order (order displayed in the search bar dropdown)s
 browser.search.order.1=Bing
 browser.search.order.2=Yahoo
 
 # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
 # mail.addr_book.mapit_url.format=
-# The format for "mail.addr_book.mapit_url.format" is:
+# The mail.addr_book.mapit_url.format should start with the URL of the mapping
+# service and then the query part with placeholders to be subsituted from values
+# from the addressbook contact's address.
+# Available placeholders are:
 # @A1== address, part 1
 # @A2== address, part 2
 # @CI== city
 # @ST== state
 # @ZI== zip code
 # @CO== country
+# Default map service:
 mail.addr_book.mapit_url.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
+# List of available map services (up to 5 can be defined here):
+mail.addr_book.mapit_url.1.name=Google Maps
+mail.addr_book.mapit_url.1.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
+mail.addr_book.mapit_url.2.name=OpenStreetMap
+mail.addr_book.mapit_url.2.format=http://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
 mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid
 # Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al.
 # Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV
 mailnews.localizedRe=
--- a/suite/chrome/mailnews/region.properties
+++ b/suite/chrome/mailnews/region.properties
@@ -6,21 +6,29 @@
 # messenger.properties
 # mailnews.js
 mailnews.start_page.url=chrome://messenger/content/start.xhtml
 messenger.throbber.url=http://www.seamonkey-project.org/
 compose.throbber.url=http://www.seamonkey-project.org/
 addressbook.throbber.url=http://www.seamonkey-project.org/
 # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
 # mail.addr_book.mapit_url.format=
-# The format for "mail.addr_book.mapit_url.format" is:
+# The mail.addr_book.mapit_url.format should start with the URL of the mapping
+# service and then the query part with placeholders to be subsituted from values
+# from the addressbook contact's address.
+# Available placeholders are:
 # @A1 == address, part 1
 # @A2 == address, part 2
 # @CI == city
 # @ST == state
 # @ZI == zip code
 # @CO == country
+# Default map service:
 mail.addr_book.mapit_url.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
-
+# List of available map services (up to 5 can be defined here):
+mail.addr_book.mapit_url.1.name=Google Maps
+mail.addr_book.mapit_url.1.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
+mail.addr_book.mapit_url.2.name=OpenStreetMap
+mail.addr_book.mapit_url.2.format=http://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
 mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid
 # Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al.
 # Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV
 mailnews.localizedRe=