gpg, mplayer: Restore correct options.

This fixes a regression in commit 8f42adfa8d.

completions/gpg

@@ -10,7 +10,7 @@ _gpg()
             _filedir
             return 0
             ;;
-        --export|--sign-key|--lsignkey|--nrsignkey|--nrlsignkey|--editkey)
+        --export|--sign-key|--lsign-key|--nrsign-key|--nrlsign-key|--edit-key)
             # return list of public keys
             COMPREPLY=( $( compgen -W "$( gpg --list-keys 2>/dev/null | \
                 sed -ne 's@^pub.*/\([^ ]*\).*$@\1@p' \

completions/mplayer

@@ -116,10 +116,10 @@ _mplayer()
         -audio-density|-audio-delay|-audio-preload|-endpos|-osdlevel| \
         -ffourcc|-sws|-channels|-skiplimit|-format|-ofps|-aadriver| \
         -aaosdcolor|-aasubcolor|-vobsubout|-vobsuboutid|-vobsuboutindex| \
-        -sub-bg-alpha|-sub-bg-color|-sub-cp|-sub-delay|-sub-fps|-sub-pos| \
-        -sub-align|-sub-width|-subfont-blur|-subfont-outline| \
+        -sub-bg-alpha|-sub-bg-color|-subcp|-subdelay|-subfps|-subpos| \
+        -subalign|-subwidth|-subfont-blur|-subfont-outline| \
         -subfont-autoscale|-subfont-encoding|-subfont-osd-scale| \
-        -subfont-osd-text)
+        -subfont-text-scale)
             return 0
             ;;
         -monitoraspect)