aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2017-06-10 14:41:30 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2017-06-10 14:41:30 +0200
commit873f6b8e03079d11fab541aa5b0bc6f8fe2d645e (patch)
tree4a5a66ebbd3ad6a8581d9b64f5e3bcea4dfcd957
parentf6d45eca76da79a035ea4015b4d72520bddf2a26 (diff)
parenta3477df5c93bc3d27baac08410a716fa6e92309f (diff)
downloadwallabag-873f6b8e03079d11fab541aa5b0bc6f8fe2d645e.tar.gz
wallabag-873f6b8e03079d11fab541aa5b0bc6f8fe2d645e.tar.zst
wallabag-873f6b8e03079d11fab541aa5b0bc6f8fe2d645e.zip
Merge remote-tracking branch 'origin/master' into 2.3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 3e64af8f..5e7afe27 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -71,7 +71,7 @@ config:
71 # 300_word: 'I read ~300 words per minute' 71 # 300_word: 'I read ~300 words per minute'
72 # 400_word: 'I read ~400 words per minute' 72 # 400_word: 'I read ~400 words per minute'
73 action_mark_as_read: 73 action_mark_as_read:
74 # label: 'Where do you to be redirected after mark an article as read?' 74 # label: 'Where do you want to be redirected to after marking an article as read?'
75 # redirect_homepage: 'To the homepage' 75 # redirect_homepage: 'To the homepage'
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer 77 pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 8703a0e5..572084c1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -71,7 +71,7 @@ config:
71 300_word: 'I read ~300 words per minute' 71 300_word: 'I read ~300 words per minute'
72 400_word: 'I read ~400 words per minute' 72 400_word: 'I read ~400 words per minute'
73 action_mark_as_read: 73 action_mark_as_read:
74 label: 'Where do you want to be redirected after mark an article as read?' 74 label: 'Where do you want to be redirected to after marking an article as read?'
75 redirect_homepage: 'To the homepage' 75 redirect_homepage: 'To the homepage'
76 redirect_current_page: 'To the current page' 76 redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: Consumer key for Pocket to import contents 77 pocket_consumer_key_label: Consumer key for Pocket to import contents
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index ec7a4362..a8900489 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -71,7 +71,7 @@ config:
71 300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه می‌خوانم' 71 300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه می‌خوانم'
72 400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه می‌خوانم' 72 400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه می‌خوانم'
73 action_mark_as_read: 73 action_mark_as_read:
74 # label: 'Where do you to be redirected after mark an article as read?' 74 # label: 'Where do you want to be redirected to after marking an article as read?'
75 # redirect_homepage: 'To the homepage' 75 # redirect_homepage: 'To the homepage'
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب 77 pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 16e8072b..c2007057 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -71,7 +71,7 @@ config:
71 300_word: 'Leggo ~300 parole al minuto' 71 300_word: 'Leggo ~300 parole al minuto'
72 400_word: 'Leggo ~400 parole al minuto' 72 400_word: 'Leggo ~400 parole al minuto'
73 action_mark_as_read: 73 action_mark_as_read:
74 # label: 'Where do you to be redirected after mark an article as read?' 74 # label: 'Where do you want to be redirected to after marking an article as read?'
75 # redirect_homepage: 'To the homepage' 75 # redirect_homepage: 'To the homepage'
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti 77 pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index bf038ee8..896ccb04 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -71,7 +71,7 @@ config:
71 300_word: 'Posso ler ~300 palavras por minuto' 71 300_word: 'Posso ler ~300 palavras por minuto'
72 400_word: 'Posso ler ~400 palavras por minuto' 72 400_word: 'Posso ler ~400 palavras por minuto'
73 action_mark_as_read: 73 action_mark_as_read:
74 # label: 'Where do you to be redirected after mark an article as read?' 74 # label: 'Where do you want to be redirected to after marking an article as read?'
75 # redirect_homepage: 'To the homepage' 75 # redirect_homepage: 'To the homepage'
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' 77 pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index bd66d83a..c447dc9b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -71,7 +71,7 @@ config:
71 # 300_word: 'I read ~300 words per minute' 71 # 300_word: 'I read ~300 words per minute'
72 # 400_word: 'I read ~400 words per minute' 72 # 400_word: 'I read ~400 words per minute'
73 action_mark_as_read: 73 action_mark_as_read:
74 # label: 'Where do you to be redirected after mark an article as read?' 74 # label: 'Where do you want to be redirected to after marking an article as read?'
75 # redirect_homepage: 'To the homepage' 75 # redirect_homepage: 'To the homepage'
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket 77 pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index b86c4003..61e1a1ea 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -71,7 +71,7 @@ config:
71 # 300_word: 'I read ~300 words per minute' 71 # 300_word: 'I read ~300 words per minute'
72 # 400_word: 'I read ~400 words per minute' 72 # 400_word: 'I read ~400 words per minute'
73 action_mark_as_read: 73 action_mark_as_read:
74 # label: 'Where do you to be redirected after mark an article as read?' 74 # label: 'Where do you want to be redirected to after marking an article as read?'
75 # redirect_homepage: 'To the homepage' 75 # redirect_homepage: 'To the homepage'
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 # pocket_consumer_key_label: Consumer key for Pocket to import contents 77 # pocket_consumer_key_label: Consumer key for Pocket to import contents