|
311.
|
|
|
Attribute: %1
|
|
|
|
Atributo: %1
|
|
Translated by
André Marcelo Alvarenga
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:161
conflicthandling/conflictresolvedialog.cpp:168
conflicthandling/conflictresolvedialog.cpp:177
|
|
312.
|
|
|
Conflict Resolution
|
Context: |
|
@title:window
|
|
|
|
Resolução de conflito
|
|
Translated by
André Marcelo Alvarenga
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:188
|
|
313.
|
|
|
Take left one
|
|
|
|
Usar o da esquerda
|
|
Translated by
André Marcelo Alvarenga
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:192
|
|
314.
|
|
|
Take right one
|
|
|
|
Usar o da direita
|
|
Translated by
André Marcelo Alvarenga
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:193
|
|
315.
|
|
|
Keep both
|
|
|
|
Manter ambos
|
|
Translated by
André Marcelo Alvarenga
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:194
|
|
316.
|
|
|
Two updates conflict with each other.<nl/>Please choose which update(s) to apply.
|
Context: |
|
@label
|
|
|
|
Existem duas atualizações em conflito entre si.<nl/>Escolha qual(is)atualização(ões) a aplicar.
|
|
Translated by
André Marcelo Alvarenga
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:203
|
|
317.
|
|
|
Data
|
|
|
|
Dados
|
|
Translated by
André Marcelo Alvarenga
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:233
|