diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-08-29 11:20:17 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-29 11:20:17 -0700 |
| commit | c7424881bfc0a9c69c615656f0d0dff2e19c3385 (patch) | |
| tree | 16d23537952dc5ea75583108993bfd291396b2df | |
| parent | 007f2b50ed8f814ce3cd610bd46e67eb3c4aeac0 (diff) | |
| parent | ec9484e931d521ccb97da090a0a91986a6b9a5eb (diff) | |
| download | sdk-c7424881bfc0a9c69c615656f0d0dff2e19c3385.zip sdk-c7424881bfc0a9c69c615656f0d0dff2e19c3385.tar.gz sdk-c7424881bfc0a9c69c615656f0d0dff2e19c3385.tar.bz2 | |
Merge "Minor tweaks and typos"
3 files changed, 3 insertions, 3 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManager.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManager.java index 60120ee..e4da6e8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManager.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManager.java @@ -758,7 +758,7 @@ public class LocaleManager { // "pa": Panjabi, -> Pakistan, India sLanguageToCountry.put("pa", "PK"); //$NON-NLS-1$ //$NON-NLS-2$ - sLanguageNames.put("pa", "Panjabi,"); //$NON-NLS-1$ + sLanguageNames.put("pa", "Panjabi"); //$NON-NLS-1$ // "pl": Polish -> Poland sLanguageToCountry.put("pl", "PL"); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintFix.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintFix.java index 1ab02c3..c02c303 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintFix.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintFix.java @@ -106,7 +106,7 @@ abstract class LintFix implements ICompletionProposal { public String getAdditionalProposalInfo() { Issue issue = EclipseLintClient.getRegistry().getIssue(mId); if (issue != null) { - return issue.getExplanation().replace("\n", "<br>"); //$NON-NLS-1$ //$NON-NLS-2$ + return issue.getExplanationAsHtml(); } return null; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java index c796d26..a501e05 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java @@ -74,7 +74,7 @@ public class TranslationDetector extends ResourceXmlDetector { "If an application has more than one locale, then all the strings declared in " + "one language should also be translated in all other languages.\n" + "\n" + - "If the string should *not* be translated, you can add the attribute\n" + + "If the string should *not* be translated, you can add the attribute " + "`translatable=\"false\"` on the `<string>` element, or you can define all " + "your non-translatable strings in a resource file called `donottranslate.xml`. " + "Or, you can ignore the issue with a `tools:ignore=\"MissingTranslation\"` " + |