Fix bug 719197 - Rename "Reload Remote Calendar" to "Synchronize Calendars". r=paenglab
authorPhilipp Kewisch <mozilla@kewis.ch>
Wed, 18 Jan 2012 23:18:08 +0100
changeset 10453 120cf812400a344b3f5bedfd78f432d1d00bb4d8
parent 10452 7617b704d5638be3888a7b85fd2d0dc3f3270072
child 10454 4b50e227e649e5323341ac98822afc3217da62f3
push idunknown
push userunknown
push dateunknown
reviewerspaenglab
bugs719197
Fix bug 719197 - Rename "Reload Remote Calendar" to "Synchronize Calendars". r=paenglab
calendar/base/content/calendar-calendars-list.xul
calendar/locales/en-US/chrome/calendar/calendar.dtd
calendar/locales/en-US/chrome/sunbird/menuOverlay.dtd
calendar/locales/filter.py
calendar/sunbird/base/content/calendar-menubar.inc
calendar/sunbird/base/content/calendar-sets.inc
--- a/calendar/base/content/calendar-calendars-list.xul
+++ b/calendar/base/content/calendar-calendars-list.xul
@@ -65,18 +65,18 @@
                 accesskey="&calendar.context.export.accesskey;"
                 oncommand="exportEntireCalendar(document.getElementById('list-calendars-context-menu').contextCalendar);"/>
       <menuitem id="list-calendars-context-publish"
                 label="&calendar.context.publish.label;"
                 accesskey="&calendar.context.publish.accesskey;"
                 observes="calendar_publish_selected_calendar_command"/>
       <menuseparator id="list-calendars-context-export-menuseparator"/>
       <menuitem id="list-calendars-context-reload"
-                label="&calendar.context.reloadserver.label;"
-                accesskey="&calendar.context.reloadserver.accesskey;"
+                label="&calendar.context.synccalendars.label;"
+                accesskey="&calendar.context.synccalendars.accesskey;"
                 observes="calendar_reload_remote_calendars"/>
       <menuseparator id="list-calendars-context-reload-menuseparator"/>
       <menuitem id="list-calendars-context-edit"
                 label="&calendar.context.properties.label;"
                 accesskey="&calendar.context.properties.accesskey;"
                 observes="calendar_edit_calendar_command"/>
     </menupopup>
     <tooltip id="calendar-list-tooltip"
--- a/calendar/locales/en-US/chrome/calendar/calendar.dtd
+++ b/calendar/locales/en-US/chrome/calendar/calendar.dtd
@@ -260,18 +260,18 @@
 
 <!-- Server Context Menu -->
 <!ENTITY calendar.context.newserver.label              "New Calendar…">
 <!ENTITY calendar.context.newserver.accesskey          "N">
 <!ENTITY calendar.context.findcalendar.label           "Find Calendar…" >
 <!ENTITY calendar.context.findcalendar.accesskey       "F" >
 <!ENTITY calendar.context.deleteserver.label           "Delete Calendar">
 <!ENTITY calendar.context.deleteserver.accesskey       "D">
-<!ENTITY calendar.context.reloadserver.label           "Reload Remote Calendars">
-<!ENTITY calendar.context.reloadserver.accesskey       "R">
+<!ENTITY calendar.context.synccalendars.label          "Synchronize Calendars">
+<!ENTITY calendar.context.synccalendars.accesskey      "S">
 <!ENTITY calendar.context.publish.label                "Publish Calendar…">
 <!ENTITY calendar.context.publish.accesskey            "b">
 <!ENTITY calendar.context.export.label                 "Export Calendar…">
 <!ENTITY calendar.context.export.accesskey             "E">
 <!ENTITY calendar.context.properties.label             "Properties">
 <!ENTITY calendar.context.properties.accesskey         "P">
 
 <!ENTITY calendar.context.convertmenu.label              "Convert To">
--- a/calendar/locales/en-US/chrome/sunbird/menuOverlay.dtd
+++ b/calendar/locales/en-US/chrome/sunbird/menuOverlay.dtd
@@ -57,19 +57,19 @@
 <!ENTITY event.delete.tasks.accesskey                      "T">
 
 <!ENTITY calendar.pagesetup.label                          "Page Setup…">
 <!ENTITY calendar.pagesetup.accesskey                      "u">
 
 <!ENTITY calendar.subscribe.label                          "Subscribe to Remote Calendar…">
 <!ENTITY calendar.subscribe.accesskey                      "R">
 
-<!ENTITY calendar.reloadserver.label                       "Reload Remote Calendars">
-<!ENTITY calendar.reloadserver.key                         "R">
-<!ENTITY calendar.reloadserver.accesskey                   "R">
+<!ENTITY calendar.synccalendars.label                      "Synchronize Calendars">
+<!ENTITY calendar.synccalendars.key                        "R">
+<!ENTITY calendar.synccalendars.accesskey                  "S">
 
 <!ENTITY calendar.publish.calendar.label                   "Publish Calendar…">
 <!ENTITY calendar.publish.calendar.accesskey               "b">
 <!ENTITY calendar.publish.selection.label                  "Publish Selection…">
 <!ENTITY calendar.publish.selection.accesskey              "c">
 
 <!ENTITY calendar.quit.label                               "Quit">
 <!ENTITY calendar.quit.accesskey                           "Q">
--- a/calendar/locales/filter.py
+++ b/calendar/locales/filter.py
@@ -10,10 +10,14 @@ def test(mod, path, entity = None):
   # Timezone properties don't have to be translated
   if path == "chrome/calendar/timezones.properties":
     return "report"
 
   # Noun class entries do not have to be translated
   if path == "chrome/calendar/calendar-event-dialog.properties":
     return not re.match(r".*Nounclass[1-9]", entity)
 
+  # Sunbird specific strings don't need translation
+  if path.startswith("chrome/sunbird/"):
+    return False
+
   # Everything else should be taken into account
   return True
--- a/calendar/sunbird/base/content/calendar-menubar.inc
+++ b/calendar/sunbird/base/content/calendar-menubar.inc
@@ -99,20 +99,20 @@
                      accesskey="&calendar.publish.selection.accesskey;"
                      observes="calendar_publish_selected_events_command"/>
            <menuitem id="calendar-publish-calendar-menu"
                      label="&calendar.publish.calendar.label;"
                      accesskey="&calendar.publish.calendar.accesskey;"
                      observes="calendar_publish_calendar_command"/>
            <menuseparator id="calendar-publish-sep"/>
 
-           <menuitem id="calendar-reloadserver-menu"
+           <menuitem id="calendar-synccalendars-menu"
                      key="reload_server_key"
-                     label="&calendar.reloadserver.label;"
-                     accesskey="&calendar.reloadserver.accesskey;"
+                     label="&calendar.synccalendars.label;"
+                     accesskey="&calendar.synccalendars.accesskey;"
                      observes="calendar_reload_remote_calendars"/>
            <menuseparator id="calendar-reload-sep"/>
 
            <menuitem id="calendar-page-setup-menu"
                      label="&calendar.pagesetup.label;"
                      accesskey="&calendar.pagesetup.accesskey;"
                      observes="cmd_pageSetup"/>
            <menuitem id="calendar-print-menu"
--- a/calendar/sunbird/base/content/calendar-sets.inc
+++ b/calendar/sunbird/base/content/calendar-sets.inc
@@ -101,17 +101,17 @@
   <key id="key_cut"              key="&calendar.cut.key;"                observes="cmd_cut"                     modifiers="accel"/>
   <key id="key_copy"             key="&calendar.copy.key;"               observes="cmd_copy"                    modifiers="accel"/>
   <key id="key_paste"            key="&calendar.paste.key;"              observes="cmd_paste"                   modifiers="accel"/>
   <key id="key_selectAll"        key="&calendar.selectall.key;"          observes="cmd_selectAll"               modifiers="accel"/>
 
   <key id="go_to_date_key"       keycode="VK_UP"                         observes="go_date_command"             modifiers="accel"/>
 
   <key id="import_key"           key="&calendar.import.key;"             observes="calendar_import_command"              modifiers="accel"/>
-  <key id="reload_server_key"    key="&calendar.reloadserver.key;"       observes="calendar_reload_remote_calendars"     modifiers="accel"/>
+  <key id="reload_server_key"    key="&calendar.synccalendars.key;"      observes="calendar_reload_remote_calendars"     modifiers="accel"/>
 
 # TODO L10N These keys need localization
   <key id="key_fullZoomReduce"   key="-"                                 observes="cmd_fullZoomReduce"          modifiers="accel"/>
   <key id="key_fullZoomEnlarge"  key="+"                                 observes="cmd_fullZoomEnlarge"         modifiers="accel"/>
   <key id="key_fullZoomEnlarge2" key="="                                 observes="cmd_fullZoomEnlarge"         modifiers="accel"/>
   <key id="key_fullZoomReset"    key="0"                                 observes="cmd_fullZoomReset"           modifiers="accel"/>
 
   <key id="find_key"