pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2481 from wallabag/some-fixes

Browse Source 
Some fixes
This commit is contained in:
Nicolas Lœuillet
2016-10-21 15:15:41 +02:00
committed by GitHub
parent 49dee2d2de b64d8f2c9f
commit f99ddbc6f8
29 changed files with 68 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
View File

@ -445,6 +445,9 @@ user:
# delete_confirm: Are you sure?
# back_to_list: Back to list
error:
# page_title: An error occurred
flashes:
config:
notice:

3
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
View File

@ -445,6 +445,9 @@ user:
delete_confirm: Bist du sicher?
back_to_list: Zurück zur Liste
error:
# page_title: An error occurred
flashes:
config:
notice:

3
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
View File

@ -445,6 +445,9 @@ user:
delete_confirm: Are you sure?
back_to_list: Back to list
error:
page_title: An error occurred
flashes:
config:
notice:

3
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
View File

@ -445,6 +445,9 @@ user:
# delete_confirm: Are you sure?
# back_to_list: Back to list
error:
# page_title: An error occurred
flashes:
config:
notice:

3
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
View File

@ -444,6 +444,9 @@ user:
# delete_confirm: Are you sure?
# back_to_list: Back to list
error:
# page_title: An error occurred
flashes:
config:
notice:

5
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
View File

@ -365,7 +365,7 @@ import:
how_to: "Choisissez le fichier de sauvegarde de vos marques-page et cliquez sur le bouton pour l'importer. Soyez avertis que le processus peut prendre un temps assez long car tous les articles doivent être récupérés en ligne."
instapaper:
page_title: 'Import > Instapaper'
description: 'Sur la page des paramètres (`https://www.instapaper.com/user<https://www.instapaper.com/user>`_), cliquez sur "Download .CSV file" dans la section "Export". Un fichier CSV se téléchargera ("instapaper-export.csv").'
description: 'Sur la page des paramètres (https://www.instapaper.com/user), cliquez sur "Download .CSV file" dans la section "Export". Un fichier CSV se téléchargera ("instapaper-export.csv").'
how_to: "Choisissez le fichier de votre export Instapaper et cliquez sur le bouton ci-dessous pour l'importer."
developer:
@ -445,6 +445,9 @@ user:
delete_confirm: Êtes-vous sûr?
back_to_list: Revenir à la liste
error:
page_title: Une erreur est survenue
flashes:
config:
notice:

3
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
View File

@ -445,6 +445,9 @@ user:
# delete_confirm: Are you sure?
# back_to_list: Back to list
error:
# page_title: An error occurred
flashes:
config:
notice:

3
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
View File

@ -445,6 +445,9 @@ user:
# delete_confirm: Are you sure?
# back_to_list: Back to list
error:
# page_title: An error occurred
flashes:
config:
notice:

3
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
View File

@ -445,6 +445,9 @@ user:
delete_confirm: Jesteś pewien?
back_to_list: Powrót do listy
error:
# page_title: An error occurred
flashes:
config:
notice:

3
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
View File

@ -445,6 +445,9 @@ user:
# delete_confirm: Are you sure?
# back_to_list: Back to list
error:
# page_title: An error occurred
flashes:
config:
notice:

3
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
View File

@ -444,6 +444,9 @@ user:
# delete_confirm: Are you sure?
# back_to_list: Back to list
error:
# page_title: An error occurred
flashes:
config:
notice:

2
src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
View File

@ -39,7 +39,7 @@
<meta name="twitter:image" content="{{ picturePath }}" />
<meta name="twitter:site" content="@wallabagapp" />
<meta name="twitter:title" content="{{ entry.title | raw }}" />
<meta name="twitter:description" content="{{ entry.title | raw }}" />
<meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;" />
</head>
<body>
<header>