Bug 955038 - Replace "buddy" with "contact" in user-facing strings, r=florian
This commit is contained in:
Benedikt Pfeifer
Родитель
d16f35ae4a
Коммит
93a7de4a33
|
|
@ -11,7 +11,7 @@
|
|||
<dialog
|
||||
id = "addBuddyDialog"
|
||||
windowtype="Messenger:AddBuddy"
|
||||
title = "&addBuddyWindow.title;"
|
||||
title = "&addContactWindow.title;"
|
||||
buttons= "accept,cancel"
|
||||
xmlns = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload = "addBuddy.onload()"
|
||||
|
|
|
|||
|
|
@ -121,15 +121,15 @@ buddyListContextMenu.prototype = {
|
|||
|
||||
let bundle = document.getElementById("instantbirdBundle").stringBundle;
|
||||
let displayName = this.target.displayName;
|
||||
let promptTitle = bundle.formatStringFromName("buddy.deletePrompt.title",
|
||||
let promptTitle = bundle.formatStringFromName("contact.deletePrompt.title",
|
||||
[displayName], 1);
|
||||
let userName = buddy.userName;
|
||||
if (displayName != userName)
|
||||
displayName += " (" + userName + ")";
|
||||
let proto = buddy.protocol.name; // FIXME build a list
|
||||
let promptMessage = bundle.formatStringFromName("buddy.deletePrompt.message",
|
||||
let promptMessage = bundle.formatStringFromName("contact.deletePrompt.message",
|
||||
[displayName, proto], 2);
|
||||
let deleteButton = bundle.GetStringFromName("buddy.deletePrompt.button");
|
||||
let deleteButton = bundle.GetStringFromName("contact.deletePrompt.button");
|
||||
let prompts = Services.prompt;
|
||||
let flags = prompts.BUTTON_TITLE_IS_STRING * prompts.BUTTON_POS_0 +
|
||||
prompts.BUTTON_TITLE_CANCEL * prompts.BUTTON_POS_1 +
|
||||
|
|
|
|||
|
|
@ -109,8 +109,8 @@
|
|||
</menu>
|
||||
<menuseparator id="context-show-offline-buddies-separator"/>
|
||||
<menuitem id="context-show-offline-buddies"
|
||||
label="&showOfflineBuddiesCmd.label;"
|
||||
accesskey="&showOfflineBuddiesCmd.accesskey;"
|
||||
label="&showOfflineContactsCmd.label;"
|
||||
accesskey="&showOfflineContactsCmd.accesskey;"
|
||||
type="checkbox"
|
||||
oncommand="gBuddyListContextMenu.toggleShowOfflineBuddies();"/>
|
||||
</menupopup>
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@
|
|||
this.setBuddyIcon(aBuddy.buddyIconFilename);
|
||||
|
||||
if (displayName != name)
|
||||
this.addRow(this.bundle.GetStringFromName("buddy.screenname"), name);
|
||||
this.addRow(this.bundle.GetStringFromName("buddy.username"), name);
|
||||
|
||||
this.addRow(this.bundle.GetStringFromName("buddy.account"), account.name);
|
||||
|
||||
|
|
|
|||
|
|
@ -36,14 +36,14 @@
|
|||
<key id="errorConsoleKey" key="&errorConsoleCmd.commandkey;" oncommand="menus.errors();" modifiers="accel,shift"/>
|
||||
<key id="key_quitApplication" key="&quitApplicationCmdMac.key;" command="cmd_quitApplication" modifiers="accel"/>
|
||||
<key id="joinChatkey" key="&joinChat.commandkey;" command="cmd_joinchat" modifiers="accel"/>
|
||||
<key id="addBuddykey" key="&addBuddy.commandkey;" command="cmd_addbuddy" modifiers="accel"/>
|
||||
<key id="addBuddykey" key="&addContact.commandkey;" command="cmd_addbuddy" modifiers="accel"/>
|
||||
<key id="addonskey" key="&addonManager.commandkey;" command="cmd_addons" modifiers="accel"/>
|
||||
</keyset>
|
||||
|
||||
<menubar id="blistMenubar">
|
||||
<menu label="&file.menu;" id="fileMenu" accesskey="&file.accesskey;">
|
||||
<menupopup id="fileMenuPopup" onpopupshowing="menus.updateFileMenuitems();">
|
||||
<menuitem id="addBuddyMenuItem" label="&addBuddy;" command="cmd_addbuddy" key="addBuddykey" accesskey="&addBuddy.accesskey;"/>
|
||||
<menuitem id="addBuddyMenuItem" label="&addContact;" command="cmd_addbuddy" key="addBuddykey" accesskey="&addContact.accesskey;"/>
|
||||
<menuitem id="joinChatMenuItem" label="&joinChat;" command="cmd_joinchat" key="joinChatkey" accesskey="&joinChat.accesskey;"/>
|
||||
<menuseparator/>
|
||||
<menu id="setStatusTo" label="&setStatusTo;" oncommand="menus.setStatus(event);" accesskey="&setStatusTo.accesskey;" >
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<!ENTITY addBuddyWindow.title "Add buddy">
|
||||
<!ENTITY addContactWindow.title "Add Contact">
|
||||
<!ENTITY name.label "Username">
|
||||
<!ENTITY account.label "Account">
|
||||
<!ENTITY tag.label "Group">
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
buddy.screenname=Buddy
|
||||
buddy.username=Username
|
||||
buddy.loggedIn=Logged In
|
||||
buddy.account=Account
|
||||
contact.tags=Tags
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
<!ENTITY quitApplicationCmdMac.label "Quit &brandShortName;">
|
||||
<!ENTITY quitApplicationCmdMac.key "Q">
|
||||
|
||||
<!ENTITY addBuddy "Add Buddy…">
|
||||
<!ENTITY addBuddy.commandkey "b">
|
||||
<!ENTITY addBuddy.accesskey "B">
|
||||
<!ENTITY addContact "Add Contact…">
|
||||
<!ENTITY addContact.commandkey "b">
|
||||
<!ENTITY addContact.accesskey "C">
|
||||
<!ENTITY joinChat "Join Chat…">
|
||||
<!ENTITY joinChat.commandkey "j">
|
||||
<!ENTITY joinChat.accesskey "J">
|
||||
|
|
@ -115,8 +115,8 @@
|
|||
<!ENTITY hideTagCmd.accesskey "H">
|
||||
<!ENTITY visibleTagsCmd.label "Visible Tags…">
|
||||
<!ENTITY visibleTagsCmd.accesskey "V">
|
||||
<!ENTITY showOfflineBuddiesCmd.label "Show offline buddies">
|
||||
<!ENTITY showOfflineBuddiesCmd.accesskey "o">
|
||||
<!ENTITY showOfflineContactsCmd.label "Show Offline Contacts">
|
||||
<!ENTITY showOfflineContactsCmd.accesskey "O">
|
||||
|
||||
<!ENTITY expandContactTooltip "Expand">
|
||||
<!ENTITY collapseContactTooltip "Collapse">
|
||||
|
|
|
|||
|
|
@ -27,27 +27,27 @@ buddy.authRequest.deny.label=Deny
|
|||
buddy.authRequest.deny.accesskey=D
|
||||
|
||||
#LOCALIZATION NOTE
|
||||
# %S here will be replaced by the alias (or username) of a buddy about
|
||||
# to be removed from the buddy list.
|
||||
buddy.deletePrompt.title=Delete %S?
|
||||
# %S here will be replaced by the alias (or username) of a contact about
|
||||
# to be removed from the contact list.
|
||||
contact.deletePrompt.title=Delete %S?
|
||||
|
||||
#LOCALIZATION NOTE
|
||||
# The first parameter of this string will by the name of a buddy (either
|
||||
# The first parameter of this string will by the name of a contact (either
|
||||
# the alias followed by the username between parenthesis if an alias
|
||||
# is set, or only the username otherwise).
|
||||
# The second parameter will be the name of the protocol on which this
|
||||
# buddy is removed (for example: AIM, MSN, Google Talk).
|
||||
# contact is removed (for example: AIM, MSN, Google Talk).
|
||||
#
|
||||
# Please find a wording that will keep the username as close as
|
||||
# possible to the beginning of the string, because this is the
|
||||
# important information that an user should see when looking quickly
|
||||
# at this prompt.
|
||||
buddy.deletePrompt.message=%S will be permanently removed from your %S buddy list if you continue.
|
||||
contact.deletePrompt.message=%S will be permanently removed from your %S contact list if you continue.
|
||||
|
||||
#LOCALIZATION NOTE
|
||||
# the & symbol indicates the position of the character that should be
|
||||
# used as the accesskey for this button.
|
||||
buddy.deletePrompt.button=&Delete
|
||||
contact.deletePrompt.button=&Delete
|
||||
|
||||
group.otherContacts.name=Other Contacts
|
||||
#LOCALIZATION NOTE
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче