From genghiskhan at gmx.ca Mon Jun 10 13:59:46 2013 From: genghiskhan at gmx.ca (Genghis Khan) Date: Mon, 10 Jun 2013 13:59:46 +0200 Subject: [Localization] Fw: [Development] Qt 4.8.x Hebrew Translation Update Message-ID: <20130610115947.300570@gmx.com> Begin forwarded message: Date: Sat, 08 Jun 2013 13:28:50 -0400 From: "Genghis Khan" To: development at qt-project.org Cc: Diego Iastrubni Subject: [Development] Qt 4.8.x Hebrew Translation Update Hello, Herein attached a Hebrew translation file for Qt 4.8.x. I am having trouble with over 400 left strings and I need to consult with Diego Iastrubni and perhaps with others concerning these strings. If there is no respond from Mr. Diego Iastrubni (Cc), please submit the translation file qt_he.ts.origin.gz which is the original file Diego sent to me on December 1st, 2012 (copyright information is old). http://lists.qt-project.org/pipermail/development/2013-January/009639.html Both files are in a usable state. Regards, --GK. -- Proper English www.reddit.com/r/proper 4 teh lulz... http://email.is-not-s.ms -------------- next part -------------- A non-text attachment was scrubbed... Name: qt_he.ts.gz Type: application/x-gzip Size: 35594 bytes Desc: not available URL: -------------- next part -------------- _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development From sergio.ahumada at digia.com Mon Jun 10 14:01:39 2013 From: sergio.ahumada at digia.com (Sergio Ahumada) Date: Mon, 10 Jun 2013 14:01:39 +0200 Subject: [Localization] Fw: [Development] Qt 4.8.x Hebrew Translation Update In-Reply-To: <20130610115947.300570@gmx.com> References: <20130610115947.300570@gmx.com> Message-ID: <51B5C023.80805@digia.com> On 06/10/2013 01:59 PM, Genghis Khan wrote: > Begin forwarded message: > > Date: Sat, 08 Jun 2013 13:28:50 -0400 > From: "Genghis Khan" > To: development at qt-project.org > Cc: Diego Iastrubni > Subject: [Development] Qt 4.8.x Hebrew Translation Update > > > Hello, > > Herein attached a Hebrew translation file for Qt 4.8.x. > > I am having trouble with over 400 left strings and I need to consult > with Diego Iastrubni and perhaps with others concerning these strings. > > If there is no respond from Mr. Diego Iastrubni (Cc), please submit > the translation file qt_he.ts.origin.gz which is the original file > Diego sent to me on December 1st, 2012 (copyright information is old). > http://lists.qt-project.org/pipermail/development/2013-January/009639.html > > Both files are in a usable state. > > Regards, > --GK. Hi, You need to push your translations to Gerrit Nobody will take them from your email and pushed them to gerrit on your behalf, this is something you need to do. Cheers, -- Sergio Ahumada Release Engineer - Digia, Qt From guillaume.belz at free.fr Sat Jun 22 11:29:51 2013 From: guillaume.belz at free.fr (guillaume.belz at free.fr) Date: Sat, 22 Jun 2013 11:29:51 +0200 (CEST) Subject: [Localization] French translation Message-ID: <1382999820.248019347.1371893391842.JavaMail.root@zimbra61-e11.priv.proxad.net> 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 at 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 -------------- next part -------------- An HTML attachment was scrubbed... URL: From guillaume.belz at free.fr Tue Jun 25 09:55:25 2013 From: guillaume.belz at free.fr (guillaume.belz at free.fr) Date: Tue, 25 Jun 2013 09:55:25 +0200 (CEST) Subject: [Localization] French translation In-Reply-To: <1382999820.248019347.1371893391842.JavaMail.root@zimbra61-e11.priv.proxad.net> Message-ID: <1619547386.256591509.1372146925113.JavaMail.root@zimbra61-e11.priv.proxad.net> 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 ..." to unstage) # # modified: share/qtcreator/translations/qtcreator_fr.ts # # Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: src/plugins/debugger/gdb/gdboptionspage.cpp # # Untracked files: # (use "git add ..." 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 at 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 at 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 ----- Mail original ----- > De: "guillaume belz" > À: 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 at 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: From Liang.Qi at digia.com Tue Jun 25 10:05:00 2013 From: Liang.Qi at digia.com (Qi Liang) Date: Tue, 25 Jun 2013 08:05:00 +0000 Subject: [Localization] French translation In-Reply-To: <1619547386.256591509.1372146925113.JavaMail.root@zimbra61-e11.priv.proxad.net> References: <1382999820.248019347.1371893391842.JavaMail.root@zimbra61-e11.priv.proxad.net>, <1619547386.256591509.1372146925113.JavaMail.root@zimbra61-e11.priv.proxad.net> Message-ID: 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 ..." to unstage) # # modified: share/qtcreator/translations/qtcreator_fr.ts # # Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: src/plugins/debugger/gdb/gdboptionspage.cpp # # Untracked files: # (use "git add ..." 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 at 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 at 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" À: 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 at 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: From sergio.ahumada at digia.com Tue Jun 25 10:08:11 2013 From: sergio.ahumada at digia.com (Sergio Ahumada) Date: Tue, 25 Jun 2013 10:08:11 +0200 Subject: [Localization] French translation In-Reply-To: <1619547386.256591509.1372146925113.JavaMail.root@zimbra61-e11.priv.proxad.net> References: <1619547386.256591509.1372146925113.JavaMail.root@zimbra61-e11.priv.proxad.net> Message-ID: <51C94FEB.4000205@digia.com> > > 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. > Hi, Try with: git push origin HEAD:refs/for/2.8 as the message says .. you are probably missing the "remote" (origin) Cheers, -- Sergio Ahumada Release Engineer - Digia, Qt From guillaume.belz at free.fr Tue Jun 25 15:15:08 2013 From: guillaume.belz at free.fr (guillaume.belz at free.fr) Date: Tue, 25 Jun 2013 15:15:08 +0200 (CEST) Subject: [Localization] French translation In-Reply-To: <51C94FEB.4000205@digia.com> Message-ID: <246894854.257518195.1372166108602.JavaMail.root@zimbra61-e11.priv.proxad.net> Ok, it's work (I hope without error) @Liang I was already registred Thanks ----- Mail original ----- > De: "Sergio Ahumada" > À: localization at qt-project.org > Envoyé: Mardi 25 Juin 2013 10:08:11 > Objet: Re: [Localization] French translation > > > > > 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. > > > > Hi, > > Try with: > > git push origin HEAD:refs/for/2.8 > > as the message says .. you are probably missing the "remote" (origin) > > Cheers, > -- > Sergio Ahumada > Release Engineer - Digia, Qt > _______________________________________________ > Localization mailing list > Localization at qt-project.org > http://lists.qt-project.org/mailman/listinfo/localization >