<message>
<location filename="../src/gui/conflictdialog.ui" line="46"/>
<source>Local version</source>
- <translation type="unfinished"/>
+ <translation>Version locala</translation>
</message>
<message>
<location filename="../src/gui/conflictdialog.ui" line="57"/>
<location filename="../src/gui/conflictdialog.ui" line="165"/>
<source>Click to open the file</source>
- <translation type="unfinished"/>
+ <translation>Clicar per dobrir lo fichièr</translation>
</message>
<message>
<location filename="../src/gui/conflictdialog.ui" line="96"/>
<location filename="../src/gui/conflictdialog.ui" line="103"/>
<location filename="../src/gui/conflictdialog.ui" line="211"/>
<source>0 byte</source>
- <translation type="unfinished"/>
+ <translation>0 octet</translation>
</message>
<message>
<location filename="../src/gui/conflictdialog.ui" line="110"/>
<source><a href="%1">Open local version</a></source>
- <translation type="unfinished"/>
+ <translation><a href="%1">Dobrir la version local</a></translation>
</message>
<message>
<location filename="../src/gui/conflictdialog.ui" line="154"/>
<message>
<location filename="../src/gui/conflictdialog.ui" line="218"/>
<source><a href="%1">Open server version</a></source>
- <translation type="unfinished"/>
+ <translation><a href="%1">Dobrir la version servidor</a></translation>
</message>
<message>
<location filename="../src/gui/conflictdialog.cpp" line="54"/>
<location filename="../src/gui/conflictdialog.cpp" line="177"/>
<source>Keep selected version</source>
- <translation type="unfinished"/>
+ <translation>Gardar la version seleccionada</translation>
</message>
<message>
<location filename="../src/gui/conflictdialog.cpp" line="148"/>
<source>Open local version</source>
- <translation type="unfinished"/>
+ <translation>Dobrir la version locala</translation>
</message>
<message>
<location filename="../src/gui/conflictdialog.cpp" line="156"/>
<source>Open server version</source>
- <translation type="unfinished"/>
+ <translation>Dobrir la version servidor</translation>
</message>
<message>
<location filename="../src/gui/conflictdialog.cpp" line="174"/>
<source>Keep both versions</source>
- <translation type="unfinished"/>
+ <translation>Gardar las doas versions</translation>
</message>
<message>
<location filename="../src/gui/conflictdialog.cpp" line="175"/>
<source>Keep local version</source>
- <translation type="unfinished"/>
+ <translation>Gardar la version locala</translation>
</message>
<message>
<location filename="../src/gui/conflictdialog.cpp" line="176"/>
<source>Keep server version</source>
- <translation type="unfinished"/>
+ <translation>Gardar la version servidor</translation>
</message>
</context>
<context>
<message>
<location filename="../src/gui/generalsettings.cpp" line="411"/>
<source>Zip Archives</source>
- <translation type="unfinished"/>
+ <translation>Archius ZIP</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="417"/>