From f12d9b56a72a2b3a7ee94decb17196351e0f577a Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordi@softcatala.org>
Date: Sun, 23 Oct 2011 20:35:28 +0200
Subject: [PATCH] =?UTF-8?q?Avoid=20using=20=E2=80=9Chas=20just=E2=80=9D=20?=
=?UTF-8?q?constructs,=20as=20discussed=20in=20ddd152505eb45666d5cc471f3d3?=
=?UTF-8?q?3026b6657e053.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fix grammar for plurals for mentions and reshares, too.
---
config/locales/diaspora/en.yml | 36 +++++++++++++++++-----------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 0ae2a11d83..acca40aed0 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -401,26 +401,26 @@ en:
many: "%{actors} also commented on %{post_author}'s %{post_link}."
other: "%{actors} also commented on %{post_author}'s %{post_link}."
mentioned:
- zero: "%{actors} has mentioned you in a %{post_link}."
+ zero: "%{actors} have mentioned you in a %{post_link}."
one: "%{actors} has mentioned you in a %{post_link}."
- two: "%{actors} has mentioned you in a %{post_link}."
- few: "%{actors} has mentioned you in a %{post_link}."
- many: "%{actors} has mentioned you in a %{post_link}."
- other: "%{actors} has mentioned you in a %{post_link}."
+ two: "%{actors} have mentioned you in a %{post_link}."
+ few: "%{actors} have mentioned you in a %{post_link}."
+ many: "%{actors} have mentioned you in a %{post_link}."
+ other: "%{actors} have mentioned you in a %{post_link}."
liked:
- zero: "%{actors} have just liked your %{post_link}."
- one: "%{actors} has just liked your %{post_link}."
- two: "%{actors} have just liked your %{post_link}."
- few: "%{actors} have just liked your %{post_link}."
- many: "%{actors} have just liked your %{post_link}."
- other: "%{actors} have just liked your %{post_link}."
+ zero: "%{actors} have liked your %{post_link}."
+ one: "%{actors} has liked your %{post_link}."
+ two: "%{actors} have liked your %{post_link}."
+ few: "%{actors} have liked your %{post_link}."
+ many: "%{actors} have liked your %{post_link}."
+ other: "%{actors} have liked your %{post_link}."
reshared:
- zero: "%{actors} has reshared your %{post_link}."
+ zero: "%{actors} have reshared your %{post_link}."
one: "%{actors} has reshared your %{post_link}."
- two: "%{actors} has reshared your %{post_link}."
- few: "%{actors} has reshared your %{post_link}."
- many: "%{actors} has reshared your %{post_link}."
- other: "%{actors} has reshared your %{post_link}."
+ two: "%{actors} have reshared your %{post_link}."
+ few: "%{actors} have reshared your %{post_link}."
+ many: "%{actors} have reshared your %{post_link}."
+ other: "%{actors} have reshared your %{post_link}."
post: "post"
also_commented_deleted:
zero: "%{actors} commented on a deleted post."
@@ -492,10 +492,10 @@ en:
private_message:
reply_to_or_view: "Reply to or view this conversation >"
liked:
- liked: "%{name} just liked your post"
+ liked: "%{name} liked your post"
view_post: "View post >"
reshared:
- reshared: "%{name} just reshared your post"
+ reshared: "%{name} reshared your post"
view_post: "View post >"
confirm_email:
subject: "Please activate your new email address %{unconfirmed_email}"
--
GitLab