User avatar tcit

Component locked

Framadate / Framadate

Component locked a year ago
User avatar None

Found duplicated language

Framadate / Framadate 

en (en, en)
a year ago
User avatar None

Rebased repository

Framadate / Framadate

Rebased repository a year ago
User avatar None

Received repository notification

Framadate / Framadate

GitLab: https://framagit.org/framasoft/framadate/framadate, develop a year ago
User avatar None

Failed rebase on repository

Framadate / Framadate v1.1.x 

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (French)
Using index info to reconstruct a base tree...
M	locale/fr.json
Falling back to patching base and 3-way merge...
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (French)

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)
a year ago
User avatar None

Pushed changes

Framadate / Framadate

Pushed changes a year ago
User avatar None

Pushed changes

Framadate / Framadate

Pushed changes a year ago
User avatar None

Failed rebase on repository

Framadate / Framadate v1.1.x 

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (French)
Using index info to reconstruct a base tree...
M	locale/fr.json
Falling back to patching base and 3-way merge...
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (French)

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)
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

Application name
Nome do Aplicativo
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

Administrator mail address
Endereço do administrador
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

Where are my polls?
Onde estão minhas pesquisas?
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

Schedule an event
Planejar um evento
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

Make a standard poll
Criar pesquisa padrão
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

with
com
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

votes
votos
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

vote
voto
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

seconds
segundos
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

months
meses
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

for
para
a year ago
User avatar framabr

New translation

Framadate / Framadate — Portuguese (Brazil)

days
dias
a year ago

Search