Revert "Revert "Show superdir in parentheses after language to distinguish possible duplicate name-language combos""

This reverts commit b063b5d8417d0c1e861172d7495502ba111772d8.