Changeset 1468:3132a0aca046 for locales/en/main.po

Timestamp:

08/19/13 09:55:29 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1466:e67efe636ce1 (diff), 1467:917fc08f3a59 (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 commits into default branch (should be verified)

Files:

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

locales/en/main.po

@@ -2139 +2139 @@
 msgstr ""
 
+msgid "Are you sure you want to delete this backup?"
+msgstr ""
+
 msgid "Zip file content"
 msgstr ""
@@ -2787 +2790 @@
 msgid "The following error was encountered while trying to read the database:"
 msgstr ""
+
+msgid "(No cat)"
+msgstr "(none)"

locales/en/main.po

@@ -753 +753 @@
 msgstr ""
 
-msgid "You have one spam comments."
+msgid "You have one spam comment."
 msgstr ""
 
@@ -2157 +2157 @@
 msgstr ""
 
-msgid "Warning: post format change will not convert existing content. You will need to apply new format by yourself. Proceed anyway?"
-msgstr ""
-
 msgid "Loading enhanced uploader, please wait."
 msgstr ""