Prefix transient.
_s: Update pot file.

Last update was a good three months ago and we had some string changes
since then.

Fixes #434.
_s: Resolve merge conflicts from master branch.

This also retains `$all_the_cool_cats` for some flavor. It has been
around since the initial fork of Toolbox and makes people smile:
https://twitter.com/TheFrosty/status/449581069231071232
Merge branch 'pr/437'

Conflicts:
	inc/template-tags.php
_s: Update function return values.

Adds missing documentation for `_s_categorized_blog()` and removes void
statements, in accordance with WordPress documentation guidelines.

See
http://make.wordpress.org/core/handbook/inline-documentation-standards/p
hp-documentation-standards/#phpdoc-tags
Merge remote-tracking branch 'upstream/master' into ja

* upstream/master:
  _s: Update function return values.
  _s: Resolve merge conflicts from master branch.
  _s: Update pot file.
  Prefix transient.
Merge remote-tracking branch 'upstream/ja'

* upstream/ja:
  _s: Update function return values.
  _s: Resolve merge conflicts from master branch.
  _s: Update pot file.
  Prefix transient.