From a4523a89acca821c797c7995ac1653669bbb0fd2 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Fri, 21 Aug 2020 09:56:48 -0500 Subject: [PATCH] [ApiXmlAdjuster, Bytecode] Make error/warning strings localizable. --- .../Resources.Designer.cs | 189 ++++++++++++++++++ src/Java.Interop.Localization/Resources.resx | 113 +++++++++++ .../xlf/Resources.cs.xlf | 134 +++++++++++++ .../xlf/Resources.de.xlf | 134 +++++++++++++ .../xlf/Resources.es.xlf | 134 +++++++++++++ .../xlf/Resources.fr.xlf | 134 +++++++++++++ .../xlf/Resources.it.xlf | 134 +++++++++++++ .../xlf/Resources.ja.xlf | 134 +++++++++++++ .../xlf/Resources.ko.xlf | 134 +++++++++++++ .../xlf/Resources.pl.xlf | 134 +++++++++++++ .../xlf/Resources.pt-BR.xlf | 134 +++++++++++++ .../xlf/Resources.ru.xlf | 134 +++++++++++++ .../xlf/Resources.tr.xlf | 134 +++++++++++++ .../xlf/Resources.zh-Hans.xlf | 134 +++++++++++++ .../xlf/Resources.zh-Hant.xlf | 134 +++++++++++++ .../JavaApiDefectFinderExtensions.cs | 5 +- ...vaApiGenericInheritanceMapperExtensions.cs | 5 +- .../JavaApiTypeResolverExtensions.cs | 10 +- .../JavaTypeReference.cs | 6 +- .../JavaTypeResolutionUtil.cs | 2 +- ...amarin.Android.Tools.ApiXmlAdjuster.csproj | 4 + .../XmlUtil.cs | 10 +- .../ClassPath.cs | 3 +- .../JavaDocumentScraper.cs | 10 +- .../Kotlin/KotlinFixups.cs | 2 +- src/Xamarin.Android.Tools.Bytecode/Log.cs | 4 +- src/Xamarin.Android.Tools.Bytecode/Methods.cs | 3 +- .../Xamarin.Android.Tools.Bytecode.csproj | 4 + 28 files changed, 2080 insertions(+), 32 deletions(-) diff --git a/src/Java.Interop.Localization/Resources.Designer.cs b/src/Java.Interop.Localization/Resources.Designer.cs index 2dbe12d3f..bbc9a029e 100644 --- a/src/Java.Interop.Localization/Resources.Designer.cs +++ b/src/Java.Interop.Localization/Resources.Designer.cs @@ -60,6 +60,195 @@ internal Resources() { } } + /// + /// Looks up a localized string similar to Warning: method '{0}' in type '{1}' has unnamed parameters.. + /// + public static string ApiXmlAdjuster_0001 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0001", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not.. + /// + public static string ApiXmlAdjuster_0002 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0002", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error while processing Java class '{0}': {1}.. + /// + public static string ApiXmlAdjuster_0003 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0003", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error while processing Java interface '{0}': {1}.. + /// + public static string ApiXmlAdjuster_0004 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0004", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error while resolving '{0}' in '{1}': {2}.. + /// + public static string ApiXmlAdjuster_0005 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0005", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Warning: failed to resolve generic constraint: '{0}': {1}.. + /// + public static string ApiXmlAdjuster_0006 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0006", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition.. + /// + public static string ApiXmlAdjuster_0007 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0007", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Type '{0}' was not found.. + /// + public static string ApiXmlAdjuster_0008 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0008", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Internal error: XmlReader should be positioned on attribute, but it is on '{0}'.. + /// + public static string ApiXmlAdjuster_0009 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0009", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0}: Element '{1}' requires attribute '{2}'.. + /// + public static string ApiXmlAdjuster_0010 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0010", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead.. + /// + public static string ApiXmlAdjuster_0011 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0011", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'.. + /// + public static string ApiXmlAdjuster_0012 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0012", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'.. + /// + public static string ApiXmlAdjuster_0013 { + get { + return ResourceManager.GetString("ApiXmlAdjuster_0013", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Could not load .jar entry '{0}': {1}.. + /// + public static string Bytecode_0001 { + get { + return ResourceManager.GetString("Bytecode_0001", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Documentation file not found: '{0}'.. + /// + public static string Bytecode_0002 { + get { + return ResourceManager.GetString("Bytecode_0002", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s).. + /// + public static string Bytecode_0003 { + get { + return ResourceManager.GetString("Bytecode_0003", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No parameter match for '{0}.{1}'. (expression: '{2}'). + /// + public static string Bytecode_0004 { + get { + return ResourceManager.GetString("Bytecode_0004", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to parse Kotlin metadata on '{0}': {1}.. + /// + public static string Bytecode_0005 { + get { + return ResourceManager.GetString("Bytecode_0005", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Differing number of 'throws' declarations on '{0}{1}'.. + /// + public static string Bytecode_0006 { + get { + return ResourceManager.GetString("Bytecode_0006", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to get parameter names for '{0}.{1}': {2}.. + /// + public static string Bytecode_0007 { + get { + return ResourceManager.GetString("Bytecode_0007", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to parse annotation XML file: {0}.. + /// + public static string Bytecode_0008 { + get { + return ResourceManager.GetString("Bytecode_0008", resourceCulture); + } + } + /// /// Looks up a localized string similar to Failed to remove old constants: {0}.. /// diff --git a/src/Java.Interop.Localization/Resources.resx b/src/Java.Interop.Localization/Resources.resx index 0d32774f0..e3b75991e 100644 --- a/src/Java.Interop.Localization/Resources.resx +++ b/src/Java.Interop.Localization/Resources.resx @@ -117,6 +117,119 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. {0} - The list of constants that could not be removed. diff --git a/src/Java.Interop.Localization/xlf/Resources.cs.xlf b/src/Java.Interop.Localization/xlf/Resources.cs.xlf index 984185654..f967cbf18 100644 --- a/src/Java.Interop.Localization/xlf/Resources.cs.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.cs.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.de.xlf b/src/Java.Interop.Localization/xlf/Resources.de.xlf index 21038fd9c..9cab0bfce 100644 --- a/src/Java.Interop.Localization/xlf/Resources.de.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.de.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.es.xlf b/src/Java.Interop.Localization/xlf/Resources.es.xlf index 6ad566232..8f7c92be2 100644 --- a/src/Java.Interop.Localization/xlf/Resources.es.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.es.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.fr.xlf b/src/Java.Interop.Localization/xlf/Resources.fr.xlf index fbb9dbc20..6ae5ec926 100644 --- a/src/Java.Interop.Localization/xlf/Resources.fr.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.fr.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.it.xlf b/src/Java.Interop.Localization/xlf/Resources.it.xlf index a01a280e3..05ae07dce 100644 --- a/src/Java.Interop.Localization/xlf/Resources.it.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.it.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.ja.xlf b/src/Java.Interop.Localization/xlf/Resources.ja.xlf index a0ca3cdeb..d27199426 100644 --- a/src/Java.Interop.Localization/xlf/Resources.ja.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.ja.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.ko.xlf b/src/Java.Interop.Localization/xlf/Resources.ko.xlf index e014c022b..ed81df9c6 100644 --- a/src/Java.Interop.Localization/xlf/Resources.ko.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.ko.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.pl.xlf b/src/Java.Interop.Localization/xlf/Resources.pl.xlf index 8c9d626a7..8ba0b7d76 100644 --- a/src/Java.Interop.Localization/xlf/Resources.pl.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.pl.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.pt-BR.xlf b/src/Java.Interop.Localization/xlf/Resources.pt-BR.xlf index e97b8b69d..d99dfbd82 100644 --- a/src/Java.Interop.Localization/xlf/Resources.pt-BR.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.pt-BR.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.ru.xlf b/src/Java.Interop.Localization/xlf/Resources.ru.xlf index a2bc5b989..9bcc8f002 100644 --- a/src/Java.Interop.Localization/xlf/Resources.ru.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.ru.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.tr.xlf b/src/Java.Interop.Localization/xlf/Resources.tr.xlf index 57c77c0c8..77fa3b042 100644 --- a/src/Java.Interop.Localization/xlf/Resources.tr.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.tr.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.zh-Hans.xlf b/src/Java.Interop.Localization/xlf/Resources.zh-Hans.xlf index 023195655..20c73261d 100644 --- a/src/Java.Interop.Localization/xlf/Resources.zh-Hans.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.zh-Hans.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Java.Interop.Localization/xlf/Resources.zh-Hant.xlf b/src/Java.Interop.Localization/xlf/Resources.zh-Hant.xlf index 83a94133b..1bde56761 100644 --- a/src/Java.Interop.Localization/xlf/Resources.zh-Hant.xlf +++ b/src/Java.Interop.Localization/xlf/Resources.zh-Hant.xlf @@ -2,6 +2,140 @@ + + Warning: method '{0}' in type '{1}' has unnamed parameters. + Warning: method '{0}' in type '{1}' has unnamed parameters. + {0} - Java method name. +{1} - Java type name. + + + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not. + {0}, {1} - Java type names. + + + Error while processing Java class '{0}': {1}. + Error while processing Java class '{0}': {1}. + {0} - Java class name. +{1} - Exception message. + + + Error while processing Java interface '{0}': {1}. + Error while processing Java interface '{0}': {1}. + {0} - Java interface name. +{1} - Exception message. + + + Error while resolving '{0}' in '{1}': {2}. + Error while resolving '{0}' in '{1}': {2}. + {0} - Java member. +{1} - Java type. +{2} - Exception message. + + + Warning: failed to resolve generic constraint: '{0}': {1}. + Warning: failed to resolve generic constraint: '{0}': {1}. + {0} - Java constraint type. +{1} - Exception message. + + + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + For '{0}.{1}', referenced generic arguments count does not match the base type parameters definition. + {0} - Java type. +{1} - Java member. + + + Type '{0}' was not found. + Type '{0}' was not found. + {0} - Java type. + + + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + Internal error: XmlReader should be positioned on attribute, but it is on '{0}'. + {0} - XML node type. +The following are literal type names and should not be translated: XmlReader. + + + {0}: Element '{1}' requires attribute '{2}'. + {0}: Element '{1}' requires attribute '{2}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. + + + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0}: EndElement of '{1}' was expected, but is type '{2}' with name '{3}' instead. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. + + + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0}: Unexpected element or content in '{1}': node is '{2}', name is '{3}'. Allowed elements are: '{4}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML node type. +{3} - XML element name. +{4} - Allowed XML element names. + + + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0}: Element '{1}' has an unexpected attribute: '{2}'. Allowed attributes are: '{3}'. + {0} - File/line/column of error. +{1} - XML element name. +{2} - XML attribute name. +{3} - Allowed XML attribute names. + + + Could not load .jar entry '{0}': {1}. + Could not load .jar entry '{0}': {1}. + {0} - Java .jar entry. +{1} - .NET exception. + + + Documentation file not found: '{0}'. + Documentation file not found: '{0}'. + {0} - File name. + + + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + Failed to match expression '{0}', expected {1} parameter(s) but got {2} parameter(s). + {0} - Regex expression. +{1}, {2} - Integer. + + + No parameter match for '{0}.{1}'. (expression: '{2}') + No parameter match for '{0}.{1}'. (expression: '{2}') + {0} - Java type. +{1} - Java method. +{2} - Regex expression. + + + Unable to parse Kotlin metadata on '{0}': {1}. + Unable to parse Kotlin metadata on '{0}': {1}. + {0} - Java type. +{1} - Exception. + + + Differing number of 'throws' declarations on '{0}{1}'. + Differing number of 'throws' declarations on '{0}{1}'. + {0} - Java type name. +{1} - Java type descriptor. +The following are literal names and should not be translated: throws. + + + Failed to get parameter names for '{0}.{1}': {2}. + Failed to get parameter names for '{0}.{1}': {2}. + {0} - Java type. +{1} - Java method. +{2} - Exception. + + + Failed to parse annotation XML file: {0}. + Failed to parse annotation XML file: {0}. + {0} - Exception. + Failed to remove old constants: {0}. Failed to remove old constants: {0}. diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiDefectFinderExtensions.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiDefectFinderExtensions.cs index 5050d9082..c47400a6f 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiDefectFinderExtensions.cs +++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiDefectFinderExtensions.cs @@ -19,10 +19,9 @@ static void FindDefects (this JavaType type) static void FindParametersDefects (this JavaMethodBase methodBase) { - int dummy; foreach (var p in methodBase.Parameters) { - if (p.Name.StartsWith ("p", StringComparison.Ordinal) && int.TryParse (p.Name.Substring (1), out dummy)) { - Log.LogWarning ("Warning: {0} in {1} has 'unnamed' parameters", methodBase.Parent, methodBase); + if (p.Name.StartsWith ("p", StringComparison.Ordinal) && int.TryParse (p.Name.Substring (1), out var _)) { + Log.LogWarning (Java.Interop.Localization.Resources.ApiXmlAdjuster_0001, methodBase.Parent, methodBase); break; // reporting once is enough. } } diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiGenericInheritanceMapperExtensions.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiGenericInheritanceMapperExtensions.cs index 3eb4fd91a..eb6889e10 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiGenericInheritanceMapperExtensions.cs +++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiGenericInheritanceMapperExtensions.cs @@ -30,12 +30,11 @@ static void PrepareGenericInheritanceMapping (this JavaClass cls) cls.GenericInheritanceMapping = empty; else if (cls.ResolvedExtends.ReferencedType.TypeParameters == null) { // FIXME: I guess this should not happen. But this still happens. - Log.LogWarning ("Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not.", cls.ExtendsGeneric, cls.FullName); + Log.LogWarning (Java.Interop.Localization.Resources.ApiXmlAdjuster_0002, cls.ExtendsGeneric, cls.FullName); cls.GenericInheritanceMapping = empty; } else { if (cls.ResolvedExtends.ReferencedType.TypeParameters.TypeParameters.Count != cls.ResolvedExtends.TypeParameters.Count) - throw new Exception (string.Format ("On {0}.{1}, referenced generic arguments count do not match the base type parameters definition", - cls.Parent.Name, cls.Name)); + throw new Exception (string.Format (Java.Interop.Localization.Resources.ApiXmlAdjuster_0007, cls.Parent.Name, cls.Name)); var dic = empty; foreach (var kvp in cls.ResolvedExtends.ReferencedType.TypeParameters.TypeParameters.Zip ( cls.ResolvedExtends.TypeParameters, diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiTypeResolverExtensions.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiTypeResolverExtensions.cs index b1bd7d6c6..c84e501f3 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiTypeResolverExtensions.cs +++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiTypeResolverExtensions.cs @@ -45,7 +45,7 @@ public static JavaType FindNonGenericType (this JavaApi api, string name) .SelectMany (p => p.Types) .FirstOrDefault (t => t.FullName == name); if (ret == null) - throw new JavaTypeResolutionException (string.Format ("Type '{0}' was not found.", name)); + throw new JavaTypeResolutionException (string.Format (Java.Interop.Localization.Resources.ApiXmlAdjuster_0008, name)); return ret; } @@ -71,9 +71,9 @@ public static void Resolve (this JavaApi api) while (true) { bool errors = false; foreach (var t in api.Packages.SelectMany (p => p.Types).OfType ().ToArray ()) - try { t.Resolve (); } catch (JavaTypeResolutionException ex) { Log.LogError ("Error while processing type '{0}': {1}", t, ex.Message); errors = true; t.Parent.Types.Remove (t); } + try { t.Resolve (); } catch (JavaTypeResolutionException ex) { Log.LogError (Java.Interop.Localization.Resources.ApiXmlAdjuster_0003, t, ex.Message); errors = true; t.Parent.Types.Remove (t); } foreach (var t in api.Packages.SelectMany (p => p.Types).OfType ().ToArray ()) - try { t.Resolve (); } catch (JavaTypeResolutionException ex) { Log.LogError ("Error while processing type '{0}': {1}", t, ex.Message); errors = true; t.Parent.Types.Remove (t); } + try { t.Resolve (); } catch (JavaTypeResolutionException ex) { Log.LogError (Java.Interop.Localization.Resources.ApiXmlAdjuster_0004, t, ex.Message); errors = true; t.Parent.Types.Remove (t); } if (!errors) break; } @@ -106,7 +106,7 @@ static void ResolveWithTryCatch (Action resolve, JavaMember m) try { resolve (); } catch (JavaTypeResolutionException ex) { - Log.LogError ("Error while processing '{0}' in '{1}': {2}", m, m.Parent, ex.Message); + Log.LogError (Java.Interop.Localization.Resources.ApiXmlAdjuster_0005, m, m.Parent, ex.Message); m.Parent.Members.Remove (m); } } @@ -145,7 +145,7 @@ static void Resolve (this JavaTypeParameters tp, JavaApi api, params JavaTypePar foreach (var t in tp.TypeParameters) if (t.GenericConstraints != null) foreach (var g in t.GenericConstraints.GenericConstraints) - try { g.ResolvedType = api.Parse (g.Type, additionalTypeParameters); } catch (JavaTypeResolutionException ex) { Log.LogWarning ("Warning: failed to resolve generic constraint: '{0}': {1}", g.Type, ex.Message); } + try { g.ResolvedType = api.Parse (g.Type, additionalTypeParameters); } catch (JavaTypeResolutionException ex) { Log.LogWarning (Java.Interop.Localization.Resources.ApiXmlAdjuster_0006, g.Type, ex.Message); } } } } diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaTypeReference.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaTypeReference.cs index 877b7d58b..f4d3c0f0c 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaTypeReference.cs +++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaTypeReference.cs @@ -76,7 +76,7 @@ public JavaTypeReference (string constraintLabel, IEnumerable public JavaTypeReference (JavaTypeReference referencedType, string arrayPart, string wildcardBoundsType, IEnumerable wildcardConstraints) { if (referencedType == null) - throw new ArgumentNullException ("referencedType"); + throw new ArgumentNullException (nameof (referencedType)); SpecialName = referencedType.SpecialName; WildcardBoundsType = wildcardBoundsType; WildcardConstraints = wildcardConstraints?.ToList (); @@ -89,7 +89,7 @@ public JavaTypeReference (JavaTypeReference referencedType, string arrayPart, st public JavaTypeReference (JavaTypeParameter referencedTypeParameter, string arrayPart) { if (referencedTypeParameter == null) - throw new ArgumentNullException ("referencedTypeParameter"); + throw new ArgumentNullException (nameof (referencedTypeParameter)); ReferencedTypeParameter = referencedTypeParameter; ArrayPart = arrayPart; } @@ -97,7 +97,7 @@ public JavaTypeReference (JavaTypeParameter referencedTypeParameter, string arra public JavaTypeReference (JavaType referencedType, IList typeParameters, string arrayPart) { if (referencedType == null) - throw new ArgumentNullException ("referencedType"); + throw new ArgumentNullException (nameof (referencedType)); ReferencedType = referencedType; TypeParameters = typeParameters; ArrayPart = arrayPart; diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaTypeResolutionUtil.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaTypeResolutionUtil.cs index c441b4089..815cc9d23 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaTypeResolutionUtil.cs +++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaTypeResolutionUtil.cs @@ -21,7 +21,7 @@ static V Get (this IDictionary dic, K key) public static bool IsImplementing (this JavaMethod derived, JavaMethod basis, IDictionary genericInstantiation) { if (genericInstantiation == null) - throw new ArgumentNullException ("genericInstantiation"); + throw new ArgumentNullException (nameof (genericInstantiation)); if (basis.Name != derived.Name) return false; diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj b/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj index 92ac86522..6634db936 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj +++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj @@ -8,4 +8,8 @@ $(TestOutputFullPath) + + + + diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/XmlUtil.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/XmlUtil.cs index 7a5f1dff7..4aab0a1cd 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/XmlUtil.cs +++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/XmlUtil.cs @@ -16,15 +16,15 @@ static string GetLocation (XmlReader reader) public static Exception UnexpectedElementOrContent (string elementName, XmlReader reader, params string [] expected) { - return new Exception (string.Format ("{0}: Unexpected element or content in '{1}': node is {2}, name is '{3}'. Expected elements are: {4}", + return new Exception (string.Format (Java.Interop.Localization.Resources.ApiXmlAdjuster_0012, GetLocation (reader), elementName ?? "(top level)", reader.NodeType, reader.LocalName, string.Join (", ", expected))); } public static Exception UnexpectedAttribute (XmlReader reader, string elementName, params string [] expected) { if (reader.NodeType != XmlNodeType.Attribute) - throw new ArgumentException (string.Format ("Internal error: XmlReader should be positioned on attribute, but it is on {0}", reader.NodeType)); - return new Exception (string.Format ("{0}: Element '{1}' has an unexpected attribute: '{2}'. Expected attributes are: {3}", + throw new ArgumentException (string.Format (Java.Interop.Localization.Resources.ApiXmlAdjuster_0009, reader.NodeType)); + return new Exception (string.Format (Java.Interop.Localization.Resources.ApiXmlAdjuster_0013, GetLocation (reader), elementName, reader.LocalName, string.Join (", ", expected))); } @@ -32,14 +32,14 @@ internal static string GetRequiredAttribute (XmlReader reader, string name) { var value = reader.GetAttribute (name); if (value == null) - throw new Exception (string.Format ("{0}: Element '{1}' requires attribute '{2}'", GetLocation (reader), reader.LocalName, name)); + throw new Exception (string.Format (Java.Interop.Localization.Resources.ApiXmlAdjuster_0010, GetLocation (reader), reader.LocalName, name)); return value; } internal static void VerifyEndElement (XmlReader reader, string elementName) { if (reader.NodeType != XmlNodeType.EndElement || reader.LocalName != elementName) - throw new Exception (string.Format ("{0}: EndElement of '{1}' was expected, but got {2} with name '{3}' instead.", + throw new Exception (string.Format (Java.Interop.Localization.Resources.ApiXmlAdjuster_0011, GetLocation (reader), elementName, reader.NodeType, reader.LocalName)); } diff --git a/src/Xamarin.Android.Tools.Bytecode/ClassPath.cs b/src/Xamarin.Android.Tools.Bytecode/ClassPath.cs index 62adb9a5d..21710ec7a 100644 --- a/src/Xamarin.Android.Tools.Bytecode/ClassPath.cs +++ b/src/Xamarin.Android.Tools.Bytecode/ClassPath.cs @@ -69,8 +69,7 @@ public void Load (Stream jarStream, bool leaveOpen = false) var c = new ClassFile (s); Add (c); } catch (Exception e) { - Log.Warning (0, "class-parse: warning: Could not load .jar entry '{0}': {1}", - entry.Name, e); + Log.Warning (0, Java.Interop.Localization.Resources.Bytecode_0001, entry.Name, e); } } } diff --git a/src/Xamarin.Android.Tools.Bytecode/JavaDocumentScraper.cs b/src/Xamarin.Android.Tools.Bytecode/JavaDocumentScraper.cs index 3adb738ef..b0a5291ad 100644 --- a/src/Xamarin.Android.Tools.Bytecode/JavaDocumentScraper.cs +++ b/src/Xamarin.Android.Tools.Bytecode/JavaDocumentScraper.cs @@ -197,7 +197,7 @@ public virtual String[] GetParameterNames (string package, string type, string m string path = package.Replace ('.', '/') + '/' + type.Replace ('$', '.') + ".html"; string file = Path.Combine (root, path); if (!File.Exists (file)) { - Log.Warning (1,"Warning: no document found : " + file); + Log.Warning (1, Java.Interop.Localization.Resources.Bytecode_0002, file); return null; } @@ -238,7 +238,7 @@ public virtual String[] GetParameterNames (string package, string type, string m var plist = matcher.Groups [1]; String[] parms = StripTagsFromParameters (plist.Value).Split (new string [] { ", " }, StringSplitOptions.RemoveEmptyEntries); if (parms.Length != ptypes.Length) { - Log.Warning (1, "failed matching {0} (expected {1} params, got {2} params)", buffer, ptypes.Length, parms.Length); + Log.Warning (1, Java.Interop.Localization.Resources.Bytecode_0003, buffer, ptypes.Length, parms.Length); return null; } String[] result = new String [ptypes.Length]; @@ -254,11 +254,11 @@ public virtual String[] GetParameterNames (string package, string type, string m prev = text; } } catch (Exception e) { - Log.Error ("ERROR in {0}.{1}: {2}", type, method, e); + Log.Error (Java.Interop.Localization.Resources.Bytecode_0007, type, method, e); return null; } - Log.Warning (1, "Warning : no match for {0}.{1} (rex: {2})", type, method, buffer); + Log.Warning (1, Java.Interop.Localization.Resources.Bytecode_0004, type, method, buffer); return null; } @@ -287,7 +287,7 @@ public static void LoadXml (String filename) } } catch (Exception ex) { - Log.Error ("Annotations parser error: " + ex); + Log.Error (Java.Interop.Localization.Resources.Bytecode_0008, ex); } } } diff --git a/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs b/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs index 95eb8c871..61065f333 100644 --- a/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs +++ b/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs @@ -57,7 +57,7 @@ public static void Fixup (IList classes) } } catch (Exception ex) { - Log.Warning (0, $"class-parse: warning: Unable to parse Kotlin metadata on '{c.ThisClass.Name}': {ex}"); + Log.Warning (0, Java.Interop.Localization.Resources.Bytecode_0005, c.ThisClass.Name, ex); } } } diff --git a/src/Xamarin.Android.Tools.Bytecode/Log.cs b/src/Xamarin.Android.Tools.Bytecode/Log.cs index 7cdf2ca86..f5d63a1b7 100644 --- a/src/Xamarin.Android.Tools.Bytecode/Log.cs +++ b/src/Xamarin.Android.Tools.Bytecode/Log.cs @@ -12,7 +12,7 @@ public static void Warning (int verbosity, string format, params object[] args) var log = OnLog; if (log == null) return; - log (TraceLevel.Warning, verbosity, format, args); + log (TraceLevel.Warning, verbosity, "class-parse: warning: " + format, args); } public static void Error (string format, params object[] args) @@ -20,7 +20,7 @@ public static void Error (string format, params object[] args) var log = OnLog; if (log == null) return; - log (TraceLevel.Error, 0, format, args); + log (TraceLevel.Error, 0, "class-parse: error: " + format, args); } public static void Message (string format, params object[] args) diff --git a/src/Xamarin.Android.Tools.Bytecode/Methods.cs b/src/Xamarin.Android.Tools.Bytecode/Methods.cs index c73335607..a8b3b2422 100644 --- a/src/Xamarin.Android.Tools.Bytecode/Methods.cs +++ b/src/Xamarin.Android.Tools.Bytecode/Methods.cs @@ -196,8 +196,7 @@ public List GetThrows () return throws; if (signature.Throws.Count > 0 && throws.Count != signature.Throws.Count) { - Log.Warning (1, "class-parse: warning: differing number of `throws` declarations on `{0}{1}`!", - Name, Descriptor); + Log.Warning (1, Java.Interop.Localization.Resources.Bytecode_0006, Name, Descriptor); } int c = Math.Min (signature.Throws.Count, throws.Count); for (int i = 0; i < c; ++i) diff --git a/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj b/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj index b0c8d5a5f..eda0504be 100644 --- a/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj +++ b/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj @@ -12,4 +12,8 @@ + + + +