Writefreely
/
writefreely
mirror of https://github.com/writeas/writefreely
1
0
Fork 0
Code Issues Releases Wiki Activity

resolving conflicts

This commit is contained in:
aitzol76 2022-12-25 18:31:32 +01:00
parent 7f0c8e99ec
commit e73af4753c
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.go
View File

@ -13,6 +13,7 @@ package writefreely
import (
"crypto/tls"
"database/sql"
_ "embed"
"fmt"
"html/template"
"io/ioutil"
@ -36,12 +37,13 @@ import (
"github.com/writeas/web-core/auth"
"github.com/writeas/web-core/converter"
"github.com/writeas/web-core/log"
"golang.org/x/crypto/acme/autocert"
"github.com/writefreely/writefreely/author"
"github.com/writefreely/writefreely/config"
"github.com/writefreely/writefreely/key"
"github.com/writefreely/writefreely/migrations"
"github.com/writefreely/writefreely/page"
"golang.org/x/crypto/acme/autocert"
"github.com/leonelquinteros/gotext"
)

2
locales/en_UK/LC_MESSAGES/base.po
View File

@ -27,7 +27,7 @@ msgstr "About"
# base.tmpl 49
# header.tmpl 58,65
# footer.tmpl 9,27
# include/footer.tmpl 9,27
# user/include/footer.tmpl 12
# app-settings.tmpl 108
# pages.tmpl 24

2
locales/eu_ES/LC_MESSAGES/base.po
View File

@ -27,7 +27,7 @@ msgstr "Honi buruz"
# base.tmpl 49
# header.tmpl 58,65
# footer.tmpl 9,27
# include/footer.tmpl 9,27
# user/include/footer.tmpl 12
# app-settings.tmpl 108
# pages.tmpl 24