Merge branch 'master' into import
Translate "No restrictions found" message
Merge pull request #1146 from jpeg729/message

Translate No restrictions message
Don't mark not found when aborting new style imports
Merge pull request #1148 from jpeg729/abortmessgae

Don't mark not found when aborting new style imports