Changeset 1529:9f6e5c3c8344 for locales/en/main.po

Timestamp:

08/23/13 10:41:38 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1530:18df991c4c1a, 1531:18a9e84c04e3, 1641:ae5dc7a055e1, 1885:d4803b6eba12

Parents:

1528:41b40915bb82 (diff), 1515:03b3235091cf (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

Files:

• locales/en/main.po (modified) (3 diffs)
• locales/en/main.po (modified) (1 diff)

locales/en/main.po

@@ -453 +453 @@
 
 #, php-format
-msgid "You are currently using \"%s\""
+msgid "You are currently using <strong>%s</strong>"
 msgstr ""
 
@@ -753 +753 @@
 msgstr ""
 
-msgid "You have one spam comments."
+msgid "You have one spam comment."
 msgstr ""
 
@@ -2160 +2160 @@
 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 ""

locales/en/main.po

@@ -1917 +1917 @@
 msgstr ""
 
+msgid "If this problem persists try to <a href="http://dotclear.org/download">update manually</a>."
+msgstr ""
+
 msgid "The following files of your Dotclear installation have been modified so we won't try to update your installation. Please try to <a href=\"http://dotclear.org/download\">update manually</a>."
 msgstr ""