Bringing the strings file from 2.6 develop to master, as a temp fix so GlotPress will update the strings for translation.
Revert "Bringing the strings file from 2.6 develop to master, as a temp fix so GlotPress will update the strings for translation."

This reverts commit 905c4cf549e82912a7f656015f81687dbad4894b.
Merge branch 'develop' into master.
test trying to reproduce #900
Fix #904 - handle empty tag names returned by API
fix #900: use HtmlUtis.fromHtml instead of Html.fromHtml to support <li> tags
Added hasActivity() check before requesting more notifications, just to be safe.
Merge tag '2.6.1'
Merge branch 'issue/927-illegal-state-notifications'
Fix #930 - ClassCastException in WPAlertDialogFragment
Fix #247 - status icon should show error
Merge pull request #915 from wordpress-mobile/issue/900-notif-line-breaks

fix #900: use HtmlUtils.fromHtml instead of Html.fromHtml for BigBadgeNotes
Removed WordPress.currentComment
fix #938: check hasActivity in onPostExecute to avoid a npe
move hasActivity()
Merge pull request #940 from wordpress-mobile/issue/938-npe-while-uploading-from-photos-app

fix #938: check hasActivity in onPostExecute to avoid a npe
- Do not get the video mimeType from MimeTypeMap if it was already set in the cursor.
- When both cursor and MimeTypeMap fail to retrieve the mimeType, try to guess it by using URLConnection.
- When all of the previous method fail, set an empty mimeType.
Moved the code that retrieves the mimeType of a Media File to a utility method.

We can't live without mimeType.
Just renamed a variable
fix #943: add default dimens for theme dialog in case Utils.isXLarge() returns true even if the device width is < 720dp