aboutsummaryrefslogtreecommitdiff
path: root/app/i18n/en/gen.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-06-03 15:18:04 +0200
committerGravatar GitHub <noreply@github.com> 2017-06-03 15:18:04 +0200
commitfd43ee546e419fc9fbb9a3ad974d2234d94cffaa (patch)
tree2df9fd1daf5b994d7bbde8dd46f7605e4370c268 /app/i18n/en/gen.php
parentbe0bcfef7e38f27284ec7b377b342ba389515964 (diff)
parent6f3653d430c86b026f8e007a276fdba2b09b61b3 (diff)
Merge pull request #1549 from FreshRSS/dev1.7.0
Version 1.7.0
Diffstat (limited to 'app/i18n/en/gen.php')
-rw-r--r--app/i18n/en/gen.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 1ee5336bd..05281769f 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -103,7 +103,7 @@ return array(
'js' => array(
'category_empty' => 'Empty category',
'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
- 'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
+ 'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favourites and user queries. It cannot be cancelled!',
'feedback' => array(
'body_new_articles' => 'There are %%d new articles to read on FreshRSS.',
'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',
@@ -121,6 +121,7 @@ return array(
'nl' => 'Nederlands',
'ru' => 'Русский',
'tr' => 'Türkçe',
+ 'zh-cn' => '简体中文'
),
'menu' => array(
'about' => 'About',
@@ -173,7 +174,7 @@ return array(
'blank_to_disable' => 'Leave blank to disable',
'by_author' => 'By <em>%s</em>',
'by_default' => 'By default',
- 'damn' => 'Damn!',
+ 'damn' => 'Blast!',
'default_category' => 'Uncategorized',
'no' => 'No',
'not_applicable' => 'Not available',