diff options
Diffstat (limited to 'app')
13 files changed, 3 insertions, 11 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml index 20e938f5..5475e571 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml | |||
@@ -20,7 +20,6 @@ share_twitter: Aktiver deling gennem Twitter | |||
20 | share_unmark: Aktiver deling gennem Unmark.it | 20 | share_unmark: Aktiver deling gennem Unmark.it |
21 | show_printlink: Vis et link til print-indhold | 21 | show_printlink: Vis et link til print-indhold |
22 | wallabag_support_url: Support-URL for wallabag | 22 | wallabag_support_url: Support-URL for wallabag |
23 | wallabag_url: URL for *sin* wallabag-installation | ||
24 | entry: "artikel" | 23 | entry: "artikel" |
25 | export: "eksport" | 24 | export: "eksport" |
26 | import: "import" | 25 | import: "import" |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml index 526d41bc..f57db303 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml | |||
@@ -20,7 +20,6 @@ share_twitter: Teilen zu Twitter aktiveren | |||
20 | share_unmark: Teilen zu Unmark.it aktiveren | 20 | share_unmark: Teilen zu Unmark.it aktiveren |
21 | show_printlink: Link anzeigen, um den Inhalt auszudrucken | 21 | show_printlink: Link anzeigen, um den Inhalt auszudrucken |
22 | wallabag_support_url: Support-URL für wallabag | 22 | wallabag_support_url: Support-URL für wallabag |
23 | wallabag_url: URL von *deiner* wallabag-Instanz | ||
24 | entry: "Artikel" | 23 | entry: "Artikel" |
25 | export: "Export" | 24 | export: "Export" |
26 | import: "Import" | 25 | import: "Import" |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index 3c0037f3..1e4f4668 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml | |||
@@ -20,7 +20,6 @@ share_twitter: Enable share to Twitter | |||
20 | share_unmark: Enable share to Unmark.it | 20 | share_unmark: Enable share to Unmark.it |
21 | show_printlink: Display a link to print content | 21 | show_printlink: Display a link to print content |
22 | wallabag_support_url: Support URL for wallabag | 22 | wallabag_support_url: Support URL for wallabag |
23 | wallabag_url: URL of *your* wallabag instance | ||
24 | entry: "article" | 23 | entry: "article" |
25 | export: "export" | 24 | export: "export" |
26 | import: "import" | 25 | import: "import" |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml index 99869669..46ed4040 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml | |||
@@ -20,7 +20,6 @@ share_twitter: Activar compartir con Twitter | |||
20 | share_unmark: Activar compartir con Unmark.it | 20 | share_unmark: Activar compartir con Unmark.it |
21 | show_printlink: Mostrar un enlace para imprimir contenido | 21 | show_printlink: Mostrar un enlace para imprimir contenido |
22 | wallabag_support_url: URL de soporte de wallabag | 22 | wallabag_support_url: URL de soporte de wallabag |
23 | wallabag_url: URL de *tu* instancia de wallabag | ||
24 | entry: "artículo" | 23 | entry: "artículo" |
25 | export: "exportar" | 24 | export: "exportar" |
26 | import: "importar" | 25 | import: "importar" |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml index 2e1307e5..f8da4acf 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml | |||
@@ -20,7 +20,6 @@ share_twitter: فعالسازی همرسانی به Twitter | |||
20 | share_unmark: فعالسازی همرسانی به Unmark.it | 20 | share_unmark: فعالسازی همرسانی به Unmark.it |
21 | show_printlink: نمایش پیوندی برای چاپ مطلب | 21 | show_printlink: نمایش پیوندی برای چاپ مطلب |
22 | wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag | 22 | wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag |
23 | wallabag_url: نشانی صفحهٔ wallabag *شما* | ||
24 | entry: "مقاله" | 23 | entry: "مقاله" |
25 | export: "برونسپاری" | 24 | export: "برونسپاری" |
26 | import: "درونریزی" | 25 | import: "درونریزی" |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml index 454053ad..a79409b4 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml | |||
@@ -20,7 +20,6 @@ share_twitter: Activer le partage vers Twitter | |||
20 | share_unmark: Activer le partage vers Unmark.it | 20 | share_unmark: Activer le partage vers Unmark.it |
21 | show_printlink: Afficher un lien pour imprimer | 21 | show_printlink: Afficher un lien pour imprimer |
22 | wallabag_support_url: URL de support de wallabag | 22 | wallabag_support_url: URL de support de wallabag |
23 | wallabag_url: URL de *votre* instance de wallabag | ||
24 | entry: "article" | 23 | entry: "article" |
25 | export: "export" | 24 | export: "export" |
26 | import: "import" | 25 | import: "import" |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml index 4dbd2ff8..dd4def4b 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml | |||
@@ -20,7 +20,6 @@ share_twitter: Abilita la condivisione con Twitter | |||
20 | share_unmark: Abilita la condivisione con Unmark.it | 20 | share_unmark: Abilita la condivisione con Unmark.it |
21 | show_printlink: Mostra un collegamento per stampare il contenuto | 21 | show_printlink: Mostra un collegamento per stampare il contenuto |
22 | wallabag_support_url: URL di supporto per wallabag | 22 | wallabag_support_url: URL di supporto per wallabag |
23 | wallabag_url: URL della *tua* installazione di wallabag | ||
24 | entry: "contenuto" | 23 | entry: "contenuto" |
25 | export: "esporta" | 24 | export: "esporta" |
26 | import: "importa" | 25 | import: "importa" |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml index 00c06638..66d9ae26 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml | |||
@@ -20,7 +20,6 @@ share_twitter: Activar lo partatge cap a Twitter | |||
20 | share_unmark: Activar lo partatge cap a Unmark.it | 20 | share_unmark: Activar lo partatge cap a Unmark.it |
21 | show_printlink: Afichar un ligam per imprimir | 21 | show_printlink: Afichar un ligam per imprimir |
22 | wallabag_support_url: URL d'assisténcia de wallabag | 22 | wallabag_support_url: URL d'assisténcia de wallabag |
23 | wallabag_url: URL de *vòstra* instància de wallabag | ||
24 | entry: "article" | 23 | entry: "article" |
25 | export: "expòrt" | 24 | export: "expòrt" |
26 | import: "impòrt" | 25 | import: "impòrt" |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml index ada11b3a..04ad4fd3 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml | |||
@@ -20,7 +20,6 @@ share_twitter: Włącz udostępnianie dla Twitter | |||
20 | share_unmark: Włącz udostępnianie dla Unmark.it | 20 | share_unmark: Włącz udostępnianie dla Unmark.it |
21 | show_printlink: Pokaż link do wydrukowania zawartości | 21 | show_printlink: Pokaż link do wydrukowania zawartości |
22 | wallabag_support_url: Adres URL wsparcia dla wallabag | 22 | wallabag_support_url: Adres URL wsparcia dla wallabag |
23 | wallabag_url: Adres *twojej* instacji wallabag | ||
24 | entry: "artykuł" | 23 | entry: "artykuł" |
25 | export: "eksport" | 24 | export: "eksport" |
26 | import: "import" | 25 | import: "import" |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml index 59af9610..77e22b37 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml | |||
@@ -20,7 +20,6 @@ share_twitter: Habilitar compartilhamento para o Twitter | |||
20 | share_unmark: Habilitar compartilhamento para o Unmark.it | 20 | share_unmark: Habilitar compartilhamento para o Unmark.it |
21 | show_printlink: Mostrar um link para imprimir o conteúdo | 21 | show_printlink: Mostrar um link para imprimir o conteúdo |
22 | wallabag_support_url: URL de Suporte do wallabag | 22 | wallabag_support_url: URL de Suporte do wallabag |
23 | wallabag_url: URL de *sua* instância do wallabag | ||
24 | entry: "artigo" | 23 | entry: "artigo" |
25 | export: "exportar" | 24 | export: "exportar" |
26 | import: "importar" | 25 | import: "importar" |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml index 104e37c6..1b4bfb5b 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml | |||
@@ -20,7 +20,6 @@ share_twitter: Permite share către Twitter | |||
20 | share_unmark: Permite share către Unmark.it | 20 | share_unmark: Permite share către Unmark.it |
21 | show_printlink: Afișează un link pentru a printa content-ul | 21 | show_printlink: Afișează un link pentru a printa content-ul |
22 | wallabag_support_url: URL-ul de suport pentru wallabag | 22 | wallabag_support_url: URL-ul de suport pentru wallabag |
23 | wallabag_url: URL-ul instanței tale wallabag | ||
24 | entry: "alticol" | 23 | entry: "alticol" |
25 | export: "exportă" | 24 | export: "exportă" |
26 | import: "importă" | 25 | import: "importă" |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index afcee039..c00ffb0e 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -23,6 +23,8 @@ parameters: | |||
23 | # with PostgreSQL and SQLite, you must set "utf8" | 23 | # with PostgreSQL and SQLite, you must set "utf8" |
24 | database_charset: utf8mb4 | 24 | database_charset: utf8mb4 |
25 | 25 | ||
26 | domain_name: wallabag.me | ||
27 | |||
26 | mailer_transport: smtp | 28 | mailer_transport: smtp |
27 | mailer_host: 127.0.0.1 | 29 | mailer_host: 127.0.0.1 |
28 | mailer_user: ~ | 30 | mailer_user: ~ |
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index d8c593c6..65bac1b4 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
@@ -26,6 +26,7 @@ wallabag_core: | |||
26 | fetching_error_message: | | 26 | fetching_error_message: | |
27 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. | 27 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. |
28 | api_limit_mass_actions: 10 | 28 | api_limit_mass_actions: 10 |
29 | domain_name: '%domain_name%' | ||
29 | default_internal_settings: | 30 | default_internal_settings: |
30 | - | 31 | - |
31 | name: share_public | 32 | name: share_public |