Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:

#	wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php

diff --cc wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
index 9770b1dff498a464761f93881b52ebcea281d3e4,5d463af522ec3f139619f49f4aa7459a69e779f7..0dceafb1fb8f0bfa7280240ca56b4823db129d1d
--- 1/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
--- 2/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
+++ b/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
@@@ -139,9 -139,9 +139,9 @@@ class ImportCLICommand implements ICLIC
                        FROM    wcf".WCF_N."_import_mapping";
                $statement = WCF::getDB()->prepareStatement($sql);
                $statement->execute();
 -              if ($statement->fetchColumn()) {
 +              if ($statement->fetchSingleColumn()) {
-                       CLIWCF::getReader()->println(StringUtil::stripHTML(WCF::getLanguage()->get('wcf.acp.dataImport.existingMapping.notice')));
-                       CLIWCF::getReader()->println(WCF::getLanguage()->get('wcf.acp.dataImport.existingMapping.confirmMessage') . ' [YN]');
+                       CLIWCF::getReader()->println(StringUtil::stripHTML(WCF::getLanguage()->getDynamicVariable('wcf.acp.dataImport.existingMapping.notice')));
+                       CLIWCF::getReader()->println(WCF::getLanguage()->getDynamicVariable('wcf.acp.dataImport.existingMapping.confirmMessage') . ' [YN]');
                        
                        $answer = CLIWCF::getReader()->readLine('> ');
                        if ($answer === null) exit;