Remove everything you've done locally:
git reset --hard origin/master
Pull the changes down from the server and apply your changes on top of what
came from the server:
git pull --rebase
If you haven't committed your changes yet, do the following before you do
the above:
git stash
On Wed, Feb
We are in hard code freeze. I included i18n only as an informative measure.
On Mon, Mar 22, 2010 at 2:43 PM, Gabor Kelemen wrote:
> Jason D. Clinton írta:
>
> Permission to add missing .js files to POTFILES.in?
>> https://bugzilla.gnome.org/show_bug.cgi?id=613092
>>
>&g
Permission to add missing .js files to POTFILES.in?
https://bugzilla.gnome.org/show_bug.cgi?id=613092
___
gnome-i18n mailing list
gnome-i18n@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-i18n
Somehow--we don't know how--Adi deleted and create a new HEAD based on
master in place of the old gnome-2-28 HEAD. This latest branch creation
message is the GNOME Games maintainers helping him restore the stable branch
back in to its original state which was
5a9fabb63a20fcdde4c166cda5160b2fadefc2b
There have been a radical number of changes in master which concern
documentation and translation teams. Lightsoff is merged. Blackjack is gone.
Gnometris is renamed to Quadrapassel. Same GNOME was replaced with Same
GNOME Clutter and renamed to Swell Foop. I have done my best to sed all your
help
On Sat, Oct 24, 2009 at 3:09 AM, Claude Paroz wrote:
> You're not alone :-) You can see a similar output on the page
> http://l10n.gnome.org/module/gnome-games/
>
> That means that the po/POTFILES.in file in gnome-games is not
> up-to-date. You can report it as a gnome-games bug or wait that some
2009/5/1 Jorge González González :
> El vie, 01-05-2009 a las 13:04 -0400, Og Maciel escribió:
>> 2009/5/1 Jorge González González :
>> > I'm switching to the branch with "git checkout --track -b
>> > origin/gnome-2-26" and apparently everything goes well until I push the
>> > commit.
>>
>> Try: gi
AFAICT, Edward Hervey merged your translation
with the ones he had been queing up by doing a git pull with out
--rebase. Why this wasn't caught by the pre-commit checks, I do not
know. I don't think you did anything wrong.
2009/4/20 Milo Casagrande :
> Hi,
>
> I'm here again with silly questions
On Fri, Apr 17, 2009 at 4:29 PM, Simos Xenitellis
wrote:
> Is the '--track' parameter required when using 'git checkout'?
My git-config manpage says its on by default and it has been that way
for as long as I've been using git.
___
gnome-i18n mailing li
On Fri, Apr 17, 2009 at 3:09 PM, Simos Xenitellis
wrote:
> I suppose there must be some story behind the question 'Why do we specify
> the branch name instead of reusing the remote branch name by default?
> It feels somewhat weird.'.
> With a big more experience we should be able to figure it out
On Tue, Mar 17, 2009 at 9:55 AM, Anna Jonna Armannsdottir
wrote:
> On sun, 2009-03-15 at 14:30 +0100, Christian Persch wrote:
>> Absence of ChangeLog, po/ChangeLog and help/ChangeLog etc. means that
>> the module in question does not use changelogs. (For example,
>> this is the case for epiphany,
Trunk copied to gnome-2-26
___
gnome-i18n mailing list
gnome-i18n@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-i18n
All the code that is actually getting played right now is in
*-noclutter.{h,cpp} files until this feature is turned on by default
for 2.28. I have updated our po/POTFILES.in, po/POTFILES.skip and
*all* of the translation files using sed to reflect this. Please let
me know there's any problems as a
On Wed, Jan 21, 2009 at 11:31 AM, Claude Paroz wrote:
>> Given the number of times that translators have broken the build of
>> our module, Gnome Games, because they don't run make check before they
>> commit. I'm 100% opposed to any configuration in which translators are
>> freed from the respons
On Wed, Jan 21, 2009 at 4:20 AM, Simos Xenitellis
wrote:
> On Wed, Jan 21, 2009 at 8:27 AM, Matej Urban wrote:
>> Well, I'm sure the devels are able to make the system work in anyway
>> they choose, that's why I yell so loudly to get all the po files of
>> one language into one single directory.
In order to avoid gnome-doc-utils being very angry about entity
references, all occurrences of — in the text and translation
files have been replaced with the UTF-8 equivalent. This was done with
sed so nothing else should have changed.
___
gnome-i18n mai
The gnome-games SVN has been branched for the 2.22 stable series.
___
gnome-i18n mailing list
gnome-i18n@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-i18n
On Wed, 2006-07-19 at 19:30 +0300, Alexander Shopov wrote:
> GNOME, where an OS with a Linux kernel is referred simply as Linux and
> not GNU/Linux.
This is not worth fighting over. File a bug in each module, if you want,
and then let the module maintainer decide what to do. In gnome-games we
hav
Accepted some usability suggestions:
http://bugzilla.gnome.org/show_bug.cgi?id=341617
gataxx/gataxx.desktop.in:
gnect/data/gnetc.desktop.in:
iagno/iagno.desktop.in:
gnotski/gnotski.desktop.in:
gnomine/gnomine.desktop.in
same-gnome/same-gnome.desktop.in
gtali/gtali.desktop.in:
gnotravex/tetravex.d
On Tue, 2006-07-11 at 15:51 +0930, Clytie Siddall wrote:
> 1. It does not include the disclaimer which GNU insist _must_ be
> included. [3] I imagine there are heavy legal consequences for not
> including it, and in any case, my translation is definitely an
> unofficial one: I am not a profes
20 matches
Mail list logo
