From: Nicolas Lœuillet Date: Fri, 7 Oct 2016 12:30:46 +0000 (+0200) Subject: Merge pull request #2383 from wallabag/add-info-publich-articles X-Git-Tag: 2.1.2~43 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=c8d2dcdafe95c7986bb9fdaa7998417a014bf6fa;hp=-c;p=github%2Fwallabag%2Fwallabag.git Merge pull request #2383 from wallabag/add-info-publich-articles Added OpenGraph support for public articles --- c8d2dcdafe95c7986bb9fdaa7998417a014bf6fa diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index b04b9512,01067035..2652a102 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@@ -208,6 -208,8 +208,8 @@@ entry url_label: 'Url' # is_public_label: 'Public' save_label: 'Gem' + public: + # shared_by_wallabag: "This article has been shared by wallabag" about: page_title: 'Om' @@@ -462,7 -464,7 +464,7 @@@ flashes # entry_saved_failed: 'Entry saved but fetching content failed' # entry_updated: 'Entry updated' # entry_reloaded: 'Entry reloaded' - # entry_reload_failed: 'Entry reloaded but fetching content failed' + # entry_reloaded_failed: 'Entry reloaded but fetching content failed' entry_archived: 'Artikel arkiveret' entry_unarchived: 'Artikel ikke længere arkiveret' entry_starred: 'Artikel markeret som favorit' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 6ea3f5c5,50195b05..e0f29b61 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@@ -208,6 -208,8 +208,8 @@@ entry url_label: 'URL' is_public_label: 'Öffentlich' save_label: 'Speichern' + public: + # shared_by_wallabag: "This article has been shared by wallabag" about: page_title: 'Über' @@@ -462,7 -464,7 +464,7 @@@ flashes entry_saved_failed: 'Eintrag gespeichert, aber das Abrufen des Inhalts ist fehlgeschlagen' entry_updated: 'Eintrag aktualisiert' entry_reloaded: 'Eintrag neugeladen' - entry_reload_failed: 'Eintrag neugeladen, aber das Abrufen des Inhalts ist fehlgeschlagen' + entry_reloaded_failed: 'Eintrag neugeladen, aber das Abrufen des Inhalts ist fehlgeschlagen' entry_archived: 'Artikel archiviert' entry_unarchived: 'Artikel dearchiviert' entry_starred: 'Artikel favorisiert' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 38631e24,2aba86ff..b8e98112 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@@ -208,6 -208,8 +208,8 @@@ entry url_label: 'Url' is_public_label: 'Public' save_label: 'Save' + public: + shared_by_wallabag: "This article has been shared by wallabag" about: page_title: 'About' @@@ -461,7 -463,7 +463,7 @@@ flashes entry_saved_failed: 'Entry saved but fetching content failed' entry_updated: 'Entry updated' entry_reloaded: 'Entry reloaded' - entry_reload_failed: 'Entry reloaded but fetching content failed' + entry_reloaded_failed: 'Entry reloaded but fetching content failed' entry_archived: 'Entry archived' entry_unarchived: 'Entry unarchived' entry_starred: 'Entry starred' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index a1fc34ef,b7495510..70633bd7 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@@ -208,6 -208,8 +208,8 @@@ entry url_label: 'Url' is_public_label: 'Es Público' save_label: 'Guardar' + public: + # shared_by_wallabag: "This article has been shared by wallabag" about: page_title: 'Acerca de' @@@ -462,7 -464,7 +464,7 @@@ flashes # entry_saved_failed: 'Entry saved but fetching content failed' entry_updated: 'Entrada actualizada' entry_reloaded: 'Entrada recargada' - # entry_reload_failed: 'Entry reloaded but fetching content failed' + # entry_reloaded_failed: 'Entry reloaded but fetching content failed' entry_archived: 'Artículo archivado' entry_unarchived: 'Artículo desarchivado' entry_starred: 'Artículo guardado en los favoritos' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 740302c5,13763564..074ab7a8 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@@ -208,6 -208,8 +208,8 @@@ entry url_label: 'نشانی' is_public_label: 'عمومی' save_label: 'ذخیره' + public: + # shared_by_wallabag: "This article has been shared by wallabag" about: page_title: 'درباره' @@@ -461,7 -463,7 +463,7 @@@ flashes # entry_saved_failed: 'Entry saved but fetching content failed' entry_updated: 'مقاله به‌روز شد' entry_reloaded: 'مقاله به‌روز شد' - # entry_reload_failed: 'Entry reloaded but fetching content failed' + # entry_reloaded_failed: 'Entry reloaded but fetching content failed' entry_archived: 'مقاله بایگانی شد' entry_unarchived: 'مقاله از بایگانی درآمد' entry_starred: 'مقاله برگزیده شد' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index ad4fc99f,098bc9ff..6d85a5ae --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@@ -208,6 -208,8 +208,8 @@@ entry url_label: 'Url' is_public_label: 'Public' save_label: 'Enregistrer' + public: + shared_by_wallabag: "Cet article a été partagé par wallabag" about: page_title: 'À propos' @@@ -462,7 -464,7 +464,7 @@@ flashes entry_saved_failed: 'Article enregistré mais impossible de récupérer le contenu' entry_updated: 'Article mis à jour' entry_reloaded: 'Article rechargé' - entry_reload_failed: "Article mis à jour mais impossible de récupérer le contenu" + entry_reloaded_failed: "Article mis à jour mais impossible de récupérer le contenu" entry_archived: 'Article marqué comme lu' entry_unarchived: 'Article marqué comme non lu' entry_starred: 'Article ajouté dans les favoris' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index e0bd9d8b,390a4b60..15f7e774 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@@ -208,6 -208,8 +208,8 @@@ entry url_label: 'Url' is_public_label: 'Pubblico' save_label: 'Salva' + public: + # shared_by_wallabag: "This article has been shared by wallabag" about: page_title: 'About' @@@ -462,7 -464,7 +464,7 @@@ flashes # entry_saved_failed: 'Entry saved but fetching content failed' entry_updated: 'Contenuto aggiornato' entry_reloaded: 'Contenuto ricaricato' - # entry_reload_failed: 'Entry reloaded but fetching content failed' + # entry_reloaded_failed: 'Entry reloaded but fetching content failed' entry_archived: 'Contenuto archiviato' entry_unarchived: 'Contenuto dis-archiviato' entry_starred: 'Contenuto segnato come preferito' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index b26bed87,990938a6..1d10be2a --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@@ -208,6 -208,8 +208,8 @@@ entry url_label: 'Url' is_public_label: 'Public' save_label: 'Enregistrar' + public: + # shared_by_wallabag: "This article has been shared by wallabag" about: page_title: 'A prepaus' @@@ -462,7 -464,7 +464,7 @@@ flashes entry_saved_failed: 'Article salvat mai fracàs de la recuperacion del contengut' entry_updated: 'Article mes a jorn' entry_reloaded: 'Article recargat' - entry_reload_failed: "L'article es estat cargat de nòu mai la recuperacion del contengut a fracassat" + entry_reloaded_failed: "L'article es estat cargat de nòu mai la recuperacion del contengut a fracassat" entry_archived: 'Article marcat coma legit' entry_unarchived: 'Article marcat coma pas legit' entry_starred: 'Article apondut dins los favorits' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 285d73e5,6dd79641..9791a3b2 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@@ -208,6 -208,8 +208,8 @@@ entry url_label: 'Adres URL' is_public_label: 'Publiczny' save_label: 'Zapisz' + public: + # shared_by_wallabag: "This article has been shared by wallabag" about: page_title: 'O nas' @@@ -284,7 -286,7 +286,7 @@@ quickstart import: 'Skonfigurować import' first_steps: title: 'Pierwsze kroki' - description: "Teraz wallabag jest poprawnie skonfigurowany, więc czas zarchiwizować Internet. Klinknij w prawym górnym rogu na znak +, aby dodać link" + description: "Teraz wallabag jest poprawnie skonfigurowany, więc czas zarchiwizować Internet. Klinknij w prawym górnym rogu na znak +, aby dodać link" new_article: 'Zapisz swój pierwszy artukuł' unread_articles: 'I sklasyfikuj go!' migrate: @@@ -462,7 -464,7 +464,7 @@@ flashes entry_saved_failed: 'Wpis zapisany, ale wystąpił bład pobierania treści' entry_updated: 'Wpis zaktualizowany' entry_reloaded: 'Wpis ponownie załadowany' - entry_reload_failed: 'Wpis ponownie załadowany, ale wystąpił bład pobierania treści' + entry_reloaded_failed: 'Wpis ponownie załadowany, ale wystąpił bład pobierania treści' entry_archived: 'Wpis dodany do archiwum' entry_unarchived: 'Wpis usunięty z archiwum' entry_starred: 'Wpis oznaczony gwiazdką' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index fba6f998,a8d625d2..2b1d4f6d --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@@ -208,6 -208,8 +208,8 @@@ entry url_label: 'Url' # is_public_label: 'Public' save_label: 'Salvează' + public: + # shared_by_wallabag: "This article has been shared by wallabag" about: page_title: 'Despre' @@@ -462,7 -464,7 +464,7 @@@ flashes # entry_saved_failed: 'Entry saved but fetching content failed' # entry_updated: 'Entry updated' # entry_reloaded: 'Entry reloaded' - # entry_reload_failed: 'Entry reloaded but fetching content failed' + # entry_reloaded_failed: 'Entry reloaded but fetching content failed' entry_archived: 'Articol arhivat' entry_unarchived: 'Articol dezarhivat' entry_starred: 'Articol adăugat la favorite' diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 1694e212,bcfd8ad4..8cfc245a --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@@ -207,6 -207,8 +207,8 @@@ entry url_label: 'Url' is_public_label: 'Herkes tarafından erişime açık olsun mu?' save_label: 'Kaydet' + public: + # shared_by_wallabag: "This article has been shared by wallabag" about: page_title: 'Hakkımızda' @@@ -461,7 -463,7 +463,7 @@@ flashes # entry_saved_failed: 'Entry saved but fetching content failed' # entry_updated: 'Entry updated' entry_reloaded: 'Makale içeriği yenilendi' - # entry_reload_failed: 'Entry reloaded but fetching content failed' + # entry_reloaded_failed: 'Entry reloaded but fetching content failed' entry_archived: 'Makale arşivlendi' entry_unarchived: 'Makale arşivden çıkartıldı' entry_starred: 'Makale favorilere eklendi'