[Pkg-mozext-commits] [tabmixplus] 98/147: Follow up bug 1187014 - Use "you" in preference strings, not "me"
David Prévot
taffit at moszumanska.debian.org
Sat Aug 5 15:27:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit 1d48ac61433ea0df40319b06e95a4ade30597ec2
Author: onemen <tabmix.onemen at gmail.com>
Date: Sat Jan 21 12:08:11 2017 +0200
Follow up bug 1187014 - Use "you" in preference strings, not "me"
---
chrome/content/minit/tablib.js | 4 ++--
chrome/content/preferences/appearance.xul | 2 +-
chrome/content/preferences/events.xul | 14 ++++++--------
.../preferences/overlay/incontentPreferences.xul | 6 +++---
chrome/content/preferences/overlay/tabs.xul | 6 +++---
chrome/content/preferences/session.xul | 12 ++++++------
chrome/content/tabmix.xul | 2 +-
chrome/locale/en-US/pref-tabmix.dtd | 19 ++++++++++---------
chrome/locale/en-US/tabmix.dtd | 2 +-
chrome/locale/en-US/tabmix.properties | 6 +++---
modules/MergeWindows.jsm | 2 +-
11 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index e744e82..275a549 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -1657,12 +1657,12 @@ var tablib = { // eslint-disable-line
else
message = bundle.getFormattedString("tabs.closeWarningMultipleTabs", [tabsToClose]);
chkBoxLabel = shouldPrompt == 1 ? bundle.getString("tabs.closeWarningPromptMe") :
- TabmixSvc.getString("window.closeWarning.1");
+ TabmixSvc.getString("window.closeWarning.2");
} else {
let messageKey = "protectedtabs.closeWarning.";
messageKey += (numProtected < tabsToClose) ? "3" : (numProtected == 1) ? "1" : "2";
message = TabmixSvc.getFormattedString(messageKey, [tabsToClose, numProtected]);
- var chkBoxKey = shouldPrompt == 3 ? "window.closeWarning.1" : "protectedtabs.closeWarning.4";
+ var chkBoxKey = shouldPrompt == 3 ? "window.closeWarning.2" : "protectedtabs.closeWarning.5";
chkBoxLabel = TabmixSvc.getString(chkBoxKey);
}
diff --git a/chrome/content/preferences/appearance.xul b/chrome/content/preferences/appearance.xul
index 6e645cb..cebe216 100644
--- a/chrome/content/preferences/appearance.xul
+++ b/chrome/content/preferences/appearance.xul
@@ -113,7 +113,7 @@
<menulist id="hideTabbar" orient="horizontal" preference="pref_hideTabbar">
<menupopup>
<menuitem value="0" id="hideTabbar.never" label="&hideTabBar.never.label;" accesskey="&hideTabBar.never.key;"/>
- <menuitem value="1" id="hideTabbar.onetab" label="&hideTabBar.onOneTab.label;" accesskey="&hideTabBar.onOneTab.key;"/>
+ <menuitem value="1" id="hideTabbar.onetab" label="&hideTabBar.oneTab.label;" accesskey="&hideTabBar.onOneTab.key;"/>
<menuitem value="2" id="hideTabbar.always" label="&hideTabBar.always.label;" accesskey="&hideTabBar.always.key;"/>
</menupopup>
</menulist>
diff --git a/chrome/content/preferences/events.xul b/chrome/content/preferences/events.xul
index 25a2ce3..adab68e 100644
--- a/chrome/content/preferences/events.xul
+++ b/chrome/content/preferences/events.xul
@@ -1,8 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE overlay [
-<!ENTITY % tabsDTD SYSTEM "chrome://browser/locale/preferences/tabs.dtd">
-%tabsDTD;
<!ENTITY % pref-tabmixDTD SYSTEM "chrome://tabmixplus/locale/pref-tabmix.dtd">
%pref-tabmixDTD;
<!ENTITY % shortcutsDTD SYSTEM "chrome://tabmixplus/locale/shortcuts.dtd">
@@ -176,7 +174,7 @@
<!-- Load Bookmarks/History progressively -->
<caption label="&openPlacesGroups.label;"/>
<hbox align="center">
- <checkbox_tmp id="chk_loadProgressively" label="&loadTabsProgressively.label; &moreThan.label;"
+ <checkbox_tmp id="chk_loadProgressively" label="&loadTabsProgressively.label; &openMoreThan.label;"
preference="pref_loadProgressively" control="loadProgressively"
onsyncfrompreference="return gEventsPane.loadProgressively.syncToCheckBox(this);"
onsynctopreference="return gEventsPane.loadProgressively.syncFromCheckBox(this);"/>
@@ -187,7 +185,7 @@
<label value="&tabs.label;"/>
</hbox>
<hbox align="center" class="indent">
- <checkbox_tmp id="chk_restoreOnDemand" label="&restoreOnDemand.label; &moreThan.label;"
+ <checkbox_tmp id="chk_restoreOnDemand" label="&restoreOnDemand.label; &openMoreThan.label;"
preference="pref_restoreOnDemand" control="restoreOnDemand"
onsyncfrompreference="return gEventsPane.loadProgressively.syncToCheckBox(this);"
onsynctopreference="return gEventsPane.loadProgressively.syncFromCheckBox(this);"
@@ -303,11 +301,11 @@
<caption label="&warning.caption.label;"/>
<vbox align="start">
<!-- Warn when closing multiple tabs -->
- <checkbox_tmp id="warnOnClose" label="&warnCloseMultipleTabs.label;" preference="pref_warnOnClose"/>
+ <checkbox_tmp id="warnOnClose" label="&warnOnCloseMultipleTabs.label;" preference="pref_warnOnClose"/>
<!-- Warn when closing window with tabs -->
- <checkbox_tmp id="warnOnCloseWindow" label="&warnOnCloseWindow.label;" preference="pref_warnOnCloseWindow"/>
+ <checkbox_tmp id="warnOnCloseWindow" label="&warnOnCloseWindow1.label;" preference="pref_warnOnCloseWindow"/>
<!-- Warn when closing window with protected tabs -->
- <checkbox_tmp id="warnOnCloseProtected" label="&warnOnCloseProtected.label;" preference="pref_warnOnCloseProtected"/>
+ <checkbox_tmp id="warnOnCloseProtected" label="&warnOnCloseProtected1.label;" preference="pref_warnOnCloseProtected"/>
</vbox>
</groupbox>
<groupbox flex="1">
@@ -319,7 +317,7 @@
<vbox>
<!-- Replace Last Tab With -->
<hbox align="center">
- <label value="&replaceLastTabWith.label;:" observes="obs_replaceLastTabWith"/>
+ <label value="&replaceLastTabWith1.label;:" observes="obs_replaceLastTabWith"/>
<menulist id="replaceLastTabWith" preference="pref_replaceLastTabWith" idnum="_1"
observes="obs_replaceLastTabWith">
<menupopup>
diff --git a/chrome/content/preferences/overlay/incontentPreferences.xul b/chrome/content/preferences/overlay/incontentPreferences.xul
index b1bbcf7..ffda81f 100644
--- a/chrome/content/preferences/overlay/incontentPreferences.xul
+++ b/chrome/content/preferences/overlay/incontentPreferences.xul
@@ -62,10 +62,10 @@
<separator/>
<!-- Warn when closing window with tabs -->
- <checkbox id="warnOnCloseWindow" label="&warnOnCloseWindow.label;" class="indent"
+ <checkbox id="warnOnCloseWindow" label="&warnOnCloseWindow1.label;" class="indent"
preference="browser.tabs.warnOnClose"/>
<!-- Warn when closing window with protected tabs -->
- <checkbox id="warnOnCloseProtected" label="&warnOnCloseProtected.label;" class="indent"
+ <checkbox id="warnOnCloseProtected" label="&warnOnCloseProtected1.label;" class="indent"
preference="extensions.tabmix.protectedtabs.warnOnClose"/>
<separator/>
</vbox>
@@ -77,7 +77,7 @@
<radiogroup id="_hideTabbar" orient="horizontal"
preference="extensions.tabmix.hideTabbar">
<radio value="0" label="&hideTabBar.never.label;" accesskey="&hideTabBar.never.key;"/>
- <radio value="1" label="&hideTabBar.onOneTab.label;" accesskey="&hideTabBar.onOneTab.key;"/>
+ <radio value="1" label="&hideTabBar.oneTab.label;" accesskey="&hideTabBar.onOneTab.key;"/>
<radio value="2" label="&hideTabBar.always.label;" accesskey="&hideTabBar.always.key;"/>
</radiogroup>
</vbox>
diff --git a/chrome/content/preferences/overlay/tabs.xul b/chrome/content/preferences/overlay/tabs.xul
index 1beaac1..a9290e2 100644
--- a/chrome/content/preferences/overlay/tabs.xul
+++ b/chrome/content/preferences/overlay/tabs.xul
@@ -59,11 +59,11 @@
<!-- Warn when closing multiple tabs -->
<checkbox id="warnCloseMultiple" preference="extensions.tabmix.tabs.warnOnClose"/>
<!-- Warn when closing window with tabs -->
- <checkbox id="warnOnCloseWindow" label="&warnOnCloseWindow.label;"
+ <checkbox id="warnOnCloseWindow" label="&warnOnCloseWindow1.label;"
insertafter="warnCloseMultiple"
preference="browser.tabs.warnOnClose"/>
<!-- Warn when closing window with protected tabs -->
- <checkbox id="warnOnCloseProtected" label="&warnOnCloseProtected.label;"
+ <checkbox id="warnOnCloseProtected" label="&warnOnCloseProtected1.label;"
insertafter="warnOnCloseWindow"
preference="extensions.tabmix.protectedtabs.warnOnClose"/>
<separator insertafter="warnOnCloseProtected"/>
@@ -74,7 +74,7 @@
<radiogroup id="_hideTabbar" orient="horizontal"
preference="extensions.tabmix.hideTabbar">
<radio value="0" label="&hideTabBar.never.label;" accesskey="&hideTabBar.never.key;"/>
- <radio value="1" label="&hideTabBar.onOneTab.label;" accesskey="&hideTabBar.onOneTab.key;"/>
+ <radio value="1" label="&hideTabBar.oneTab.label;" accesskey="&hideTabBar.onOneTab.key;"/>
<radio value="2" label="&hideTabBar.always.label;" accesskey="&hideTabBar.always.key;"/>
</radiogroup>
</groupbox>
diff --git a/chrome/content/preferences/session.xul b/chrome/content/preferences/session.xul
index 653f082..d8d6872 100644
--- a/chrome/content/preferences/session.xul
+++ b/chrome/content/preferences/session.xul
@@ -103,13 +103,13 @@
</hbox>
<separator class="groove"/>
<hbox id="exportsession" align="end">
- <description style="width: 24em;"> &sm.extension.description4;.</description>
+ <description style="width: 24em;"> &sm.extension.description5;.</description>
<spacer flex="1"/>
<button label="&sm.extension.convert.label;…"
oncommand="gSessionPane.convertSession();"/>
</hbox>
<radiogroup id="chooseFile" align="start">
- <radio value="0" label="&sm.extension.chooseFile.label0;"/>
+ <radio value="0" label="&sm.extension.chooseFile.label2;"/>
<radio value="1" label="&sm.extension.chooseFile.label1;"/>
</radiogroup>
</groupbox>
@@ -124,9 +124,9 @@
<label value="&sm.start;" control="browserStartupPage" class="firefox"/>
<menulist id="browserStartupPage" class="indent firefox" preference="pref_browserStartupPage">
<menupopup>
- <menuitem label="&startupHomePage.label;" value="1"/>
+ <menuitem label="&startupHomePage1.label;" value="1"/>
<menuitem label="&startupBlankPage.label;" value="0"/>
- <menuitem label="&startupLastSession.label;" value="3"/>
+ <menuitem label="&startupLastSession1.label;" value="3"/>
</menupopup>
</menulist>
<checkbox_tmp id="sessionManager" label="&sessionManger.enable;" preference="pref_sessionManager"
@@ -186,12 +186,12 @@
<label value="&sm.notrestore.label;:" control="browserStartupPage1"/>
<menulist id="browserStartupPage1" preference="pref_browserStartupPage">
<menupopup>
- <menuitem label="&startupHomePage.label;" value="1"/>
+ <menuitem label="&startupHomePage1.label;" value="1"/>
<menuitem label="&startupBlankPage.label;" value="0"/>
</menupopup>
</menulist>
</hbox>
- <checkbox_tmp id="onStart.restorePinned" class="indent" label="&sm.restorePinned.label;"
+ <checkbox_tmp id="onStart.restorePinned" class="indent" label="&sm.restorePinned1.label;"
preference="pref_onStart.restorePinned"/>
</groupbox>
</tabpanel>
diff --git a/chrome/content/tabmix.xul b/chrome/content/tabmix.xul
index 114e365..78f177a 100644
--- a/chrome/content/tabmix.xul
+++ b/chrome/content/tabmix.xul
@@ -378,7 +378,7 @@
<menuitem type="radio" label="&hideTabBar.label;:" disabled="true" style="font-weight: bold;color: #CC0000;"/>
<menuseparator/>
<menuitem value="0" type="radio" label="&hideTabBar.never.label;" accesskey="&hideTabBar.never.key;"/>
- <menuitem value="1" type="radio" label="&hideTabBar.onOneTab.label;" accesskey="&hideTabBar.onOneTab.key;"/>
+ <menuitem value="1" type="radio" label="&hideTabBar.oneTab.label;" accesskey="&hideTabBar.onOneTab.key;"/>
<menuitem value="2" type="radio" label="&hideTabBar.always.label;" accesskey="&hideTabBar.always.key;"/>
</menupopup >
<!-- tabmix tooltip for button -->
diff --git a/chrome/locale/en-US/pref-tabmix.dtd b/chrome/locale/en-US/pref-tabmix.dtd
index 1b0cfc9..cb394a2 100644
--- a/chrome/locale/en-US/pref-tabmix.dtd
+++ b/chrome/locale/en-US/pref-tabmix.dtd
@@ -38,7 +38,7 @@
<!ENTITY tabMerge.label "Tab Merging">
<!ENTITY tabFeature.label "Tab Features">
<!ENTITY newtab.label "Load on New Tab:">
-<!ENTITY replaceLastTabWith.label "When I close last tab replace it with">
+<!ENTITY replaceLastTabWith1.label "When you close last tab replace it with">
<!ENTITY newtab.blank "Blank Page">
<!ENTITY newtab.home "Home Page">
<!ENTITY newtab.current "Current Page">
@@ -59,7 +59,7 @@
<!ENTITY moveSwitchToTabNext.label "Move tab from 'Switch to tab' next to current one">
<!ENTITY loadTabsProgressively.label "Load tabs progressively">
<!ENTITY restoreOnDemand.label "Don't load tabs until selected">
-<!ENTITY moreThan.label "when I open more than">
+<!ENTITY openMoreThan.label "when you open more than">
<!ENTITY tabs.label "tabs">
<!ENTITY lockTabs.label "Lock tabs">
<!ENTITY lockNewTabs.label "Lock New tabs">
@@ -84,8 +84,9 @@
<!ENTITY duplicateTab.label "Duplicate Tab">
<!ENTITY inversefocus2.label "Middle-click or Control-click inverse focus of:">
<!ENTITY warning.caption.label "Warning">
-<!ENTITY warnOnCloseProtected.label "Warn me when closing window with protected tabs">
-<!ENTITY warnOnCloseWindow.label "Warn me when closing window with multiple tabs">
+<!ENTITY warnOnCloseMultipleTabs.label "Warn you when closing multiple tabs">
+<!ENTITY warnOnCloseProtected1.label "Warn you when closing window with protected tabs">
+<!ENTITY warnOnCloseWindow1.label "Warn you when closing window with multiple tabs">
<!ENTITY lasttab.caption.label "Closing last tab">
<!ENTITY keepWindow.label.3.1 "Do not close window when closing last tab">
<!ENTITY keeptab.label "Prevent last tab from closing">
@@ -258,16 +259,16 @@
<!ENTITY showtabBarContext.label "Show in Tab Context Menu">
<!ENTITY showContentAreaContext.label "Show in Main Context Menu">
<!ENTITY showToolsMenu.label "Show in Tools Menu">
-<!ENTITY startupHomePage.label "Show my home page">
+<!ENTITY startupHomePage1.label "Show your home page">
<!ENTITY startupBlankPage.label "Show a blank page">
-<!ENTITY startupLastSession.label "Show my windows and tabs from last time">
+<!ENTITY startupLastSession1.label "Show your windows and tabs from last time">
<!ENTITY sm.extension.description1 "Tab Mix Plus detect that Session Manager Extension is installed">
<!ENTITY sm.extension.description2 "Tab Mix Plus session manager will be disabled">
<!ENTITY sm.extension.description3 "You can click the button on the right to open Session Manager Options dialog">
-<!ENTITY sm.extension.description4 "Convert My sessions data from Tab Mix Plus format to Session Manager extension format">
+<!ENTITY sm.extension.description5 "Convert your sessions data from Tab Mix Plus format to Session Manager extension format">
<!ENTITY sm.extension.convert.label "Convert">
-<!ENTITY sm.extension.chooseFile.label0 "Let me choose which data file to convert">
<!ENTITY sm.extension.chooseFile.label1 "Convert Tab Mix Plus sessions from the current profile">
+<!ENTITY sm.extension.chooseFile.label2 "Choose which data file to convert">
<!ENTITY ss.enable.label "Use Firefox's built-in Session Restore feature">
<!ENTITY ss.enable.tooltip "Uncheck to allow the use with Tab Mix Plus Session Manager">
<!ENTITY ss.advanced_setting "Advanced Setting">
@@ -304,7 +305,7 @@
<!ENTITY sm.restore.merge "Join multiple windows into one">
<!ENTITY sm.restore.bypassCache "Bypass cache when restoring">
<!ENTITY sm.notrestore.label "When not restoring on start">
-<!ENTITY sm.restorePinned.label "Restore my pinned tabs from last time">
+<!ENTITY sm.restorePinned1.label "Restore your pinned tabs from last time">
<!ENTITY sm.preserve.options "Preserve Tabs:">
<!ENTITY sm.preserve.history "History">
<!ENTITY sm.preserve.protect "Protect Status">
diff --git a/chrome/locale/en-US/tabmix.dtd b/chrome/locale/en-US/tabmix.dtd
index f1b3794..8cb553d 100644
--- a/chrome/locale/en-US/tabmix.dtd
+++ b/chrome/locale/en-US/tabmix.dtd
@@ -125,7 +125,7 @@
<!ENTITY hideTabBar.label "Hide the tab bar">
<!ENTITY hideTabBar.never.label "Never">
<!ENTITY hideTabBar.never.key "N">
-<!ENTITY hideTabBar.onOneTab.label "When I have only one tab">
+<!ENTITY hideTabBar.oneTab.label "When you have only one tab">
<!ENTITY hideTabBar.onOneTab.key "E">
<!ENTITY hideTabBar.always.label "Always">
<!ENTITY hideTabBar.always.key "A">
diff --git a/chrome/locale/en-US/tabmix.properties b/chrome/locale/en-US/tabmix.properties
index 21cea2d..4b07c0d 100644
--- a/chrome/locale/en-US/tabmix.properties
+++ b/chrome/locale/en-US/tabmix.properties
@@ -1,7 +1,7 @@
extensions.{dc572301-7619-498c-a57d-39143191b318}.description= Tab browsing with an added boost.
tmp.merge.warning.title= Closing window with non-merged tabs
tmp.merge.warning.message= The selected tabs will be merged with another window, but the other tabs will now be closed with the current window.
-tmp.merge.warning.checkboxLabel= Always warn me when closing a window with tabs that aren\'t merging.
+tmp.merge.warning.checkbox= Always warn you when closing a window with tabs that aren\'t merging.
tmp.merge.error= At least 2 windows have to be opened before you can merge them
tmp.merge.private= You can not merge private window with non-private window.
tmp.importPref.error1= Can not import because it is not a valid file.
@@ -22,8 +22,8 @@ undoClosedWindows.clear.accesskey= C
protectedtabs.closeWarning.1=You are about to close %S protected tab. Are you sure you want to continue?
protectedtabs.closeWarning.2=You are about to close %S protected tabs. Are you sure you want to continue?
protectedtabs.closeWarning.3=You are about to close %S tabs, %S of them protected. Are you sure you want to continue?
-protectedtabs.closeWarning.4=Warn me when I attempt to close window with protected tabs
-window.closeWarning.1=Warn me when I attempt to close window with multiple tabs
+protectedtabs.closeWarning.5=Warn you when closing window with protected tabs
+window.closeWarning.2=Warn you when closing window with multiple tabs
closeWindow.label=Close window
confirm_autoreloadPostData_title=Warning!
confirm_autoreloadPostData=The page on which you tried to enable Auto Reload contains POSTDATA.\nIf you enable Auto Reload, any action the form carries out (such as an online purchase) will be repeated.\n\nAre you sure that you want to enable Auto Reload?
diff --git a/modules/MergeWindows.jsm b/modules/MergeWindows.jsm
index 0c9b30d..e693991 100644
--- a/modules/MergeWindows.jsm
+++ b/modules/MergeWindows.jsm
@@ -319,7 +319,7 @@ this.MergeWindows = {
canClose = Services.prompt.confirmCheck(aWindow,
TabmixSvc.getString('tmp.merge.warning.title'),
TabmixSvc.getString('tmp.merge.warning.message'),
- TabmixSvc.getString('tmp.merge.warning.checkboxLabel'),
+ TabmixSvc.getString('tmp.merge.warning.checkbox'),
promptAgain);
if (canClose && !promptAgain.value)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git
More information about the Pkg-mozext-commits
mailing list