From f46b6195475a1ee4138ffd6b9c7e939c931c3859 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@discourse.org>
Date: Sun, 14 Jul 2013 22:24:59 -0700
Subject: [PATCH] simplify copy around merge and split
---
config/locales/client.da.yml | 2 +-
config/locales/client.en.yml | 14 +++++++-------
config/locales/client.es.yml | 2 +-
config/locales/client.id.yml | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 6421b039d..64beea7fc 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -461,7 +461,7 @@ da:
invisible: "Gør usynlig"
visible: "Gør synlig"
reset_read: "Glem hvilke emner jeg har læst"
- multi_select: "Select for Merge/Split"
+ multi_select: "Select Posts to Move"
convert_to_topic: "Konvertér til normalt emne"
reply:
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 5f2e17691..581d07d81 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -642,7 +642,7 @@ en:
invisible: "Make Invisible"
visible: "Make Visible"
reset_read: "Reset Read Data"
- multi_select: "Select for Merge/Split"
+ multi_select: "Select Posts to Move"
convert_to_topic: "Convert to Regular Topic"
reply:
@@ -697,18 +697,18 @@ en:
cancel: "Show all posts in this topic again."
split_topic:
- title: "Split Topic"
- action: "split topic"
+ title: "Move to New Topic"
+ action: "move to new topic"
topic_name: "New Topic Name:"
- error: "There was an error splitting that topic."
+ error: "There was an error moving posts to the new topic."
instructions:
one: "You are about to create a new topic and populate it with the post you've selected."
other: "You are about to create a new topic and populate it with the <b>{{count}}</b> posts you've selected."
merge_topic:
- title: "Merge Topic"
- action: "merge topic"
- error: "There was an error merging that topic."
+ title: "Move to Existing Topic"
+ action: "move to existing topic"
+ error: "There was an error moving posts into that topic."
instructions:
one: "Please choose the topic you'd like to move that post to."
other: "Please choose the topic you'd like to move those <b>{{count}}</b> posts to."
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 1b0d59606..8ddd40700 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -543,7 +543,7 @@ es:
invisible: "Make Invisible"
visible: "Make Visible"
reset_read: "Reset Read Data"
- multi_select: "Select for Merge/Split"
+ multi_select: "Select Posts to Move"
convert_to_topic: "Convert to Regular Topic"
reply:
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 25943e3e5..ddb7ab693 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -422,7 +422,7 @@ id:
invisible: "Make Invisible"
visible: "Make Visible"
reset_read: "Reset Read Data"
- multi_select: "Select for Merge/Split"
+ multi_select: "Select Posts to Move"
convert_to_topic: "Convert to Regular Topic"
reply: