Merge of i18n password fix for smbclient.