[Localization] French translation

[Qi Liang]

Hi, Guillaume,

1. You can't push to the qt-creator repo directly, you need to get review in gerrit, more info in
http://qt-project.org/wiki/Setting-up-Gerrit

You need to do sth like "git push gerrit HEAD:refs/for/2.8".

2. For translation files, there is a bit extra work to do:
"make commit-ts" or "lconvert -locations none -i yours.ts -o yours.ts; git commit"

http://qt-project.org/wiki/Qt-Localization

Regards,
Liang

________________________________
From: guillaume.belz
Sent: Tuesday, June 25, 2013 9:55 AM
To: localization at qt-project.org
Subject: Re: [Localization] French translation

Hi,

French translation of Qt Creator 2.8 are done and review at 90 %. Alexandre Laurent will finish and push this week.
I translate other TS file of Qt, but I failled to push. CAn you explain what I miss ?

For Qt Creator :

> guillaume at guillaume-PC:/data/Dev/qt-creator$ git checkout 2.8
Switched to branch '2.8'
Your branch is behind 'origin/2.8' by 21 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

> guillaume at guillaume-PC:/data/Dev/qt-creator$ git pull

> guillaume at guillaume-PC:/data/Dev/qt-creator$ git add share/qtcreator/translations/qtcreator_fr.ts

> guillaume at guillaume-PC:/data/Dev/qt-creator$ git status
# On branch 2.8
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
# modified:   share/qtcreator/translations/qtcreator_fr.ts
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified:   src/plugins/debugger/gdb/gdboptionspage.cpp
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#

> guillaume at guillaume-PC:/data/Dev/qt-creator$ git commit -m "update french translation"
[2.8 67193af] update french translation
 1 file changed, 7638 insertions(+), 631 deletions(-)

> guillaume at guillaume-PC:/data/Dev/qt-creator$ git push
Counting objects: 11, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 52.19 KiB, done.
Total 6 (delta 4), reused 0 (delta 0)
remote: Resolving deltas:   0% (0/4)
To ssh://gbdivers@codereview.qt-project.org:29418/qt-creator/qt-creator
 ! [remote rejected] 2.8 -> 2.8 (prohibited by Gerrit)
error: failed to push some refs to 'ssh://gbdivers@codereview.qt-project.org:29418/qt-creator/qt-creator'

I have also try to push with branch :

> guillaume at guillaume-PC:/data/Dev/qt-creator$ git push HEAD:refs/for/2.8
fatal: You are pushing to remote 'HEAD:refs/for/2.8', which is not the upstream of
your current branch '2.8', without telling me what to push
to update which remote branch.


I also try to push the trads in qttranslations (assistant_fr.ts, designer_fr.ts, linguist_fr.ts, qtquick1_fr.ts). I must push to what branch? (v5.1.0-rc1?)
And how? Same procedure as for Qt Creator?
I feel that there are ts files that are not available on the ftp (qtdeclarative, qthelp). And there is nothing to bring in qt-fr.ts, is this normal?

Thanks,
Guillaume

________________________________
De: "guillaume belz" <guillaume.belz at free.fr>
À: localization at qt-project.org
Envoyé: Samedi 22 Juin 2013 11:29:51
Objet: [Localization] French translation

Hi,

We have begin to update french translation of Qt Creator. In same time, we launch translation of other ts in Qt.
I have used xxx_fr.ts from ftp://ftp.qt-project.org/qt/l10n/index.html for Qt 5.1 version. It's ok or we must use Qt 5.0 version ?
You want we push all in one patch (within https://codereview.qt-project.org/#change,59436) ? One patch for each ts file ? Each personne push in unique patch ?

Can remember how to push in same patch ? For pull patch, I use code from codereview :
git fetch ssh://gbdivers@codereview.qt-project.org:29418/qt-creator/qt-creator refs/changes/36/59436/1 && git checkout FETCH_HEAD
git pull
but when I want to push, I have error (non branch avaibile)

Thanks
Guillaume

_______________________________________________
Localization mailing list
Localization at qt-project.org
http://lists.qt-project.org/mailman/listinfo/localization

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/localization/attachments/20130625/0df14a2e/attachment.html>