diff options
| author | rnveach <rveach02@gmail.com> | 2017-09-20 22:20:31 -0400 |
|---|---|---|
| committer | Roman Ivanov <romani@users.noreply.github.com> | 2017-09-21 06:21:02 -0700 |
| commit | ea43523a431bb4294dc2459c2f72241a9b2472b1 (patch) | |
| tree | 877a603302274400037eafdcae3d8d6ce523597d /src/test/resources/com/puppycrawl/tools/checkstyle/checks | |
| parent | b5acade79832bea8195cb55247497a704e7aa5e8 (diff) | |
| download | checkstyle-ea43523a431bb4294dc2459c2f72241a9b2472b1.tar.gz | |
minor: fix conflicts between last 2 commits with translation inputs
Diffstat (limited to 'src/test/resources/com/puppycrawl/tools/checkstyle/checks')
| -rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/InputTranslationCheckFireErrors.properties (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/InputTranslationCheckFireErrors.properties) | 0 | ||||
| -rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/InputTranslationCheckFireErrors_de.properties (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/InputTranslationCheckFireErrors_de.properties) | 0 | ||||
| -rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/InputTranslation_de.txt (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/InputTranslation_de.txt) | 0 | ||||
| -rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/OutputTranslationCheckLinux.xml (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/OutputTranslationCheckMacOS.xml) | 0 | ||||
| -rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/OutputTranslationCheckMacOS.xml (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/OutputTranslationCheckLinux.xml) | 0 | ||||
| -rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/OutputTranslationCheckWindows.xml (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/OutputTranslationCheckWindows.xml) | 4 |
6 files changed, 2 insertions, 2 deletions
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/InputTranslationCheckFireErrors.properties b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/InputTranslationCheckFireErrors.properties index 074b0afab..074b0afab 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/InputTranslationCheckFireErrors.properties +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/InputTranslationCheckFireErrors.properties diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/InputTranslationCheckFireErrors_de.properties b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/InputTranslationCheckFireErrors_de.properties index 9bc87ab8d..9bc87ab8d 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/InputTranslationCheckFireErrors_de.properties +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/InputTranslationCheckFireErrors_de.properties diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/InputTranslation_de.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/InputTranslation_de.txt index 9a7ae0711..9a7ae0711 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/InputTranslation_de.txt +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/InputTranslation_de.txt diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/OutputTranslationCheckMacOS.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/OutputTranslationCheckLinux.xml index 34a16cbbe..34a16cbbe 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/OutputTranslationCheckMacOS.xml +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/OutputTranslationCheckLinux.xml diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/OutputTranslationCheckLinux.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/OutputTranslationCheckMacOS.xml index 865791fde..865791fde 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/OutputTranslationCheckLinux.xml +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/OutputTranslationCheckMacOS.xml diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/OutputTranslationCheckWindows.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/OutputTranslationCheckWindows.xml index 81ba62c34..443bba39b 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/misc/translation/OutputTranslationCheckWindows.xml +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/translation/OutputTranslationCheckWindows.xml @@ -7,9 +7,9 @@ <file name="path_to_file"> <error line="0" severity="error" message="%s" source="com.puppycrawl.tools.checkstyle.checks.TranslationCheck"/> </file> +<file name="path_to_file\InputTranslationCheckFireErrors.properties"> +</file> <file name="path_to_file\InputTranslationCheckFireErrors_de.properties"> <error line="0" severity="error" message="%s" source="com.puppycrawl.tools.checkstyle.checks.TranslationCheck"/> </file> -<file name="path_to_file\InputTranslationCheckFireErrors.properties"> -</file> </checkstyle> |