webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 102 insertions, 53 deletions

diff --git a/Source/WebCore/platform/LocalizedStrings.h b/Source/WebCore/platform/LocalizedStrings.h
index faee56317..d9662dc7e 100644
--- a/Source/WebCore/platform/LocalizedStrings.h
+++ b/Source/WebCore/platform/LocalizedStrings.h
@@ -11,10 +11,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -43,18 +43,18 @@ namespace WebCore {
     String fileButtonNoFilesSelectedLabel();
     String defaultDetailsSummaryText();
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     String copyImageUnknownFileLabel();
 #endif
 
 #if ENABLE(CONTEXT_MENUS)
-    String contextMenuItemTagOpenLinkInNewWindow();
+    WEBCORE_EXPORT String contextMenuItemTagOpenLinkInNewWindow();
     String contextMenuItemTagDownloadLinkToDisk();
     String contextMenuItemTagCopyLinkToClipboard();
     String contextMenuItemTagOpenImageInNewWindow();
     String contextMenuItemTagDownloadImageToDisk();
     String contextMenuItemTagCopyImageToClipboard();
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
     String contextMenuItemTagCopyImageUrlToClipboard();
 #endif
     String contextMenuItemTagOpenFrameInNewWindow();
@@ -80,7 +80,7 @@ namespace WebCore {
     String contextMenuItemTagUnicodeInsertZWJMark();
     String contextMenuItemTagUnicodeInsertZWNJMark();
 #endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
     String contextMenuItemTagSelectAll();
 #endif
     String contextMenuItemTagNoGuessesFound();
@@ -88,43 +88,43 @@ namespace WebCore {
     String contextMenuItemTagLearnSpelling();
     String contextMenuItemTagSearchWeb();
     String contextMenuItemTagLookUpInDictionary(const String& selectedString);
-    String contextMenuItemTagOpenLink();
-    String contextMenuItemTagIgnoreGrammar();
-    String contextMenuItemTagSpellingMenu();
-    String contextMenuItemTagShowSpellingPanel(bool show);
-    String contextMenuItemTagCheckSpelling();
-    String contextMenuItemTagCheckSpellingWhileTyping();
-    String contextMenuItemTagCheckGrammarWithSpelling();
-    String contextMenuItemTagFontMenu();
-    String contextMenuItemTagBold();
-    String contextMenuItemTagItalic();
-    String contextMenuItemTagUnderline();
-    String contextMenuItemTagOutline();
-    String contextMenuItemTagWritingDirectionMenu();
+    WEBCORE_EXPORT String contextMenuItemTagOpenLink();
+    WEBCORE_EXPORT String contextMenuItemTagIgnoreGrammar();
+    WEBCORE_EXPORT String contextMenuItemTagSpellingMenu();
+    WEBCORE_EXPORT String contextMenuItemTagShowSpellingPanel(bool show);
+    WEBCORE_EXPORT String contextMenuItemTagCheckSpelling();
+    WEBCORE_EXPORT String contextMenuItemTagCheckSpellingWhileTyping();
+    WEBCORE_EXPORT String contextMenuItemTagCheckGrammarWithSpelling();
+    WEBCORE_EXPORT String contextMenuItemTagFontMenu();
+    WEBCORE_EXPORT String contextMenuItemTagBold();
+    WEBCORE_EXPORT String contextMenuItemTagItalic();
+    WEBCORE_EXPORT String contextMenuItemTagUnderline();
+    WEBCORE_EXPORT String contextMenuItemTagOutline();
+    WEBCORE_EXPORT String contextMenuItemTagWritingDirectionMenu();
     String contextMenuItemTagTextDirectionMenu();
-    String contextMenuItemTagDefaultDirection();
-    String contextMenuItemTagLeftToRight();
-    String contextMenuItemTagRightToLeft();
-#if PLATFORM(MAC)
+    WEBCORE_EXPORT String contextMenuItemTagDefaultDirection();
+    WEBCORE_EXPORT String contextMenuItemTagLeftToRight();
+    WEBCORE_EXPORT String contextMenuItemTagRightToLeft();
+#if PLATFORM(COCOA)
     String contextMenuItemTagSearchInSpotlight();
-    String contextMenuItemTagShowFonts();
-    String contextMenuItemTagStyles();
-    String contextMenuItemTagShowColors();
-    String contextMenuItemTagSpeechMenu();
-    String contextMenuItemTagStartSpeaking();
-    String contextMenuItemTagStopSpeaking();
-    String contextMenuItemTagCorrectSpellingAutomatically();
-    String contextMenuItemTagSubstitutionsMenu();
-    String contextMenuItemTagShowSubstitutions(bool show);
-    String contextMenuItemTagSmartCopyPaste();
-    String contextMenuItemTagSmartQuotes();
-    String contextMenuItemTagSmartDashes();
-    String contextMenuItemTagSmartLinks();
-    String contextMenuItemTagTextReplacement();
-    String contextMenuItemTagTransformationsMenu();
-    String contextMenuItemTagMakeUpperCase();
-    String contextMenuItemTagMakeLowerCase();
-    String contextMenuItemTagCapitalize();
+    WEBCORE_EXPORT String contextMenuItemTagShowFonts();
+    WEBCORE_EXPORT String contextMenuItemTagStyles();
+    WEBCORE_EXPORT String contextMenuItemTagShowColors();
+    WEBCORE_EXPORT String contextMenuItemTagSpeechMenu();
+    WEBCORE_EXPORT String contextMenuItemTagStartSpeaking();
+    WEBCORE_EXPORT String contextMenuItemTagStopSpeaking();
+    WEBCORE_EXPORT String contextMenuItemTagCorrectSpellingAutomatically();
+    WEBCORE_EXPORT String contextMenuItemTagSubstitutionsMenu();
+    WEBCORE_EXPORT String contextMenuItemTagShowSubstitutions(bool show);
+    WEBCORE_EXPORT String contextMenuItemTagSmartCopyPaste();
+    WEBCORE_EXPORT String contextMenuItemTagSmartQuotes();
+    WEBCORE_EXPORT String contextMenuItemTagSmartDashes();
+    WEBCORE_EXPORT String contextMenuItemTagSmartLinks();
+    WEBCORE_EXPORT String contextMenuItemTagTextReplacement();
+    WEBCORE_EXPORT String contextMenuItemTagTransformationsMenu();
+    WEBCORE_EXPORT String contextMenuItemTagMakeUpperCase();
+    WEBCORE_EXPORT String contextMenuItemTagMakeLowerCase();
+    WEBCORE_EXPORT String contextMenuItemTagCapitalize();
     String contextMenuItemTagChangeBack(const String& replacedString);
 #endif
     String contextMenuItemTagOpenVideoInNewWindow();
@@ -139,16 +139,21 @@ namespace WebCore {
     String contextMenuItemTagToggleMediaLoop();
     String contextMenuItemTagEnterVideoFullscreen();
     String contextMenuItemTagExitVideoFullscreen();
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+    String contextMenuItemTagEnterVideoEnhancedFullscreen();
+    String contextMenuItemTagExitVideoEnhancedFullscreen();
+#endif
     String contextMenuItemTagMediaPlay();
     String contextMenuItemTagMediaPause();
     String contextMenuItemTagMediaMute();
-    String contextMenuItemTagInspectElement();
+    WEBCORE_EXPORT String contextMenuItemTagInspectElement();
 #endif // ENABLE(CONTEXT_MENUS)
 
 #if !PLATFORM(IOS)
     String searchMenuNoRecentSearchesText();
     String searchMenuRecentSearchesText();
     String searchMenuClearRecentSearchesText();
+#endif
 
     String AXWebAreaText();
     String AXLinkText();
@@ -161,7 +166,21 @@ namespace WebCore {
     String AXDescriptionListDetailText();
     String AXFooterRoleDescriptionText();
     String AXFileUploadButtonText();
+    String AXOutputText();
     String AXSearchFieldCancelButtonText();
+    String AXAttachmentRoleText();
+    String AXDetailsText();
+    String AXSummaryText();
+    String AXFigureText();
+    String AXEmailFieldText();
+    String AXTelephoneFieldText();
+    String AXURLFieldText();
+    String AXDateFieldText();
+    String AXTimeFieldText();
+    String AXDateTimeFieldText();
+    String AXMonthFieldText();
+    String AXNumberFieldText();
+    String AXWeekFieldText();
     
     String AXButtonActionVerb();
     String AXRadioButtonActionVerb();
@@ -172,16 +191,25 @@ namespace WebCore {
     String AXMenuListPopupActionVerb();
     String AXLinkActionVerb();
     String AXListItemActionVerb();
-#endif
 
 #if ENABLE(INPUT_TYPE_WEEK)
     // weekFormatInLDML() returns week and year format in LDML, Unicode
     // technical standard 35, Locale Data Markup Language, e.g. "'Week' ww, yyyy"
     String weekFormatInLDML();
 #endif
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(COCOA)
     String AXARIAContentGroupText(const String& ariaType);
+    String AXHorizontalRuleDescriptionText();
+    String AXMarkText();
+#if ENABLE(METER_ELEMENT)
+    String AXMeterGaugeRegionOptimumText();
+    String AXMeterGaugeRegionSuboptimalText();
+    String AXMeterGaugeRegionLessGoodText();
 #endif
+#endif
+    
+    String AXAutoFillCredentialsLabel();
+    String AXAutoFillContactsLabel();
 
     String missingPluginText();
     String crashedPluginText();
@@ -196,12 +224,10 @@ namespace WebCore {
     String allFilesText();
 #endif
 
-#if PLATFORM(MAC)
-    String builtInPDFPluginName();
-    String pdfDocumentTypeDescription();
-    String postScriptDocumentTypeDescription();
-    String keygenMenuItem512();
-    String keygenMenuItem1024();
+#if PLATFORM(COCOA)
+    WEBCORE_EXPORT String builtInPDFPluginName();
+    WEBCORE_EXPORT String pdfDocumentTypeDescription();
+    WEBCORE_EXPORT String postScriptDocumentTypeDescription();
     String keygenMenuItem2048();
     String keygenKeychainItemName(const String& host);
 #endif
@@ -233,6 +259,7 @@ namespace WebCore {
     String validationMessageTypeMismatchForMultipleEmailText();
     String validationMessageTypeMismatchForURLText();
     String validationMessagePatternMismatchText();
+    String validationMessageTooShortText(int valueLength, int minLength);
     String validationMessageTooLongText(int valueLength, int maxLength);
     String validationMessageRangeUnderflowText(const String& minimum);
     String validationMessageRangeOverflowText(const String& maximum);
@@ -249,24 +276,46 @@ namespace WebCore {
     String textTrackOffMenuItemText();
     String textTrackAutomaticMenuItemText();
     String textTrackNoLabelText();
-#if PLATFORM(MAC) || PLATFORM(WIN)
+    String audioTrackNoLabelText();
+#if PLATFORM(COCOA) || PLATFORM(WIN)
     String textTrackCountryAndLanguageMenuItemText(const String& title, const String& country, const String& language);
     String textTrackLanguageMenuItemText(const String& title, const String& language);
     String closedCaptionTrackMenuItemText(const String&);
     String sdhTrackMenuItemText(const String&);
     String easyReaderTrackMenuItemText(const String&);
+    String forcedTrackMenuItemText(const String&);
+    String audioDescriptionTrackSuffixText(const String&);
 #endif
 #endif
 
     String snapshottedPlugInLabelTitle();
     String snapshottedPlugInLabelSubtitle();
 
-    String useBlockedPlugInContextMenuTitle();
+    WEBCORE_EXPORT String useBlockedPlugInContextMenuTitle();
+
+#if ENABLE(SUBTLE_CRYPTO)
+    String webCryptoMasterKeyKeychainLabel(const String& localizedApplicationName);
+    String webCryptoMasterKeyKeychainComment();
+#endif
+
+#if PLATFORM(MAC)
+    WEBCORE_EXPORT String insertListTypeNone();
+    WEBCORE_EXPORT String insertListTypeBulleted();
+    WEBCORE_EXPORT String insertListTypeBulletedAccessibilityTitle();
+    WEBCORE_EXPORT String insertListTypeNumbered();
+    WEBCORE_EXPORT String insertListTypeNumberedAccessibilityTitle();
+    WEBCORE_EXPORT String exitFullScreenButtonAccessibilityTitle();
+#endif
 
 #define WEB_UI_STRING(string, description) WebCore::localizedString(string)
 #define WEB_UI_STRING_KEY(string, key, description) WebCore::localizedString(key)
 
-    String localizedString(const char* key);
+    WEBCORE_EXPORT String localizedString(const char* key);
+
+#ifdef __OBJC__
+#define WEB_UI_NSSTRING(string, description) WebCore::localizedNSString(string)
+    WEBCORE_EXPORT NSString *localizedNSString(NSString *key) NS_FORMAT_ARGUMENT(1);
+#endif
 
 } // namespace WebCore