SUSE Linux Enterprise 12 SP3 translation will start soon, and
translators will be hired. As Weblate does not support branch based
string freezes, we have to lock some translations.
Please do your edits now, or postpone them after the unlock. For fixes,
please use suggestions.
Affected projects:
libzypp, zypper: These projects now have only one branch that will be
deployed simultaneously on both Factory/Tumbleweed and SLE12 SP3.
yast-slide-show: This project has a separate branch for SLE12 SP2 and
master (Factory/Tumbleweed), and will probably have for SLE12 SP3.
Affected languages:
ar Arabic
pt_BR Brazilian Portuguese
zh_CN Chinese Simplified
zh_TW Chinese Traditional
cs Czech
nl Dutch
fr French
de German
hu Hungarian
it Italian
ja Japanese
ko Korean
pl Polish
ru Russian
es Spanish
sv Swedish
--
Best Regards / S pozdravem,
Stanislav Brabec
software developer
---------------------------------------------------------------------
SUSE LINUX, s. r. o. e-mail: sbrabec(a)suse.com
Křižíkova 148/34 (Corso IIa) tel: +49 911 7405384547
186 00 Praha 8-Karlín fax: +420 284 084 001
Czech Republic http://www.suse.cz/
PGP: 830B 40D5 9E05 35D8 5E27 6FA3 717C 209F A04F CD76
--
To unsubscribe, e-mail: opensuse-translation+unsubscribe(a)opensuse.org
To contact the owner, e-mail: opensuse-translation+owner(a)opensuse.org
Hi,
How can I know what is the conflict and how to correct it?
Regards,
Luiz
---------- Forwarded message ----------
From: <weblate-noreply(a)opensuse.org>
Date: 2017-03-10 12:04 GMT-03:00
Subject: [openSUSE Weblate] Falha de mesclagem em landing-page/master
To: elchevive68(a)gmail.com
Olá,
Houve uma falha na mesclagem de landing-page/master em openSUSE Weblate.
Mensagem de erro
Auto-merging po/pt_BR.po
CONFLICT (content): Merge conflict in po/pt_BR.po
Automatic merge failed; fix conflicts and then commit the result. (1)
Status do repositório
On branch master
Your branch and 'origin/master' have diverged,
and have 2 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")
Changes to be committed:
modified: assets/js/langpack/ca.json
modified: assets/js/langpack/de.json
modified: assets/js/langpack/ja.json
modified: assets/js/langpack/nl.json
modified: assets/js/langpack/ru.json
modified: index.html
modified: po/ar.po
modified: po/ast.po
modified: po/ca.po
modified: po/cs.po
modified: po/da.po
modified: po/de.po
modified: po/el.po
modified: po/es.po
modified: po/fa.po
modified: po/fr.po
modified: po/gl.po
modified: po/hy.po
modified: po/id.po
modified: po/it.po
modified: po/ja.po
modified: po/ko.po
modified: po/lt.po
modified: po/nl.po
modified: po/nn.po
modified: po/opensuse-landing-page.pot
modified: po/pl.po
modified: po/ru.po
modified: po/sk.po
modified: po/sv.po
modified: po/uk.po
modified: po/zh_CN.po
modified: po/zh_TW.po
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: po/pt_BR.po
Veja nossa FAQ para informações sobre como resolver isso.
Enviado pelo sistema de tradução Weblate
https://l10n.opensuse.org/
Alterar as configurações de assinatura
--
To unsubscribe, e-mail: opensuse-translation+unsubscribe(a)opensuse.org
To contact the owner, e-mail: opensuse-translation+owner(a)opensuse.org
2017-03-07 13:59 GMT-03:00 David Medina <medipas(a)gmail.com>:
> Hello,
>
>>Some strings are difficult to translate because they split the
> sentence with no translatabe parts.
>
> Yes, and now that I have seen a preview of the page, I have realized that a
> great number of the translations I have done are wrong because of this. As
> they are, once applied, they would make no sense. To get it right, now, is
> going to be like solving a puzzle...
>
> Why not make a paragraph = string?
>
> I prefer doing it again from scratch than try to locate every single part
> searching it from the preview.
>
> Please, make it easier!
>
> Thanks for your attention,
>
> David
> Catalan team
>
>
> 2017-03-07 17:32 GMT+01:00 Luiz Fernando Ranghetti <elchevive68(a)gmail.com>:
>>
>> Hi,
>>
>> Some strings are difficult to translate because they split the
>> sentence with no translatabe parts, like this:
>>
>>
>> https://github.com/openSUSE/software-o-o/blob/master/app/views/distribution…
>>
>> <%= _('Unsupported') %> LiveUSBs
>>
>> Only the unsupported is translated but, for example, in pt_BR the
>> order in the sentence is inverse:
>>
>> translation right now: Não suportados LiveUSBs
>> correct transalation: LiveUSBs não suportados
>>
>>
>> Another one is:
>>
>>
>> https://github.com/openSUSE/software-o-o/blob/master/app/views/distribution…
>>
>> <%= _('Please review') %>
>> <a href="https://openqa.opensuse.org/">openQA’s</a>
>> <%= _('test results if you want an indication whether these LiveUSBs are
>> working as expected.') %>
>>
>> openQA's is untranslatable, in pt_BR it doesn't have the 's, and at
>> least in this string I manage to put the part that goes before
>> openQA's in pt_BR in the string pleaser review.
>>
>> Regards,
>>
>> Luiz
>>
>> 2017-03-07 10:44 GMT-03:00 Ludwig Nussel <ludwig.nussel(a)suse.de>:
>> > Ludwig Nussel wrote:
>> >>
>> >> As some have already noticed, software.opensuse.org is now in
>> >> Weblate¹. Before you jump on it please be aware that the current
>> >> entry page is meant to be replaced by a new version². So if you
>> >
>> >
>> > If there's anyone here with a clue about rails and localization it would
>> > be good take a look the way how automatic language detection works in
>> > this app. It doesn't work well AFAICT
>> > https://github.com/openSUSE/software-o-o/issues/131
>> >
>> > cu
>> > Ludwig
>> >
>> > --
>> > (o_ Ludwig Nussel
>> > //\
>> > V_/_ http://www.suse.com/
>> > SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard,
>> > Graham Norton, HRB 21284 (AG Nürnberg)
>> > --
Bug reported: https://github.com/openSUSE/software-o-o/issues/132
Regards
Luiz
--
To unsubscribe, e-mail: opensuse-translation+unsubscribe(a)opensuse.org
To contact the owner, e-mail: opensuse-translation+owner(a)opensuse.org
Hi,
As some have already noticed, software.opensuse.org is now in
Weblate¹. Before you jump on it please be aware that the current
entry page is meant to be replaced by a new version². So if you
start translating I'd suggest to concentrate on the new page.
The strings for that can be identified via the "source string
location". The new files are in app/views/distribution.
cu
Ludwig
[1] https://l10n.opensuse.org/projects/software-o-o/
[2] https://software.opensuse.org/distributions
--
(o_ Ludwig Nussel
//\
V_/_ http://www.suse.com/
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard,
Graham Norton, HRB 21284 (AG Nürnberg)
--
To unsubscribe, e-mail: opensuse-translation+unsubscribe(a)opensuse.org
To contact the owner, e-mail: opensuse-translation+owner(a)opensuse.org