fix string formatting
complete basque translation
Merge remote-tracking branch 'upstream/master'