Re: Unable to push to git repository. utf-8 bug in git?

2011-12-29 Thread �smund Skj�veland
>   $ git pull --rebase
>   First, rewinding head to replay your work on top of it...
>   /sw/lib/git-core/git-am: line 682: Stuestøl: command not found
>   Patch does not have a valid e-mail address.
> 

I removed my commits with 'git reset --hard HEAD^', rebased and
commited the file again, and this time it worked. So problem solved,
even if the error message was strange.

-- 
Åsmund Skjæveland




pgp0SU1Dnsi3s.pgp
Description: PGP signature
___
gnome-i18n mailing list
gnome-i18n@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-i18n


Unable to push to git repository. utf-8 bug in git?

2011-12-29 Thread Åsmund Skjæveland
I am trying to push commits to gimp-nn.po.

For reference, this is the git command I used:

  $ git commit --author 'Kolbjørn Stuestøl ' -m 
'Updated Norwegian Nynorsk translation'

I then used cherry-pick to commit the same fix to both master and
gimp-2-6 branches.

I had cloned the repo a couple of days ago, and forgot to rebase
before I committed the changed file. As one would expect, my push
failed because the remote repo had new patches. So I tried to rebase.

  $ git pull --rebase
  First, rewinding head to replay your work on top of it...
  /sw/lib/git-core/git-am: line 682: Stuestøl: command not found
  Patch does not have a valid e-mail address.

What happens here? My guess would be that git somehow chokes on the
non-ascii characters in the author name when doing string splitting.
Or am I doing something wrong?

Git 1.7.8, installed via Fink. Mac OS 10.5.8.

-- 
Åsmund Skjæveland


pgp4qUbPAwDcG.pgp
Description: PGP signature
___
gnome-i18n mailing list
gnome-i18n@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-i18n


Re: PO files headers and DL

2011-12-29 Thread Daniel Mustieles García
What about this issue?

Is there any possibility to add headers to PO files? It could be possible,
at least, to add this header just to es.po files? It woulb be very useful
for me and for other translators/coordinators, and it is completely
transparent for translations (just note the X-Generator header added by
Kbabel or PoEdit).

Many thanks and Merry X-Mas

El 13 de diciembre de 2011 16:45, Daniel Mustieles García <
daniel.mustie...@gmail.com> escribió:

> Headers can be split in two (or more) lines? I this case, how could a bash
> script get the full path?
>
> Thanks for your comment :)
>
>
> 2011/12/13 F Wolff 
>
>>
>> Op So, 2011-12-11 om 10:57 +0100 skryf Daniel Mustieles García:
>> > I agree with Matei: the bes solution would be if GUI files were always
>> > in PO filder, and documentation files were in HELP folder, but there
>> > are some incoveniences for it.
>> >
>> > First of all, there isn't a written rule saying where PO files mus be.
>> > Each developer chooses their location, and especifies it in makefile
>> > or configure.in files, so It will be difficult to change all modules.
>> >
>> > In the other hand, there are several modules with special cases: gtk
>> > has po and po-properties folders; gimp-help has several folders with
>> > po files with different names (appendix.po, render.po, etc).
>> >
>> > Also, note that rules about po files in forlder can change (today,
>> > help folder is a good idea to keep documentation, but tomowwor it may
>> > change), but PO files are not expected to change their format.
>> >
>> > Having an X-Location header in a po file, allows me doing a loop like
>> > this:
>> >
>> > for file in $translations_to_commit
>> > do
>> > PO_LOCATION=`grep X-Location $i ...` #Here I could use sed to get
>> > a clean path
>> > cp $file $PO_LOCATION
>> > 
>> > done
>> >
>> > This is a very simple and safe loop (there is no possibility to copy a
>> > po file in a wrong location).
>>
>> This sounds like an interesting idea.
>>
>> We need to realise that tools can wrap the lines in the path, and that a
>> simple grep might not work correctly. Something like this is possible:
>>
>> msgstr ""
>> "..."
>> "X-Location: gnome-control-center/"
>> "help/\n"
>>
>> So the script might need a bit more intelligence than simple grep.
>>
>> Keep up the good work!
>> Friedel
>>
>> --
>> Recently on my blog:
>>
>> http://translate.org.za/blogs/friedel/en/content/firefox-maybe-now-most-popular-africa
>>
>> ___
>> gnome-i18n mailing list
>> gnome-i18n@gnome.org
>> http://mail.gnome.org/mailman/listinfo/gnome-i18n
>>
>
>
___
gnome-i18n mailing list
gnome-i18n@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-i18n