From 4c79c51f998fbec0caba3cf20291a9a54916af09 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 9 Oct 2016 21:35:04 +0200 Subject: Fix PostgreSQL migrations --- app/DoctrineMigrations/Version20160410190541.php | 13 +++++++++---- app/DoctrineMigrations/Version20160812120952.php | 13 +++++++++---- app/DoctrineMigrations/Version20160911214952.php | 4 ++-- app/DoctrineMigrations/Version20160916201049.php | 8 ++++---- 4 files changed, 24 insertions(+), 14 deletions(-) (limited to 'app') diff --git a/app/DoctrineMigrations/Version20160410190541.php b/app/DoctrineMigrations/Version20160410190541.php index 4014857b..f034b0e4 100644 --- a/app/DoctrineMigrations/Version20160410190541.php +++ b/app/DoctrineMigrations/Version20160410190541.php @@ -29,8 +29,13 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI */ public function up(Schema $schema) { - $this->addSql('ALTER TABLE `'.$this->getTable('entry').'` ADD `uuid` LONGTEXT DEFAULT NULL'); - $this->addSql("INSERT INTO `".$this->getTable('craue_config_setting')."` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry')"); + if ($this->connection->getDatabasePlatform()->getName() == 'postgresql') { + $this->addSql('ALTER TABLE "'.$this->getTable('entry').'" ADD uuid UUID DEFAULT NULL'); + } else { + $this->addSql('ALTER TABLE "'.$this->getTable('entry').'" ADD uuid LONGTEXT DEFAULT NULL'); + } + + $this->addSql("INSERT INTO \"".$this->getTable('craue_config_setting')."\" (name, value, section) VALUES ('share_public', '1', 'entry')"); } /** @@ -40,7 +45,7 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'sqlite', 'This down migration can\'t be executed on SQLite databases, because SQLite don\'t support DROP COLUMN.'); - $this->addSql('ALTER TABLE `'.$this->getTable('entry').'` DROP `uuid`'); - $this->addSql("DELETE FROM `".$this->getTable('craue_config_setting')."` WHERE `name` = 'share_public'"); + $this->addSql('ALTER TABLE "'.$this->getTable('entry').'" DROP uuid'); + $this->addSql("DELETE FROM \"".$this->getTable('craue_config_setting')."\" WHERE name = 'share_public'"); } } diff --git a/app/DoctrineMigrations/Version20160812120952.php b/app/DoctrineMigrations/Version20160812120952.php index a8d3bcf2..3aafea64 100644 --- a/app/DoctrineMigrations/Version20160812120952.php +++ b/app/DoctrineMigrations/Version20160812120952.php @@ -29,10 +29,15 @@ class Version20160812120952 extends AbstractMigration implements ContainerAwareI */ public function up(Schema $schema) { - if ($this->connection->getDatabasePlatform()->getName() == 'sqlite') { - $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext DEFAULT NULL'); - } else { - $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL'); + switch ($this->connection->getDatabasePlatform()->getName()) { + case 'sqlite': + $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext DEFAULT NULL'); + break; + case 'mysql': + $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL'); + break; + case 'postgresql': + $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name text DEFAULT NULL'); } } diff --git a/app/DoctrineMigrations/Version20160911214952.php b/app/DoctrineMigrations/Version20160911214952.php index 35809cec..f14f7bc6 100644 --- a/app/DoctrineMigrations/Version20160911214952.php +++ b/app/DoctrineMigrations/Version20160911214952.php @@ -29,8 +29,8 @@ class Version20160911214952 extends AbstractMigration implements ContainerAwareI */ public function up(Schema $schema) { - $this->addSql('INSERT INTO `'.$this->getTable('craue_config_setting').'` (`name`, `value`, `section`) VALUES (\'import_with_redis\', \'0\', \'import\')'); - $this->addSql('INSERT INTO `'.$this->getTable('craue_config_setting').'` (`name`, `value`, `section`) VALUES (\'import_with_rabbitmq\', \'0\', \'import\')'); + $this->addSql('INSERT INTO "'.$this->getTable('craue_config_setting').'" (name, value, section) VALUES (\'import_with_redis\', \'0\', \'import\')'); + $this->addSql('INSERT INTO "'.$this->getTable('craue_config_setting').'" (name, value, section) VALUES (\'import_with_rabbitmq\', \'0\', \'import\')'); } /** diff --git a/app/DoctrineMigrations/Version20160916201049.php b/app/DoctrineMigrations/Version20160916201049.php index 202901e6..0d2edf9e 100644 --- a/app/DoctrineMigrations/Version20160916201049.php +++ b/app/DoctrineMigrations/Version20160916201049.php @@ -29,8 +29,8 @@ class Version20160916201049 extends AbstractMigration implements ContainerAwareI */ public function up(Schema $schema) { - $this->addSql('ALTER TABLE '.$this->getTable('config').' ADD pocket_consumer_key VARCHAR(255) DEFAULT NULL'); - $this->addSql("DELETE FROM `".$this->getTable('craue_config_setting')."` WHERE `name` = 'pocket_consumer_key';"); + $this->addSql('ALTER TABLE "'.$this->getTable('config').'" ADD pocket_consumer_key VARCHAR(255) DEFAULT NULL'); + $this->addSql("DELETE FROM \"".$this->getTable('craue_config_setting')."\" WHERE name = 'pocket_consumer_key';"); } /** @@ -40,7 +40,7 @@ class Version20160916201049 extends AbstractMigration implements ContainerAwareI { $this->abortIf($this->connection->getDatabasePlatform()->getName() == 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.'); - $this->addSql('ALTER TABLE `'.$this->getTable('config').'` DROP pocket_consumer_key'); - $this->addSql("INSERT INTO `".$this->getTable('craue_config_setting')."` (`name`, `value`, `section`) VALUES ('pocket_consumer_key', NULL, 'import')"); + $this->addSql('ALTER TABLE "'.$this->getTable('config').'" DROP pocket_consumer_key'); + $this->addSql("INSERT INTO \"".$this->getTable('craue_config_setting')."\" (name, value, section) VALUES ('pocket_consumer_key', NULL, 'import')"); } } -- cgit v1.2.3 From 38dc91be8ed04f14c180a729a0deb7a57e5cc64a Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Sat, 15 Oct 2016 11:17:55 +0300 Subject: Improved side menu, reduced the font size on small screens, fixed a form to add links on small screens --- app/Resources/static/themes/material/css/main.css | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index d91b469f..7c83d45d 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -360,6 +360,10 @@ span.numberItems { float: right; } +nav ul a:hover { + background-color: initial; +} + /* ========================================================================== * 3 = Filters slider * ========================================================================== */ @@ -522,7 +526,7 @@ main ul.row { } #article > header > h1 { - font-size: 2em; + font-size: 1.6em; } .reader-mode { @@ -603,6 +607,18 @@ main ul.row { width: auto; } + #article { + padding: 15px; + max-width: 35em; + margin-left: auto; + margin-right: auto; + font-size: 18px; + } + + #article > header > h1 { + font-size: 1.33em; + } + .reader-mode { width: 240px !important; } @@ -760,3 +776,7 @@ div.settings div.file-field div { .input-field label.active { font-size: 1rem; } + +nav .input-field input { + margin: 0; +} -- cgit v1.2.3 From 08f5a5b6bd4442b8aaed597fedbea5fc87cfc3cf Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 15 Oct 2016 15:25:46 +0200 Subject: fix stylelint --- app/Resources/static/themes/material/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 7c83d45d..2cc2e8a0 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -361,7 +361,7 @@ span.numberItems { } nav ul a:hover { - background-color: initial; + background-color: initial; } /* ========================================================================== -- cgit v1.2.3 From d32e1c424adb6722706245fe91071594a8c7c826 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 15 Oct 2016 19:04:53 +0200 Subject: Fix baggy on small screens --- app/Resources/static/themes/baggy/css/main.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app') diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 61e7b22a..44db2070 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -1192,6 +1192,14 @@ pre code { } } +@media screen and (max-height: 770px) { + .menu.users, + .menu.internal, + .menu.developer { + display: none; + } +} + @media screen and (max-width: 500px) { .entry { width: 100%; -- cgit v1.2.3 From d9a30ef30141e86b3cf609aa0b559ccdbf6caf94 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 15 Oct 2016 19:26:38 +0200 Subject: Fix tabs on material Signed-off-by: Thomas Citharel --- app/Resources/CraueConfigBundle/views/Settings/modify.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig b/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig index f44db420..179986cf 100644 --- a/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig +++ b/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig @@ -13,7 +13,7 @@
-- cgit v1.2.3 From 5bd7acd50da83726077fc7c17b65df9438ef3c2d Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Sun, 16 Oct 2016 10:45:51 +0200 Subject: German: improve existing and add missing translation --- .../CraueConfigBundle/translations/CraueConfigBundle.de.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml index eaba14cd..b3412af7 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml @@ -2,14 +2,14 @@ download_pictures: Bilder auf den Server herunterladen carrot: Teilen zu Carrot aktivieren diaspora_url: Diaspora-URL, sofern der Service aktiviert ist export_epub: ePUB-Export aktivieren -export_mobi: .mobi-Export aktivieren +export_mobi: mobi-Export aktivieren export_pdf: PDF-Export aktivieren export_csv: CSV-Export aktivieren export_json: JSON-Export aktivieren export_txt: TXT-Export aktivieren export_xml: XML-Export aktivieren -# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously -# import_with_redis: Enable Redis to import data asynchronously +import_with_rabbitmq: Aktiviere RabbitMQ, um Artikel asynchron zu importieren +import_with_redis: Aktiviere Redis, um Artikel asynchron zu importieren shaarli_url: Shaarli-URL, sofern der Service aktiviert ist share_diaspora: Teilen zu Diaspora aktiveren share_mail: Teilen via E-Mail aktiveren @@ -28,4 +28,4 @@ piwik_site_id: ID deiner Webseite in Piwik piwik_enabled: Piwik aktivieren demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)" demo_mode_username: "Test-Benutzer" -# share_public: Allow public url for entries +share_public: Erlaube eine öffentliche URL für Einträge -- cgit v1.2.3 From 5e469b91d9da6d3061524899cec241ca94236fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 17 Oct 2016 09:14:05 +0200 Subject: Fixed hardcoded title for internal settings Fix #2458 --- app/Resources/CraueConfigBundle/views/Settings/modify.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig b/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig index 179986cf..c4e735ee 100644 --- a/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig +++ b/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig @@ -1,6 +1,6 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} -{% block title %}{% trans %}internal settings{% endtrans %}{% endblock %} +{% block title %}{{ 'menu.left.internal_settings'|trans }}{% endblock %} {% block content %}
-- cgit v1.2.3 From ef2271160591976b30ff1ed588d39186837361d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 15 Oct 2016 15:52:05 +0200 Subject: Prepare wallabag 2.1.2 :rocket: --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/config/config.yml b/app/config/config.yml index bcc4c8eb..ed2e7416 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.1.2-dev + version: 2.1.2 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' -- cgit v1.2.3 From f31361a6d938e363e6164f4f1401e66ce4fb2a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 17 Oct 2016 11:56:29 +0200 Subject: Update wallabag version for master branch --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/config/config.yml b/app/config/config.yml index ed2e7416..5127c8cf 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.1.2 + version: 2.1.3-dev paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' -- cgit v1.2.3 From 2297d60f100effc1bf4300488a170a6bed3ae756 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 20 Oct 2016 22:49:46 +0200 Subject: =?UTF-8?q?If=20reload=20content=20failed,=20don=E2=80=99t=20updat?= =?UTF-8?q?e=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content. --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/config/config.yml b/app/config/config.yml index 5127c8cf..a56cbdd9 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -50,6 +50,7 @@ wallabag_core: rss_limit: 50 reading_speed: 1 cache_lifetime: 10 + fetching_error_message: "wallabag can't retrieve contents for this article. Please report this issue to us." wallabag_user: registration_enabled: "%fosuser_registration%" -- cgit v1.2.3 From 2cbf0d05d4c342604a46dd7b1ce4c7321e3d97ae Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 21 Oct 2016 10:45:39 +0200 Subject: Update translation for piwik_host --- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml | 2 +- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml | 2 +- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml | 2 +- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml | 2 +- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml | 2 +- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml | 2 +- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml | 2 +- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml | 2 +- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml | 2 +- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml | 2 +- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'app') diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml index 85079330..3e11d675 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml @@ -23,7 +23,7 @@ export: "eksport" import: "import" misc: "misc" modify_settings: "Gem ændring" -piwik_host: Hosting af din side hos Piwik +piwik_host: Hosting af din side hos Piwik (uden http:// eller https://) piwik_site_id: ID for din side hos Piwik piwik_enabled: Aktiver Piwik demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)" diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml index b3412af7..c74b5c1f 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml @@ -23,7 +23,7 @@ export: "Export" import: "Import" misc: "Verschiedenes" modify_settings: "Übernehmen" -piwik_host: Host deiner Webseite in Piwik +piwik_host: Host deiner Webseite in Piwik (ohne http:// oder https://) piwik_site_id: ID deiner Webseite in Piwik piwik_enabled: Piwik aktivieren demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)" diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index 8aaa27e7..77c09db4 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml @@ -23,7 +23,7 @@ export: "export" import: "import" misc: "misc" modify_settings: "apply" -piwik_host: Host of your website in Piwik +piwik_host: Host of your website in Piwik (without http:// ou https://) piwik_site_id: ID of your website in Piwik piwik_enabled: Enable Piwik demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml index bf3a79af..baa83849 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml @@ -23,7 +23,7 @@ export: "exportar" import: "importar" misc: "misc" modify_settings: "modificar configuración" -piwik_host: Host de tu website de Piwik +piwik_host: Host de tu website de Piwik (sin http:// o https://) piwik_site_id: ID de tu website de Piwik piwik_enabled: Activar Piwik demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)" diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml index d86c4343..b394977e 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml @@ -23,7 +23,7 @@ export: "برون‌سپاری" import: "درون‌ریزی" misc: "غیره" modify_settings: "اعمال" -# piwik_host: Host of your website in Piwik +# piwik_host: Host of your website in Piwik (without http:// or https://) # piwik_site_id: ID of your website in Piwik # piwik_enabled: Enable Piwik # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml index 5e1ecf26..31a80880 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml @@ -23,7 +23,7 @@ export: "export" import: "import" misc: "divers" modify_settings: "appliquer" -piwik_host: URL de votre site dans Piwik +piwik_host: URL de votre site dans Piwik (sans http:// ou https://) piwik_site_id: ID de votre site dans Piwik piwik_enabled: Activer Piwik demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)" diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml index 9d820e4b..ba038556 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml @@ -23,7 +23,7 @@ export: "esporta" import: "importa" misc: "misc" modify_settings: "applica" -piwik_host: Host del tuo sito in Piwik +piwik_host: Host del tuo sito in Piwik (senza http:// o https://) piwik_site_id: ID del tuo sito in Piwik piwik_enabled: Abilita Piwik demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)" diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml index 49dc7732..55249e33 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml @@ -23,7 +23,7 @@ export: "expòrt" import: "impòrt" misc: "divèrs" modify_settings: "aplicar" -piwik_host: URL de vòstre site dins Piwik +piwik_host: URL de vòstre site dins Piwik (sense http:// o https://) piwik_site_id: ID de vòstre site dins Piwik piwik_enabled: Activar Piwik demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)" diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml index 7432b0a7..42cc5b52 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml @@ -23,7 +23,7 @@ export: "eksport" import: "import" misc: "różne" modify_settings: "zatwierdz" -piwik_host: Host twojej strony Piwik +piwik_host: Host twojej strony Piwik (bez http:// lub https://) piwik_site_id: ID twojej strony Piwik piwik_enabled: Włacz Piwik demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)" diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml index 20d664f7..8e72b955 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml @@ -23,7 +23,7 @@ export: "exportă" import: "importă" misc: "diverse" modify_settings: "aplică" -# piwik_host: Host of your website in Piwik +# piwik_host: Host of your website in Piwik (without http:// or https://) # piwik_site_id: ID of your website in Piwik # piwik_enabled: Enable Piwik # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml index 4b4d3edb..55f70843 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml @@ -23,7 +23,7 @@ # import: "import" # misc: "misc" # modify_settings: "apply" -# piwik_host: Host of your website in Piwik +# piwik_host: Host of your website in Piwik (without http:// or https://) # piwik_site_id: ID of your website in Piwik # piwik_enabled: Enable Piwik # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" -- cgit v1.2.3