diff options
14 files changed, 15 insertions, 14 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php index 5a9afc69..7d820c7e 100644 --- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php +++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php | |||
@@ -309,7 +309,7 @@ class EntryRestController extends WallabagRestController | |||
309 | * {"name"="published_at", "dataType"="datetime|integer", "format"="YYYY-MM-DDTHH:II:SS+TZ or a timestamp", "required"=false, "description"="Published date of the entry"}, | 309 | * {"name"="published_at", "dataType"="datetime|integer", "format"="YYYY-MM-DDTHH:II:SS+TZ or a timestamp", "required"=false, "description"="Published date of the entry"}, |
310 | * {"name"="authors", "dataType"="string", "format"="Name Firstname,author2,author3", "required"=false, "description"="Authors of the entry"}, | 310 | * {"name"="authors", "dataType"="string", "format"="Name Firstname,author2,author3", "required"=false, "description"="Authors of the entry"}, |
311 | * {"name"="public", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="will generate a public link for the entry"}, | 311 | * {"name"="public", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="will generate a public link for the entry"}, |
312 | * {"name"="origin_url", "dataType"="string", "required"=false, "format"="http://www.test.com/article.html", "description"="Origin url for the entry."}, | 312 | * {"name"="origin_url", "dataType"="string", "required"=false, "format"="http://www.test.com/article.html", "description"="Origin url for the entry (from where you found it)."}, |
313 | * } | 313 | * } |
314 | * ) | 314 | * ) |
315 | * | 315 | * |
@@ -409,7 +409,7 @@ class EntryRestController extends WallabagRestController | |||
409 | * {"name"="published_at", "dataType"="datetime|integer", "format"="YYYY-MM-DDTHH:II:SS+TZ or a timestamp", "required"=false, "description"="Published date of the entry"}, | 409 | * {"name"="published_at", "dataType"="datetime|integer", "format"="YYYY-MM-DDTHH:II:SS+TZ or a timestamp", "required"=false, "description"="Published date of the entry"}, |
410 | * {"name"="authors", "dataType"="string", "format"="Name Firstname,author2,author3", "required"=false, "description"="Authors of the entry"}, | 410 | * {"name"="authors", "dataType"="string", "format"="Name Firstname,author2,author3", "required"=false, "description"="Authors of the entry"}, |
411 | * {"name"="public", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="will generate a public link for the entry"}, | 411 | * {"name"="public", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="will generate a public link for the entry"}, |
412 | * {"name"="origin_url", "dataType"="string", "required"=false, "format"="http://www.test.com/article.html", "description"="Origin url for the entry."}, | 412 | * {"name"="origin_url", "dataType"="string", "required"=false, "format"="http://www.test.com/article.html", "description"="Origin url for the entry (from where you found it)."}, |
413 | * } | 413 | * } |
414 | * ) | 414 | * ) |
415 | * | 415 | * |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 8fa5965e..79d00b32 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -244,7 +244,7 @@ entry: | |||
244 | # page_title: 'Edit an entry' | 244 | # page_title: 'Edit an entry' |
245 | # title_label: 'Title' | 245 | # title_label: 'Title' |
246 | url_label: 'Url' | 246 | url_label: 'Url' |
247 | # origin_url_label: 'Origin url' | 247 | # origin_url_label: 'Origin url (from where you found that entry)' |
248 | save_label: 'Gem' | 248 | save_label: 'Gem' |
249 | public: | 249 | public: |
250 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" | 250 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 3bb10d51..990cf75f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -244,7 +244,7 @@ entry: | |||
244 | page_title: 'Eintrag bearbeiten' | 244 | page_title: 'Eintrag bearbeiten' |
245 | title_label: 'Titel' | 245 | title_label: 'Titel' |
246 | url_label: 'URL' | 246 | url_label: 'URL' |
247 | # origin_url_label: 'Origin url' | 247 | # origin_url_label: 'Origin url (from where you found that entry)' |
248 | save_label: 'Speichern' | 248 | save_label: 'Speichern' |
249 | public: | 249 | public: |
250 | shared_by_wallabag: 'Dieser Artikel wurde von %username% mittels <a href="%wallabag_instance%">wallabag</a> geteilt' | 250 | shared_by_wallabag: 'Dieser Artikel wurde von %username% mittels <a href="%wallabag_instance%">wallabag</a> geteilt' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 9da36e24..6b79dff1 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -244,7 +244,7 @@ entry: | |||
244 | page_title: 'Edit an entry' | 244 | page_title: 'Edit an entry' |
245 | title_label: 'Title' | 245 | title_label: 'Title' |
246 | url_label: 'Url' | 246 | url_label: 'Url' |
247 | origin_url_label: 'Origin url' | 247 | origin_url_label: 'Origin url (from where you found that entry)' |
248 | save_label: 'Save' | 248 | save_label: 'Save' |
249 | public: | 249 | public: |
250 | shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" | 250 | shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 37fee3c1..0b88dd6c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -244,7 +244,7 @@ entry: | |||
244 | page_title: 'Editar un artículo' | 244 | page_title: 'Editar un artículo' |
245 | title_label: 'Título' | 245 | title_label: 'Título' |
246 | url_label: 'URL' | 246 | url_label: 'URL' |
247 | # origin_url_label: 'Origin url' | 247 | # origin_url_label: 'Origin url (from where you found that entry)' |
248 | save_label: 'Guardar' | 248 | save_label: 'Guardar' |
249 | public: | 249 | public: |
250 | shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>" | 250 | shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index ac39aa62..e90bbe53 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -244,7 +244,7 @@ entry: | |||
244 | page_title: 'ویرایش مقاله' | 244 | page_title: 'ویرایش مقاله' |
245 | title_label: 'عنوان' | 245 | title_label: 'عنوان' |
246 | url_label: 'نشانی' | 246 | url_label: 'نشانی' |
247 | # origin_url_label: 'Origin url' | 247 | # origin_url_label: 'Origin url (from where you found that entry)' |
248 | save_label: 'ذخیره' | 248 | save_label: 'ذخیره' |
249 | public: | 249 | public: |
250 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" | 250 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index e640f2ba..8a9ba522 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -244,7 +244,7 @@ entry: | |||
244 | page_title: "Éditer un article" | 244 | page_title: "Éditer un article" |
245 | title_label: "Titre" | 245 | title_label: "Titre" |
246 | url_label: "Adresse" | 246 | url_label: "Adresse" |
247 | origin_url_label: "Adresse d'origine" | 247 | origin_url_label: "Adresse d'origine (d'où vous avez trouvé cet article)" |
248 | save_label: "Enregistrer" | 248 | save_label: "Enregistrer" |
249 | public: | 249 | public: |
250 | shared_by_wallabag: "Cet article a été partagé par %username% avec <a href=\"%wallabag_instance%\">wallabag</a>" | 250 | shared_by_wallabag: "Cet article a été partagé par %username% avec <a href=\"%wallabag_instance%\">wallabag</a>" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index c2dad0df..e3ab3764 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -244,7 +244,7 @@ entry: | |||
244 | page_title: 'Modifica voce' | 244 | page_title: 'Modifica voce' |
245 | title_label: 'Titolo' | 245 | title_label: 'Titolo' |
246 | url_label: 'Url' | 246 | url_label: 'Url' |
247 | # origin_url_label: 'Origin url' | 247 | # origin_url_label: 'Origin url (from where you found that entry)' |
248 | save_label: 'Salva' | 248 | save_label: 'Salva' |
249 | public: | 249 | public: |
250 | shared_by_wallabag: "Questo articolo è stato condiviso da %username% con <a href='%wallabag_instance%'>wallabag</a>" | 250 | shared_by_wallabag: "Questo articolo è stato condiviso da %username% con <a href='%wallabag_instance%'>wallabag</a>" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 72442c56..7f169db4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -244,7 +244,7 @@ entry: | |||
244 | page_title: 'Modificar un article' | 244 | page_title: 'Modificar un article' |
245 | title_label: 'Títol' | 245 | title_label: 'Títol' |
246 | url_label: 'Url' | 246 | url_label: 'Url' |
247 | # origin_url_label: 'Origin url' | 247 | # origin_url_label: 'Origin url (from where you found that entry)' |
248 | save_label: 'Enregistrar' | 248 | save_label: 'Enregistrar' |
249 | public: | 249 | public: |
250 | shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" | 250 | shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 2e1039bd..96d4d7df 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -244,7 +244,7 @@ entry: | |||
244 | page_title: 'Edytuj wpis' | 244 | page_title: 'Edytuj wpis' |
245 | title_label: 'Tytuł' | 245 | title_label: 'Tytuł' |
246 | url_label: 'Adres URL' | 246 | url_label: 'Adres URL' |
247 | # origin_url_label: 'Origin url' | 247 | # origin_url_label: 'Origin url (from where you found that entry)' |
248 | save_label: 'Zapisz' | 248 | save_label: 'Zapisz' |
249 | public: | 249 | public: |
250 | shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>" | 250 | shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 72fe2c9a..ec8e08ac 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -244,7 +244,7 @@ entry: | |||
244 | page_title: 'Editar uma entrada' | 244 | page_title: 'Editar uma entrada' |
245 | title_label: 'Título' | 245 | title_label: 'Título' |
246 | url_label: 'Url' | 246 | url_label: 'Url' |
247 | # origin_url_label: 'Origin url' | 247 | # origin_url_label: 'Origin url (from where you found that entry)' |
248 | save_label: 'Salvar' | 248 | save_label: 'Salvar' |
249 | public: | 249 | public: |
250 | shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>" | 250 | shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 7a3f0526..e83943d7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -244,7 +244,7 @@ entry: | |||
244 | # page_title: 'Edit an entry' | 244 | # page_title: 'Edit an entry' |
245 | # title_label: 'Title' | 245 | # title_label: 'Title' |
246 | url_label: 'Url' | 246 | url_label: 'Url' |
247 | # origin_url_label: 'Origin url' | 247 | # origin_url_label: 'Origin url (from where you found that entry)' |
248 | save_label: 'Salvează' | 248 | save_label: 'Salvează' |
249 | public: | 249 | public: |
250 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" | 250 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index eceecabf..1e8d0831 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml | |||
@@ -234,6 +234,7 @@ entry: | |||
234 | page_title: 'Изменить запись' | 234 | page_title: 'Изменить запись' |
235 | title_label: 'Название' | 235 | title_label: 'Название' |
236 | url_label: 'Ссылка' | 236 | url_label: 'Ссылка' |
237 | # origin_url_label: 'Origin url (from where you found that entry)' | ||
237 | is_public_label: 'Публичная' | 238 | is_public_label: 'Публичная' |
238 | save_label: 'Сохранить' | 239 | save_label: 'Сохранить' |
239 | public: | 240 | public: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 44619ea5..1dbe9f58 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -242,7 +242,7 @@ entry: | |||
242 | page_title: 'Makaleyi düzenle' | 242 | page_title: 'Makaleyi düzenle' |
243 | title_label: 'Başlık' | 243 | title_label: 'Başlık' |
244 | url_label: 'Url' | 244 | url_label: 'Url' |
245 | # origin_url_label: 'Origin url' | 245 | # origin_url_label: 'Origin url (from where you found that entry)' |
246 | save_label: 'Kaydet' | 246 | save_label: 'Kaydet' |
247 | public: | 247 | public: |
248 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" | 248 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" |