Component Translated Untranslated Untranslated words Checks Suggestions Comments
Email This component is linked to the Gancio/Web repository. NLPL 3 Browse
Web NLPL 84% 187 1,315 66 Browse
Project website https://gancio.org
Translation license NLPL Email Web
Number of strings 1,302
Number of words 8,550
Number of characters 62,532
Number of languages 6
Number of source strings 217
Number of source words 1,425
Number of source characters 10,422
Language Translated Strings of total Untranslated Untranslated words Checks Suggestions Comments
Basque 7 Browse
Catalan 20 Browse
English 7 Browse
Italian 16 Browse
Polish 13% 13% 187 1,315 2 Browse
Spanish 17 Browse
admin

Rebased repository

Gancio / Web

Rebased repository 2 months ago
admin

Failed rebase on repository

Gancio / Web

First, rewinding head to replay your work on top of it...
Applying: 0.24.0
.git/rebase-apply/patch:227: trailing whitespace.
- fix #73 
.git/rebase-apply/patch:347: trailing whitespace.
- [feat] new action field for notification 
.git/rebase-apply/patch:8566: trailing whitespace.
  <font-face 
.git/rebase-apply/patch:8579: trailing whitespace.
<missing-glyph horiz-adv-x="896" 
.git/rebase-apply/patch:8581: trailing whitespace.
    <glyph glyph-name=".notdef" horiz-adv-x="896" 
warning: squelched 736 whitespace errors
warning: 741 lines add whitespace errors.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging server/helpers.js
CONFLICT (add/add): Merge conflict in server/helpers.js
Auto-merging pages/event/_id.vue
CONFLICT (add/add): Merge conflict in pages/event/_id.vue
Auto-merging pages/announcement/_id.vue
CONFLICT (add/add): Merge conflict in pages/announcement/_id.vue
Auto-merging package.json
CONFLICT (add/add): Merge conflict in package.json
Auto-merging layouts/default.vue
CONFLICT (add/add): Merge conflict in layouts/default.vue
Auto-merging docs/changelog.md
CONFLICT (add/add): Merge conflict in docs/changelog.md
Auto-merging components/admin/Settings.vue
CONFLICT (add/add): Merge conflict in components/admin/Settings.vue
Auto-merging components/Home.vue
CONFLICT (add/add): Merge conflict in components/Home.vue
Auto-merging components/Event.vue
CONFLICT (add/add): Merge conflict in components/Event.vue
Auto-merging components/Announcement.vue
CONFLICT (add/add): Merge conflict in components/Announcement.vue
Auto-merging assets/style.less
CONFLICT (add/add): Merge conflict in assets/style.less
Auto-merging assets/event.less
CONFLICT (add/add): Merge conflict in assets/event.less
Auto-merging CHANGELOG
CONFLICT (add/add): Merge conflict in CHANGELOG
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 0.24.0

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 months ago
None

Committed changes

Gancio / EmailBasque

Committed changes 2 months ago
None

Committed changes

Gancio / EmailSpanish

Committed changes 2 months ago
None

Committed changes

Gancio / EmailEnglish

Committed changes 2 months ago
None

Committed changes

Gancio / EmailCatalan

Committed changes 2 months ago
lakelogaztetxea

Translation changed

Gancio / EmailCatalan

Ciao, hai richiesto un recupero della password su {{config.title}}. <a href='{{config.baseurl}}/recover/{{user.recover_code}}'>Premi qui</a> per confermare.
Ep, has demanat restablir la contrasenya a {{config.title}}, oi? <a href='{{config.baseurl}}/recover/{{user.recover_code}}'>Clica aquí</a> per a continuar el procés.
2 months ago
lakelogaztetxea

Translation changed

Gancio / EmailCatalan

Ciao, il tuo account su <a href='{{config.baseurl}}'>{{config.title}}</a> è stato confermato. Scrivici a {{config.admin_email}} per qualsiasi informazione e fai a modino.
Ei, el teu compte a <a href='{{config.baseurl}}'>{{config.title}}</a> ha estat confirmat. Escriu-nos a {{config.admin_email}} per qualsevol dubte.
2 months ago
lakelogaztetxea

New contributor

Gancio / EmailCatalan

New contributor 2 months ago
lakelogaztetxea

Translation changed

Gancio / EmailSpanish

Ciao, hai richiesto un recupero della password su {{config.title}}. <a href='{{config.baseurl}}/recover/{{user.recover_code}}'>Premi qui</a> per confermare.
Hola, has pedido recuperar tu contraseña en {{config.title}}. <a href='{{config.baseurl}}/recover/{{user.recover_code}}'>Pulsa aquí</a> para confirmar.
2 months ago
Browse all project changes

Activity in last 30 days

Activity in last year