Changeset 1718:5bbbd8bb73fb for locales/en/main.po

Timestamp:

09/04/13 14:28:18 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1719:b8c48f380463, 1720:f23f530dfb4a

Parents:

1717:9df047961e9c (diff), 1710:f6287a0366e3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.5 branch into default

File:

• locales/en/main.po (modified) (9 diffs)

locales/en/main.po

@@ -211 +211 @@
 msgstr ""
 
-msgid "That blog Id is already in use."
+msgid "This blog ID is already used."
 msgstr ""
 
@@ -453 +453 @@
 
 #, php-format
-msgid "You are currently using \"%s\""
+msgid "You are currently using <strong>%s</strong>"
 msgstr ""
 
@@ -547 +547 @@
 
 msgid "Entries (all types)"
-msgstr "Entries & pages"
+msgstr "Entries"
 
 msgid "Status"
@@ -581 +581 @@
 msgstr ""
 
-msgid "No category yet."
+msgid "No category so far."
 msgstr ""
 
@@ -753 +753 @@
 msgstr ""
 
-msgid "You have one spam comments."
+msgid "You have one spam comment."
 msgstr ""
 
@@ -1712 +1712 @@
 msgstr ""
 
-msgid "Change category for entries"
-msgstr ""
-
-msgid "Change author for entries"
+msgid "Change category for this selection"
+msgstr ""
+
+msgid "Change author for this selection"
 msgstr ""
 
@@ -2074 +2074 @@
 msgstr ""
 
+msgid "Select:"
+msgstr ""
+
 msgid "no selection"
 msgstr ""
@@ -2080 +2083 @@
 msgstr ""
 
-msgid "invert selection"
+msgid "Invert selection"
 msgstr ""
 
@@ -2159 +2162 @@
 
 msgid "You have unsaved changes. Switch post format will loose these changes. Proceed anyway?"
-msgstr ""
-
-msgid "Warning: post format change will not convert existing content. You will need to apply new format by yourself. Proceed anyway?"
 msgstr ""