diff --git a/po/pocheck.pl b/po/pocheck.pl
index df25fdad3b..9dd416026a 100755
--- a/po/pocheck.pl
+++ b/po/pocheck.pl
@@ -49,10 +49,10 @@ delete $options{i} if $silent_mode;
 
 my $check_args = (!%options or defined($options{a}));
 my $check_colons = (!%options or defined($options{c}));
-my $check_spaces = (!%options or defined($options{m}));
+my $check_spaces = (!%options or defined($options{s}));
 my $check_periods = (!%options or defined($options{p}));
 my $check_qt = (!%options or defined($options{q}));
-my $check_menu = (!%options or defined($options{s}));
+my $check_menu = (!%options or defined($options{m}));
 my $check_trans = (!%options or defined($options{t}));
 
 my %trans;
@@ -108,6 +108,9 @@ foreach my $pofilename ( @ARGV ) {
     # (surely that is always $msgstr?)
     next if ($msgid eq "" or $msgstr eq "");
 
+    # discard [[...]] from the end of msgid, this is used only as hint to translation
+    $msgid =~ s/\[\[.*\]\]$//;
+
     # Check for matching %1$s, etc.
       if ($check_args) {
       my @argstrs = ( $msgid =~ m/%(\d)\$s/g );