* [PATCH] Add it.po file
From: Paolo Ciarrocchi @ 2007-07-22 10:40 UTC (permalink / raw)
To: git
This patch add a file, it.po that will be translated in Italian with the following patch
---
po/it.po | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 258 insertions(+), 0 deletions(-)
create mode 100644 po/it.po
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 0000000..e8b8cdb
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,258 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-21 20:31+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: git-gui.sh:1669
+msgid "Repository"
+msgstr ""
+
+#: git-gui.sh:1670
+msgid "Edit"
+msgstr ""
+
+#: git-gui.sh:1672
+msgid "Branch"
+msgstr ""
+
+#: git-gui.sh:1675 git-gui.sh:1853 git-gui.sh:2192
+msgid "Commit"
+msgstr ""
+
+#: git-gui.sh:1678
+msgid "Merge"
+msgstr ""
+
+#: git-gui.sh:1679
+msgid "Fetch"
+msgstr ""
+
+#: git-gui.sh:1680 git-gui.sh:2198
+msgid "Push"
+msgstr ""
+
+#: git-gui.sh:1689
+msgid "Browse Current Branch's Files"
+msgstr ""
+
+#: git-gui.sh:1698
+msgid "Visualize Current Branch's History"
+msgstr ""
+
+#: git-gui.sh:1702
+msgid "Visualize All Branch History"
+msgstr ""
+
+#: git-gui.sh:1707
+msgid "Database Statistics"
+msgstr ""
+
+#: git-gui.sh:1710
+msgid "Compress Database"
+msgstr ""
+
+#: git-gui.sh:1713
+msgid "Verify Database"
+msgstr ""
+
+#: git-gui.sh:1720 git-gui.sh:1724 git-gui.sh:1728
+msgid "Create Desktop Icon"
+msgstr ""
+
+#: git-gui.sh:1733
+msgid "Quit"
+msgstr ""
+
+#: git-gui.sh:1740
+msgid "Undo"
+msgstr ""
+
+#: git-gui.sh:1743
+msgid "Redo"
+msgstr ""
+
+#: git-gui.sh:1747 git-gui.sh:2262
+msgid "Cut"
+msgstr ""
+
+#: git-gui.sh:1750 git-gui.sh:2265 git-gui.sh:2336 git-gui.sh:2408
+msgid "Copy"
+msgstr ""
+
+#: git-gui.sh:1753 git-gui.sh:2268
+msgid "Paste"
+msgstr ""
+
+#: git-gui.sh:1756 git-gui.sh:2271
+msgid "Delete"
+msgstr ""
+
+#: git-gui.sh:1760 git-gui.sh:2275 git-gui.sh:2412
+msgid "Select All"
+msgstr ""
+
+#: git-gui.sh:1769
+msgid "Create..."
+msgstr ""
+
+#: git-gui.sh:1775
+msgid "Checkout..."
+msgstr ""
+
+#: git-gui.sh:1781
+msgid "Rename..."
+msgstr ""
+
+#: git-gui.sh:1786 git-gui.sh:1884
+msgid "Delete..."
+msgstr ""
+
+#: git-gui.sh:1791
+msgid "Reset..."
+msgstr ""
+
+#: git-gui.sh:1803 git-gui.sh:2209
+msgid "New Commit"
+msgstr ""
+
+#: git-gui.sh:1811 git-gui.sh:2216
+msgid "Amend Last Commit"
+msgstr ""
+
+#: git-gui.sh:1820 git-gui.sh:2176
+msgid "Rescan"
+msgstr ""
+
+#: git-gui.sh:1826
+msgid "Add To Commit"
+msgstr ""
+
+#: git-gui.sh:1831
+msgid "Add Existing To Commit"
+msgstr ""
+
+#: git-gui.sh:1837
+msgid "Unstage From Commit"
+msgstr ""
+
+#: git-gui.sh:1842
+msgid "Revert Changes"
+msgstr ""
+
+#: git-gui.sh:1849 git-gui.sh:2188 git-gui.sh:2286
+msgid "Sign Off"
+msgstr ""
+
+#: git-gui.sh:1864
+msgid "Local Merge..."
+msgstr ""
+
+#: git-gui.sh:1869
+msgid "Abort Merge..."
+msgstr ""
+
+#: git-gui.sh:1881
+msgid "Push..."
+msgstr ""
+
+#: git-gui.sh:1891
+msgid "Apple"
+msgstr ""
+
+#: git-gui.sh:1894 git-gui.sh:1941
+#, tcl-format
+msgid "About %s"
+msgstr ""
+
+#: git-gui.sh:1896 git-gui.sh:1902 git-gui.sh:2454
+msgid "Options..."
+msgstr ""
+
+#: git-gui.sh:1937
+msgid "Help"
+msgstr ""
+
+#: git-gui.sh:1978
+msgid "Online Documentation"
+msgstr ""
+
+#: git-gui.sh:2094
+msgid "Current Branch:"
+msgstr ""
+
+#: git-gui.sh:2115
+msgid "Staged Changes (Will Be Committed)"
+msgstr ""
+
+#: git-gui.sh:2135
+msgid "Unstaged Changes (Will Not Be Committed)"
+msgstr ""
+
+#: git-gui.sh:2182
+msgid "Add Existing"
+msgstr ""
+
+#: git-gui.sh:2228
+msgid "Initial Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2229
+msgid "Amended Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2230
+msgid "Amended Initial Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2231
+msgid "Amended Merge Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2232
+msgid "Merge Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2233
+msgid "Commit Message:"
+msgstr ""
+
+#: git-gui.sh:2278 git-gui.sh:2416
+msgid "Copy All"
+msgstr ""
+
+#: git-gui.sh:2404
+msgid "Refresh"
+msgstr ""
+
+#: git-gui.sh:2425
+msgid "Apply/Reverse Hunk"
+msgstr ""
+
+#: git-gui.sh:2431
+msgid "Decrease Font Size"
+msgstr ""
+
+#: git-gui.sh:2435
+msgid "Increase Font Size"
+msgstr ""
+
+#: git-gui.sh:2440
+msgid "Show Less Context"
+msgstr ""
+
+#: git-gui.sh:2447
+msgid "Show More Context"
+msgstr ""
--
1.5.3.rc2.29.gc4640f
^ permalink raw reply related
* If NEEDS_LIBICONV is set for Solaris 8, it does not build git for me
From: Thomas Glanzmann @ 2007-07-22 10:40 UTC (permalink / raw)
To: Junio C Hamano, GIT; +Cc: Jason Riedy, Paul Jakma
Hello Junio,
[ Paul and Jason CCed because they touched that section last ]
Patch is appended at the very bottom of the E-Mail. I have a fully
patched Solaris 8 with Forte 11. In order to get git compile I had to
delete the
NEEDS_LIBICONV = YesPlease
line from the Makefile in the Solaris 8 section. After my patch the
section in the Makefile looks like that:
ifeq ($(uname_R),5.8)
NO_UNSETENV = YesPlease
NO_SETENV = YesPlease
NO_C99_FORMAT = YesPlease
NO_STRTOUMAX = YesPlease
endif
ifeq ($(uname_R),5.9)
NO_UNSETENV = YesPlease
NO_SETENV = YesPlease
NO_C99_FORMAT = YesPlease
NO_STRTOUMAX = YesPlease
endif
As you can see _after_ my patch the secion for 5.8 and 5.9 is the same.
So I wonder if it is possible to merge this two sections. But I have no
idea how to do that in the makefile language. I tried to remove other
flags for 5.8, too but it always resulted in built break so all other
flags are necessary.
----8<---- cut here ----8<---- cut here ----8<---- cut here ----8<----
The following issue as _absolutly_ nothing todo with the above and is
here only for completeness. In order to get git to compile with Forte 11
you have to work around a compiler bug in Forte 11. Forte 11 chokes
sometimes when function arguments are declared as static (I raised this
topic before even on this list). I guess that I will also file a bug
against forte 11 tomorrow. The symptom is:
CC diff-delta.o
"diff-delta.c", line 248: identifier redeclared: create_delta
current : function(pointer to const struct delta_index {pointer to const void src_buf, unsigned long src_size, unsigned int hash_mask, array[-1] of pointer to struct index_entry {..} hash}, pointer to const void, unsigned long, pointer to unsigned long, unsigned long) returning pointer to void
previous: function(pointer to const struct delta_index {pointer to const void src_buf, unsigned long src_size, unsigned int hash_mask, array[-1] of pointer to struct index_entry {..} hash}, pointer to const void, unsigned long, pointer to unsigned long, unsigned long) returning pointer to void : "delta.h", line 37
cc: acomp failed for diff-delta.c
gmake[1]: *** [diff-delta.o] Error 2
As you can see Forte 11 is complaining that the protype is different to
the function. But it is not they absolut identical. And here is the
workaround which should _not_ be commited because it is just wrong. It
removes the const flags from the function arguments which results in lot
of warnings but does compile git with Forte 11.
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -242,8 +242,8 @@
#define MAX_OP_SIZE (5 + 5 + 1 + RABIN_WINDOW + 7)
void *
-create_delta(const struct delta_index *index,
- const void *trg_buf, unsigned long trg_size,
+create_delta(struct delta_index *index,
+ void *trg_buf, unsigned long trg_size,
unsigned long *delta_size, unsigned long max_size)
{
unsigned int i, outpos, outsize, val;
--- a/delta.h
+++ b/delta.h
@@ -34,8 +34,8 @@
* must be freed by the caller.
*/
extern void *
-create_delta(const struct delta_index *index,
- const void *buf, unsigned long bufsize,
+create_delta(struct delta_index *index,
+ void *buf, unsigned long bufsize,
unsigned long *delta_size, unsigned long max_delta_size);
/*
----8<---- cut here ----8<---- cut here ----8<---- cut here ----8<----
Thomas
>From 14a4e0245c32c73a8a2dbd1763a23b8b69f8844d Mon Sep 17 00:00:00 2001
From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date: Sun, 22 Jul 2007 12:14:14 +0200
Subject: [PATCH] Don't set NEEDS_LIBICONV for Solaris 8
I use a fully patched Solaris 8 with SUNs Forte 11 Compiler which is also fully
patched. If NEEDS_LIBICONV is set to YesPlease the compile fails for me with:
AR xdiff/lib.a
LINK git-convert-objects
ld: fatal: library -liconv: not found
ld: fatal: File processing errors. No output written to git-convert-objects
gmake[1]: *** [git-convert-objects] Error 1
Without the NEEDS_LIBICONV set it simply builds.
---
Makefile | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 73b487f..1c294ca 100644
--- a/Makefile
+++ b/Makefile
@@ -401,7 +401,6 @@ ifeq ($(uname_S),SunOS)
NO_STRCASESTR = YesPlease
NO_HSTRERROR = YesPlease
ifeq ($(uname_R),5.8)
- NEEDS_LIBICONV = YesPlease
NO_UNSETENV = YesPlease
NO_SETENV = YesPlease
NO_C99_FORMAT = YesPlease
--
1.5.2.3
^ permalink raw reply related
* [PATCH] Initial Italian translation of git-gui.pot
From: Paolo Ciarrocchi @ 2007-07-22 10:42 UTC (permalink / raw)
To: git
Initial Italian translation
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
---
po/it.po | 118 +++++++++++++++++++++++++++++++-------------------------------
1 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/po/it.po b/po/it.po
index e8b8cdb..780519e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,25 +8,25 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-21 20:31+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2007-07-22 12:10+0100\n"
+"PO-Revision-Date: 2007-07-22 12:10+0100\n"
+"Last-Translator: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=utf8\n"
"Content-Transfer-Encoding: 8bit\n"
#: git-gui.sh:1669
msgid "Repository"
-msgstr ""
+msgstr "Archivio"
#: git-gui.sh:1670
msgid "Edit"
-msgstr ""
+msgstr "Modifica"
#: git-gui.sh:1672
msgid "Branch"
-msgstr ""
+msgstr "Ramo"
#: git-gui.sh:1675 git-gui.sh:1853 git-gui.sh:2192
msgid "Commit"
@@ -34,79 +34,79 @@ msgstr ""
#: git-gui.sh:1678
msgid "Merge"
-msgstr ""
+msgstr "Incorpora"
#: git-gui.sh:1679
msgid "Fetch"
-msgstr ""
+msgstr "Prendi"
#: git-gui.sh:1680 git-gui.sh:2198
msgid "Push"
-msgstr ""
+msgstr "Propaga"
#: git-gui.sh:1689
msgid "Browse Current Branch's Files"
-msgstr ""
+msgstr "Naviga nei file del ramo corrente"
#: git-gui.sh:1698
msgid "Visualize Current Branch's History"
-msgstr ""
+msgstr "Visualizza la storia del ramo corrente"
#: git-gui.sh:1702
msgid "Visualize All Branch History"
-msgstr ""
+msgstr "Visualizza la storia di tutti i rami"
#: git-gui.sh:1707
msgid "Database Statistics"
-msgstr ""
+msgstr "Statistiche del database"
#: git-gui.sh:1710
msgid "Compress Database"
-msgstr ""
+msgstr "Comprimi il database"
#: git-gui.sh:1713
msgid "Verify Database"
-msgstr ""
+msgstr "Verifica il database"
#: git-gui.sh:1720 git-gui.sh:1724 git-gui.sh:1728
msgid "Create Desktop Icon"
-msgstr ""
+msgstr "Crea icona desktop"
#: git-gui.sh:1733
msgid "Quit"
-msgstr ""
+msgstr "Esci"
#: git-gui.sh:1740
msgid "Undo"
-msgstr ""
+msgstr "Annulla"
#: git-gui.sh:1743
msgid "Redo"
-msgstr ""
+msgstr "Rifai"
#: git-gui.sh:1747 git-gui.sh:2262
msgid "Cut"
-msgstr ""
+msgstr "Taglia"
#: git-gui.sh:1750 git-gui.sh:2265 git-gui.sh:2336 git-gui.sh:2408
msgid "Copy"
-msgstr ""
+msgstr "Copia"
#: git-gui.sh:1753 git-gui.sh:2268
msgid "Paste"
-msgstr ""
+msgstr "Incolla"
#: git-gui.sh:1756 git-gui.sh:2271
msgid "Delete"
-msgstr ""
+msgstr "Cancella"
#: git-gui.sh:1760 git-gui.sh:2275 git-gui.sh:2412
msgid "Select All"
-msgstr ""
+msgstr "Seleziona tutto"
#: git-gui.sh:1769
msgid "Create..."
-msgstr ""
+msgstr "Crea..."
#: git-gui.sh:1775
msgid "Checkout..."
@@ -114,35 +114,35 @@ msgstr ""
#: git-gui.sh:1781
msgid "Rename..."
-msgstr ""
+msgstr "Rinomina"
#: git-gui.sh:1786 git-gui.sh:1884
msgid "Delete..."
-msgstr ""
+msgstr "Cancella"
#: git-gui.sh:1791
msgid "Reset..."
-msgstr ""
+msgstr "Resetta..."
#: git-gui.sh:1803 git-gui.sh:2209
msgid "New Commit"
-msgstr ""
+msgstr "Nuovo Commit"
#: git-gui.sh:1811 git-gui.sh:2216
msgid "Amend Last Commit"
-msgstr ""
+msgstr "Annulla l'ultimo Commit"
#: git-gui.sh:1820 git-gui.sh:2176
msgid "Rescan"
-msgstr ""
+msgstr "Analizza"
#: git-gui.sh:1826
msgid "Add To Commit"
-msgstr ""
+msgstr "Aggiungi al Commit"
#: git-gui.sh:1831
msgid "Add Existing To Commit"
-msgstr ""
+msgstr "Aggiungi esistente a Commit"
#: git-gui.sh:1837
msgid "Unstage From Commit"
@@ -150,7 +150,7 @@ msgstr ""
#: git-gui.sh:1842
msgid "Revert Changes"
-msgstr ""
+msgstr "Annulla modifiche"
#: git-gui.sh:1849 git-gui.sh:2188 git-gui.sh:2286
msgid "Sign Off"
@@ -158,15 +158,15 @@ msgstr ""
#: git-gui.sh:1864
msgid "Local Merge..."
-msgstr ""
+msgstr "Incorporazione locale"
#: git-gui.sh:1869
msgid "Abort Merge..."
-msgstr ""
+msgstr "Annulla incorporazione"
#: git-gui.sh:1881
msgid "Push..."
-msgstr ""
+msgstr "Propaga..."
#: git-gui.sh:1891
msgid "Apple"
@@ -175,84 +175,84 @@ msgstr ""
#: git-gui.sh:1894 git-gui.sh:1941
#, tcl-format
msgid "About %s"
-msgstr ""
+msgstr "A proposito %s"
#: git-gui.sh:1896 git-gui.sh:1902 git-gui.sh:2454
msgid "Options..."
-msgstr ""
+msgstr "Opzioni..."
#: git-gui.sh:1937
msgid "Help"
-msgstr ""
+msgstr "Aiuto"
#: git-gui.sh:1978
msgid "Online Documentation"
-msgstr ""
+msgstr "Documentazione Online"
#: git-gui.sh:2094
msgid "Current Branch:"
-msgstr ""
+msgstr "Ramo corrente:"
#: git-gui.sh:2115
msgid "Staged Changes (Will Be Committed)"
-msgstr ""
+msgstr "Modifiche preparate (Saranno committate)"
#: git-gui.sh:2135
msgid "Unstaged Changes (Will Not Be Committed)"
-msgstr ""
+msgstr "Modifiche non preparate (Non saranno committate)"
#: git-gui.sh:2182
msgid "Add Existing"
-msgstr ""
+msgstr "Aggiungi esistente"
#: git-gui.sh:2228
msgid "Initial Commit Message:"
-msgstr ""
+msgstr "Messaggio iniziale del Commit"
#: git-gui.sh:2229
msgid "Amended Commit Message:"
-msgstr ""
+msgstr "Annulla messaggio del Commit"
#: git-gui.sh:2230
msgid "Amended Initial Commit Message:"
-msgstr ""
+msgstr "Annulla messaggio iniziale del Commit"
#: git-gui.sh:2231
msgid "Amended Merge Commit Message:"
-msgstr ""
+msgstr "Annulla messaggio di incorporamento"
#: git-gui.sh:2232
msgid "Merge Commit Message:"
-msgstr ""
+msgstr "Messaggio di incorporamento"
#: git-gui.sh:2233
msgid "Commit Message:"
-msgstr ""
+msgstr "Messaggio di Commit"
#: git-gui.sh:2278 git-gui.sh:2416
msgid "Copy All"
-msgstr ""
+msgstr "Copia tutto"
#: git-gui.sh:2404
msgid "Refresh"
-msgstr ""
+msgstr "Rinfresca"
#: git-gui.sh:2425
msgid "Apply/Reverse Hunk"
-msgstr ""
+msgstr "Applica/Inverti Hunk"
#: git-gui.sh:2431
msgid "Decrease Font Size"
-msgstr ""
+msgstr "Diminuisci dimensione Font"
#: git-gui.sh:2435
msgid "Increase Font Size"
-msgstr ""
+msgstr "Aumenta dimensione Font"
#: git-gui.sh:2440
msgid "Show Less Context"
-msgstr ""
+msgstr "Mostra meno contenuto"
#: git-gui.sh:2447
msgid "Show More Context"
-msgstr ""
+msgstr "Mostra più contenuto"
--
1.5.3.rc2.29.gc4640f
^ permalink raw reply related
* [PATCH] Fix typo in the content type definition
From: Paolo Ciarrocchi @ 2007-07-22 10:51 UTC (permalink / raw)
To: git
Fix typo in the content type definition
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
---
po/it.po | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/it.po b/po/it.po
index 780519e..162e187 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,9 +11,9 @@ msgstr ""
"POT-Creation-Date: 2007-07-22 12:10+0100\n"
"PO-Revision-Date: 2007-07-22 12:10+0100\n"
"Last-Translator: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Italian\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: git-gui.sh:1669
--
1.5.3.rc2.29.gc4640f
^ permalink raw reply related
* Re: [PATCH] Initial Chinese translation
From: Johannes Schindelin @ 2007-07-22 11:39 UTC (permalink / raw)
To: Xudong Guan; +Cc: Junio C Hamano, git
In-Reply-To: <20070722085338.GA18268@xguan-laptop>
Hi,
On Sun, 22 Jul 2007, Xudong Guan wrote:
> On 01:06 Sun 22 Jul , Junio C Hamano wrote:
> > Yeah, I was hinting to rename this file to zh_CN.po from day
> > one.
>
> I agree.
>
> I am new to the patch-in-email way of doing things. If I could do
> better, please give me hints. Can I push directly to mob? Like:
> $ git clone http://repo.or.cz/r/git-gui/git-gui-i18n
> hack hack hack ....
> $ git push http://repo.or.cz/r/git-gui/git-gui-i18n master:mob
Almost:
$ git push mob@repo.or.cz:/srv/git/git-gui/git-gui-i18n.git master:mob
If it says that you might want to pull first, please consider pulling from
mob with
$ git pull http://repo.or.cz/r/git-gui/git-gui-i18n.git/ mob
or rebasing with
$ git fetch http://repo.or.cz/r/git-gui/git-gui-i18n.git/ mob
$ git rebase FETCH_HEAD
> >From 936787ddbdeaf0bcecbb1359179dae90c20418b0 Mon Sep 17 00:00:00 2001
> From: Xudong Guan <xudong.guan@gmail.com>
> Date: Sun, 22 Jul 2007 09:41:12 +0100
> Subject: [PATCH] git-gui: renamed po/zh.po -> po/zh_CN.po
Thanks. Applied.
Before applying, I usually compile test, and it seems like just one
translation is missing: Apply/Revert Hunk. Could you please add that,
too? Thank you.
> ---
> po/zh.po | 250 -----------------------------------------------------------
> po/zh_CN.po | 250 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Just a tip for the next time: the git diff family -- including
format-patch -- knows about renames, when you call it with "-M". The
patch will be much shorter then, saying that there was a rename. It is
not turned on by default, since only Git knows about this extension for
the time being. But that's what we're using, so no problem there.
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH] Update Japanese messages
From: Johannes Schindelin @ 2007-07-22 11:41 UTC (permalink / raw)
To: Junio C Hamano
Cc: しらいしななこ, git
In-Reply-To: <7vzm1orcty.fsf@assigned-by-dhcp.cox.net>
Hi,
On Sun, 22 Jul 2007, Junio C Hamano wrote:
> Thanks. Me being a Japanese, it would have been very
> embarrasing to keep a very incomplete Japanese message file in
> the project ;-).
>
> The translation looks good. Johannes, if you haven't got around
> it yet, please apply.
So done (actually I just merged the mob branch ;-). Thanks, both of you.
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH] Fix update-po target to call msgmerge with right parameters
From: Johannes Schindelin @ 2007-07-22 11:48 UTC (permalink / raw)
To: Alex Riesen; +Cc: git, Shawn O. Pearce
In-Reply-To: <20070722101930.GC3408@steel.home>
Hi,
On Sun, 22 Jul 2007, Alex Riesen wrote:
> Add accidentally forgotten semicolon at the end of msgmerge command line
Good catch!
I did a "make update-po" to test before and after your patch. There seem
to be some changes, but the worst part of it: update-po rewrites almost
the whole file! The .po files contain the line numbers where the message
was found, and they often change.
Oh, well. I'll probably write some alias to see what _actually_
changed (probably just ignoring ^#)...
Ciao,
Dscho
^ permalink raw reply
* [PATCH] git-gui: initial version of russian translation
From: Irina Riesen @ 2007-07-22 11:57 UTC (permalink / raw)
To: Johannes Schindelin, spearce; +Cc: git
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Irina Riesen <irina.riesen@gmail.com>
---
po/ru.po | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 258 insertions(+), 0 deletions(-)
create mode 100644 po/ru.po
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 0000000..e73b8d0
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,258 @@
+# Translation of git-gui to russian
+# Copyright (C) 2007 Shawn Pearce
+# This file is distributed under the same license as the git-gui package.
+# Irina Riesen <irina.riesen@gmail.com>, 2007.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: git-gui\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-21 20:31+0100\n"
+"PO-Revision-Date: 2007-07-22 12:00+0200\n"
+"Last-Translator: Irina Riesen <irina.riesen@gmail.com>\n"
+"Language-Team: Russian Translation <git@vger.kernel.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: git-gui.sh:1669
+msgid "Repository"
+msgstr "Репозиторий"
+
+#: git-gui.sh:1670
+msgid "Edit"
+msgstr "Редактировать"
+
+#: git-gui.sh:1672
+msgid "Branch"
+msgstr "Ветвь"
+
+#: git-gui.sh:1675 git-gui.sh:1853 git-gui.sh:2192
+msgid "Commit"
+msgstr "Сохранить"
+
+#: git-gui.sh:1678
+msgid "Merge"
+msgstr "Объединить"
+
+#: git-gui.sh:1679
+msgid "Fetch"
+msgstr "Получить"
+
+#: git-gui.sh:1680 git-gui.sh:2198
+msgid "Push"
+msgstr "Отправить"
+
+#: git-gui.sh:1689
+msgid "Browse Current Branch's Files"
+msgstr "Пролистать файлы текущией ветви"
+
+#: git-gui.sh:1698
+msgid "Visualize Current Branch's History"
+msgstr "История текущей ветви наглядно"
+
+#: git-gui.sh:1702
+msgid "Visualize All Branch History"
+msgstr "История всех ветвей наглядно"
+
+#: git-gui.sh:1707
+msgid "Database Statistics"
+msgstr "Статистика базы данных"
+
+#: git-gui.sh:1710
+msgid "Compress Database"
+msgstr "Сжать базу данных"
+
+#: git-gui.sh:1713
+msgid "Verify Database"
+msgstr "Проверить базу данных"
+
+#: git-gui.sh:1720 git-gui.sh:1724 git-gui.sh:1728
+msgid "Create Desktop Icon"
+msgstr "Создать ярлык на рабочем столе"
+
+#: git-gui.sh:1733
+msgid "Quit"
+msgstr "Выход"
+
+#: git-gui.sh:1740
+msgid "Undo"
+msgstr "Отменить"
+
+#: git-gui.sh:1743
+msgid "Redo"
+msgstr "Повторить"
+
+#: git-gui.sh:1747 git-gui.sh:2262
+msgid "Cut"
+msgstr "Вырезать"
+
+#: git-gui.sh:1750 git-gui.sh:2265 git-gui.sh:2336 git-gui.sh:2408
+msgid "Copy"
+msgstr "Копировать"
+
+#: git-gui.sh:1753 git-gui.sh:2268
+msgid "Paste"
+msgstr "Вставить"
+
+#: git-gui.sh:1756 git-gui.sh:2271
+msgid "Delete"
+msgstr "Удалить"
+
+#: git-gui.sh:1760 git-gui.sh:2275 git-gui.sh:2412
+msgid "Select All"
+msgstr "Выделить все"
+
+#: git-gui.sh:1769
+msgid "Create..."
+msgstr "Создать..."
+
+#: git-gui.sh:1775
+msgid "Checkout..."
+msgstr "Перейти..."
+
+#: git-gui.sh:1781
+msgid "Rename..."
+msgstr "Переименовать..."
+
+#: git-gui.sh:1786 git-gui.sh:1884
+msgid "Delete..."
+msgstr "Удалить..."
+
+#: git-gui.sh:1791
+msgid "Reset..."
+msgstr "Сбросить..."
+
+#: git-gui.sh:1803 git-gui.sh:2209
+msgid "New Commit"
+msgstr "Новое состояние"
+
+#: git-gui.sh:1811 git-gui.sh:2216
+msgid "Amend Last Commit"
+msgstr "Исправить последнее состояние"
+
+#: git-gui.sh:1820 git-gui.sh:2176
+msgid "Rescan"
+msgstr "Перечитать"
+
+#: git-gui.sh:1826
+msgid "Add To Commit"
+msgstr "Добавить к состоянию"
+
+#: git-gui.sh:1831
+msgid "Add Existing To Commit"
+msgstr "Добавить имеющееся к состоянию"
+
+#: git-gui.sh:1837
+msgid "Unstage From Commit"
+msgstr "Исключить из состояния"
+
+#: git-gui.sh:1842
+msgid "Revert Changes"
+msgstr "Отменить изменения"
+
+#: git-gui.sh:1849 git-gui.sh:2188 git-gui.sh:2286
+msgid "Sign Off"
+msgstr "Подписать"
+
+#: git-gui.sh:1864
+msgid "Local Merge..."
+msgstr "Локальное объединение..."
+
+#: git-gui.sh:1869
+msgid "Abort Merge..."
+msgstr "Прервать объединение..."
+
+#: git-gui.sh:1881
+msgid "Push..."
+msgstr "Отправить..."
+
+#: git-gui.sh:1891
+msgid "Apple"
+msgstr ""
+
+#: git-gui.sh:1894 git-gui.sh:1941
+#, tcl-format
+msgid "About %s"
+msgstr "О %s"
+
+#: git-gui.sh:1896 git-gui.sh:1902 git-gui.sh:2454
+msgid "Options..."
+msgstr "Настройки..."
+
+#: git-gui.sh:1937
+msgid "Help"
+msgstr "Помощь"
+
+#: git-gui.sh:1978
+msgid "Online Documentation"
+msgstr "Документация в интернете"
+
+#: git-gui.sh:2094
+msgid "Current Branch:"
+msgstr "Текущая ветвь:"
+
+#: git-gui.sh:2115
+msgid "Staged Changes (Will Be Committed)"
+msgstr "Включено (будет сохранено)"
+
+#: git-gui.sh:2135
+msgid "Unstaged Changes (Will Not Be Committed)"
+msgstr "Исключено (не будет сохранено)"
+
+#: git-gui.sh:2182
+msgid "Add Existing"
+msgstr "Добавить имеющееся"
+
+#: git-gui.sh:2228
+msgid "Initial Commit Message:"
+msgstr "Изначальный комментарий к состоянию"
+
+#: git-gui.sh:2229
+msgid "Amended Commit Message:"
+msgstr "Исправленный комментарий к состоянию"
+
+#: git-gui.sh:2230
+msgid "Amended Initial Commit Message:"
+msgstr "Исправленный изначальный комментарий к состоянию"
+
+#: git-gui.sh:2231
+msgid "Amended Merge Commit Message:"
+msgstr "Исправленный комментарий к объединению"
+
+#: git-gui.sh:2232
+msgid "Merge Commit Message:"
+msgstr "Комментарий к объединению"
+
+#: git-gui.sh:2233
+msgid "Commit Message:"
+msgstr "Комментарий к состоянию"
+
+#: git-gui.sh:2278 git-gui.sh:2416
+msgid "Copy All"
+msgstr "Копировать все"
+
+#: git-gui.sh:2404
+msgid "Refresh"
+msgstr "Обновить"
+
+#: git-gui.sh:2425
+msgid "Apply/Reverse Hunk"
+msgstr "Применить/Отменить часть"
+
+#: git-gui.sh:2431
+msgid "Decrease Font Size"
+msgstr "Уменьшить размер шрифта"
+
+#: git-gui.sh:2435
+msgid "Increase Font Size"
+msgstr "Увеличить размер шрифта"
+
+#: git-gui.sh:2440
+msgid "Show Less Context"
+msgstr "Меньше контекста"
+
+#: git-gui.sh:2447
+msgid "Show More Context"
+msgstr "Больше контекста"
--
1.5.3.rc2.37.g67fa
^ permalink raw reply related
* Re: [RFC PATCH] Re: Empty directories...
From: Jakub Narebski @ 2007-07-22 12:06 UTC (permalink / raw)
To: David Kastrup; +Cc: git, Linus Torvalds
In-Reply-To: <85myxpp67k.fsf@lola.goethe.zz>
On Sun, 22 July 2007, David Kastrup wrote:
> Jakub Narebski <jnareb@gmail.com> writes:
>> David Kastrup wrote:
>>
>>> I must be really bad at explaining things, or I am losing a fight
>>> against preconceptions fixed beyond my imagination.
Or you are wrong...
>> I don't understand you, or you don't understand git. "Tree" object
>> in object database (in repository) represents a directory in the
>> working area. There was never any problem with having empty trees in
>> object database, or having links to empty directory in the superdir.
>> We don't have to change anything about object database.
>
> I disagree here. The object database _can_ represent an _empty_
> directory that has been added explicitly, because up to now no
> operations existed that actually left an empty tree. But it can't
> distinguish a _non_-empty directory that has been added explicitly
> from non-empty directory that has not been added explicitly.
True. I forgot about that.
Although I'd rather say that we want distinguish between automatically
cleaned up directory (directory which will be deleted if all files in
it would be deleted, and would be untracked if all tracked files in it
would be deleted), and "sticky" directory, which is explicitely tracked
and have to be explicitely deleted.
The fact that it was added explicitely or non explicitely is orthogonal
to that.
IMHO it would be best to first provide plumbing infrastructure (as e.g.
it was the case of submodule support), then add option to
git-update-index to change the "stickiness"/"autoremoval" status of a
directory (of a tree), and _last_ think about how to change the
porcelain (git-add and git-rm).
[...]
> But in the second case, git must _not_ retain a. So we need to record
> the information that in the first case, a was added explicitly. And
> this can't be done with the current repository layout. It doesn't buy
> us anything that we _have_ a representation available for an _empty_
> tree added explicitly. We need this "added explicitly" information
> for _every_ tree, not just empty ones.
>
> And a perfectly consistent way is to make those trees with an
> explicitly added directory _non-empty_, by virtue of putting a file
> "." in them. This file, of course, exists in every physical
> directory, but we may or may not decide to let it be tracked by git,
> using the gitignore mechanism on the pattern ".". Perfectly
> expedient.
Here we disagree. I think putting "." in a tree as marker of having it
not be automatically deleted when empty, as opposed to marking tree
using filemode in the parent, is not a good idea.
The only advantage to the "." idea is that it can use gitignore
mechanism (both in-tree .gitignore, tracked or not, and info/exclude
file). But I also think that the fact that gitignore mechanism is
recursive is more of disadvantage than advantage.
First, it is _not_ consistent. Working directory trees _always_ have '.'
in them, while trees would have or would have not it, depending if they
would be "sticky" or "autoremoved".
Second, the "easy implementation" is anything but easy. "git add ." as
a way to mark directory as "sticky" is not backward compatibile:
currently it mean to add _all contents_ of current directory.
Implementation is tricky: as we have seen trying to unlink '.' or
create '.' can unfortunately succeed on [some Sun OS, and UFS
filesystem] (which follows POSIX stupidly to the letter) f**king
up the filesystem. The alternative proposal of adding "magic mode" to
mark directory as "not remove when empty" is largely tested; it is very
similar to the subproject support.
Third, is contrary to the git philosophy of tracking contents.
"Stickiness" is an attribute; the fact that directory is explicitely
tracked or not does not change contents of a directory. Compare to
'blob' which contains only contents of a file: not a filename, not a
pathname, not [subset of] filemode.
Fourth, is very artificial. What would you put for filemode for '.'?
040000 (i.e. directory)? What would you put for sha1? Sha1 of an empty
directory? Of an empty blob? 0{40} (which is bad idea because
git-diff-tree uses 0{40} to represent 'not existance')?
>> The problems with git problems with empty directories stems from the
>> fact that index didn't have directories.
>
> That basically implies that no information about directories could be
> tracked in the repository. And yes, we need appropriate information
> in the index. Again, the information whether a directory was added
> explicitly.
Whether directory is automatically managed by git (automatically removed
or untracked). But we need directory entry in index for git-diff, for
example to recognize if there is or there is not empty directory, or if
a directory is automanaged or not.
>> Index is flattened version of root tree, and before subproject
>> support it contained _only_ info about blobs (file contents).
>
> And the repository is a versioned and hierarchically hashed version of
> the index, but its trees contain _no_ information that is not already
> inherently represented by the files alone. [...]
The above sentence is nonsensical. Index is helper for repository,
and can be derived from repository. Not vice versa.
Trees do contain information which is not inherently present by the
blobs.
--
Jakub Narebski
Poland
^ permalink raw reply
* Re: [PATCH] Initial Italian translation of git-gui.pot
From: Johannes Schindelin @ 2007-07-22 12:02 UTC (permalink / raw)
To: Paolo Ciarrocchi; +Cc: git
In-Reply-To: <20070722124236.47baacb1@paolo-desktop>
Hi,
On Sun, 22 Jul 2007, Paolo Ciarrocchi wrote:
> Initial Italian translation
Thank you very much! I took the liberty of squashing your 3 commits into
one ;-)
I see that 5 translations are missing:
Commit, Checkout..., Unstage From Commit, Sign Off, Apple
I guess that "Unstage From Commit" needs to be translated, but that you
wanted to keep the others as-English, right?
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH] Initial Chinese translation
From: Johannes Schindelin @ 2007-07-22 12:04 UTC (permalink / raw)
To: Xudong Guan; +Cc: Junio C Hamano, git
In-Reply-To: <Pine.LNX.4.64.0707221233330.14781@racer.site>
Hi,
On Sun, 22 Jul 2007, Johannes Schindelin wrote:
> > >From 936787ddbdeaf0bcecbb1359179dae90c20418b0 Mon Sep 17 00:00:00 2001
> > From: Xudong Guan <xudong.guan@gmail.com>
> > Date: Sun, 22 Jul 2007 09:41:12 +0100
> > Subject: [PATCH] git-gui: renamed po/zh.po -> po/zh_CN.po
>
> Thanks. Applied.
Ooops. I amended it, because msgformat seems to downcase the name in tcl
mode. So it is now called po/zh_cn.po.
I hope it did not inconvenience anybody that I did not do a brown-paper
bag commit, but forced a push.
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH] Initial Italian translation of git-gui.pot
From: Paolo Ciarrocchi @ 2007-07-22 12:11 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
In-Reply-To: <Pine.LNX.4.64.0707221255260.14781@racer.site>
On 7/22/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> On Sun, 22 Jul 2007, Paolo Ciarrocchi wrote:
>
> > Initial Italian translation
>
> Thank you very much! I took the liberty of squashing your 3 commits into
> one ;-)
Yeah, I was writing you an email suggesting to at least merge my
latest patch into the previous one.
Out of curiosity, how did you merge my 3 commits into one? (I'm really
a newbie).
> I see that 5 translations are missing:
>
> Commit, Checkout..., Unstage From Commit, Sign Off, Apple
>
> I guess that "Unstage From Commit" needs to be translated, but that you
> wanted to keep the others as-English, right?
Yes, I even translated a few words that I think should remain in English.
I FWed my patch to my local LUG, I'll collect some feedback and post a
followup patch.
Ciao,
--
Paolo
^ permalink raw reply
* Re: [PATCH] git-gui: initial version of russian translation
From: Johannes Schindelin @ 2007-07-22 12:12 UTC (permalink / raw)
To: Irina Riesen; +Cc: spearce, git
In-Reply-To: <20070722115712.GD3408@steel.home>
Hi,
On Sun, 22 Jul 2007, Irina Riesen wrote:
> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> Signed-off-by: Irina Riesen <irina.riesen@gmail.com>
Heh. Wife/husband team?
Thanks.
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH 3/5] Internationalization of git-gui
From: Christian Stimming @ 2007-07-22 12:16 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Shawn O. Pearce, Brett Schwarz, git, Paul Mackerras
In-Reply-To: <7vodi4sw1e.fsf@assigned-by-dhcp.cox.net>
Am Sonntag, 22. Juli 2007 10:05 schrieb Junio C Hamano:
> "Shawn O. Pearce" <spearce@spearce.org> writes:
> > Christian Stimming <stimming@tuhh.de> wrote:
> >> Subject: [PATCH] Initial German translation for testing of i18n.
> >> diff --git a/po/de.po b/po/de.po
> >> new file mode 100644
> >> index 0000000..0592836
> >> --- /dev/null
> >> +++ b/po/de.po
> >> @@ -0,0 +1,265 @@
> >> +# Translation of git-gui to German.
> >> +# Copyright (C) 2007 Linux Torvalds
> >
> > I didn't realize Linus wrote German. ;-)
> >
> > Or are you assigning the copyright to Linus, much as other chunks
> > of Git are copyrighted by Linus?
>
> The convention for xx.po, judging from the way template pot file
> is written out, is to name the package's copyright holder, not
> translation's, on that line.
Exactly. That line should say that even though I have been the author of
de.po, I still assign copyright (or the assign-able parts of it) to the
package's copyright owner, which in this case is Linus. As Junio says, this
is a suggestion from gettext, and I'd simply follow it here.
> So Linus does not have to have anything to do with the German part,
> but I think the appropriate name to place there is yours.
s/yours/his/ ? Otherwise this sentence sounds like a contradiction to the
previous one...
Christian
^ permalink raw reply
* Re: [PATCH] git-gui: initial version of russian translation
From: Alex Riesen @ 2007-07-22 12:21 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Irina Riesen, spearce, git
In-Reply-To: <Pine.LNX.4.64.0707221306030.14781@racer.site>
Johannes Schindelin, Sun, Jul 22, 2007 14:12:37 +0200:
>
> > Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> > Signed-off-by: Irina Riesen <irina.riesen@gmail.com>
>
> Heh. Wife/husband team?
>
as a matter of fact... Yes :)
^ permalink raw reply
* Re: [PATCH 2/5] Internationalization of git-gui
From: Christian Stimming @ 2007-07-22 12:24 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Brett Schwarz, git, Paul Mackerras
In-Reply-To: <20070722074525.GX32566@spearce.org>
Am Sonntag, 22. Juli 2007 09:45 schrieb Shawn O. Pearce:
> > Here I marked much more strings than in the previous patch, and as
> > discussed the procedure [mc ...] is used for translation.
>
> Almost. I noticed two that you did miss, and its because they are
> totally weird. We may want to rewrite this block of code first...
Yes, I've noticed those two run-time strings as well; I simply deferred them
to be dealt with at a later point in time. As you already say, they will have
to be rewritten before they can be translated. Probably an extra layer of
[format ...] will do.
> > @@ -1682,69 +1682,69 @@ trace add variable current_branch write
> > ".mbar.repository entryconf [.mbar.repos .mbar.repository add separator
> >
> > .mbar.repository add command \
> > - -label {Visualize Current Branch's History} \
> > + -label [mc "Visualize Current Branch's History"] \
> > -command {do_gitk $current_branch}
> > trace add variable current_branch write ".mbar.repository entryconf
> > [.mbar.repository index last] -label \"Visualize \$current_branch's
> > History\" ;#" .mbar.repository add command \
>
> But they are in a double quoted string and will
> be eval'd later by Tcl, so we actually need something like:
>
> - trace add variable current_branch write ".mbar.repository entryconf
> [.mbar.repository index last] -label \"Visualize \$current_branch's
> History\" ;#" + trace add variable current_branch write ".mbar.repository
> entryconf [.mbar.repository index last] -label \[mc \"Visualize
> \$current_branch's History\"\] ;#"
Err... I didn't get the latter one, but as I said, this can be deferred until
later.
> > - .mbar.apple add command -label "About [appname]" \
> > + .mbar.apple add command -label [mc "About %s" appname] \
>
> Bug. This needs to be:
>
> + .mbar.apple add command -label [mc "About %s" [appname]] \
>
> You lost one level of [] there when you did the replacement.
Oops, sorry, you are right. Also, I didn't test quite thoroughly after the
s/_/mc/ replacement, compared to the original _ introduction, where I already
caught this one once before.
> I only noticed this during a fast scan through while deleting text.
> I'll have to reread this patch more carefully later, before I apply
> (or merge) it, to make sure we don't have more such cases.
The appname thing was the only occurrence in this file, but it occurs several
times.
Christian
^ permalink raw reply
* Re: [PATCH] Add to gitk an --argscmd flag to get the list of refs to draw at refresh time.
From: Paul Mackerras @ 2007-07-22 12:24 UTC (permalink / raw)
To: Yann Dirson; +Cc: git
In-Reply-To: <20070712220411.31743.83101.stgit@gandelf.nowhere.earth>
Yann Dirson writes:
> This new version causes the command to add its revs to the litteral
> ones from command-line instead of overriding them, and allows to
> edit the command in the view editor.
Is it actually useful to use both the --argscmd flag and some literal
revisions on the command line? Why would you use both?
Instead of the --argscmd flag, maybe we could have a convention that
an argument starting with "|" is a command to run rather than a
literal revision. Would that suit? It would seem to simplify the
patch by eliminating the requirement for an extra entry field, as well
as removing the need for the separate viewargscmd array.
> Disclaimer: I'm no tcl/tk expert, feel free to flame my style :)
There are a couple of things I think should be done differently, in
fact. :)
Paul.
^ permalink raw reply
* Re: [PATCH] Initial Italian translation of git-gui.pot
From: Johannes Schindelin @ 2007-07-22 12:43 UTC (permalink / raw)
To: Paolo Ciarrocchi; +Cc: git
In-Reply-To: <4d8e3fd30707220511s3f9ee1dfu4b24b0a6d9949ebe@mail.gmail.com>
Hi,
On Sun, 22 Jul 2007, Paolo Ciarrocchi wrote:
> On 7/22/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
>
> > On Sun, 22 Jul 2007, Paolo Ciarrocchi wrote:
> >
> > > Initial Italian translation
> >
> > Thank you very much! I took the liberty of squashing your 3 commits
> > into one ;-)
>
> Yeah, I was writing you an email suggesting to at least merge my latest
> patch into the previous one.
;-)
> Out of curiosity, how did you merge my 3 commits into one? (I'm really a
> newbie).
There are two nice way to do it: Either make a new branch and squash
merge the commits:
$ git reset --hard HEAD~3
$ git merge --squash HEAD@{1}
(Explanation: This does not really make a new branch, but resets the
current HEAD 3 commits back. Then it uses the _reflog_ to get at the old
HEAD, and merges it with the "--squash" option.)
The second is what I actually did: I used the interactive mode of rebase:
$ git rebase -i HEAD~3
[edit the 2nd and 3rd "pick" to become "squash"]
> > I see that 5 translations are missing:
> >
> > Commit, Checkout..., Unstage From Commit, Sign Off, Apple
> >
> > I guess that "Unstage From Commit" needs to be translated, but that
> > you wanted to keep the others as-English, right?
>
> Yes, I even translated a few words that I think should remain in
> English. I FWed my patch to my local LUG, I'll collect some feedback and
> post a followup patch.
Wonderful!
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH 3/5] Internationalization of git-gui
From: Johannes Schindelin @ 2007-07-22 12:44 UTC (permalink / raw)
To: Christian Stimming
Cc: Junio C Hamano, Shawn O. Pearce, Brett Schwarz, git,
Paul Mackerras
In-Reply-To: <200707221416.42908.stimming@tuhh.de>
Hi,
On Sun, 22 Jul 2007, Christian Stimming wrote:
> Am Sonntag, 22. Juli 2007 10:05 schrieb Junio C Hamano:
> > "Shawn O. Pearce" <spearce@spearce.org> writes:
> > > Christian Stimming <stimming@tuhh.de> wrote:
> > >> Subject: [PATCH] Initial German translation for testing of i18n.
> > >> diff --git a/po/de.po b/po/de.po
> > >> new file mode 100644
> > >> index 0000000..0592836
> > >> --- /dev/null
> > >> +++ b/po/de.po
> > >> @@ -0,0 +1,265 @@
> > >> +# Translation of git-gui to German.
> > >> +# Copyright (C) 2007 Linux Torvalds
> > >
> > > I didn't realize Linus wrote German. ;-)
> > >
> > > Or are you assigning the copyright to Linus, much as other chunks
> > > of Git are copyrighted by Linus?
> >
> > The convention for xx.po, judging from the way template pot file
> > is written out, is to name the package's copyright holder, not
> > translation's, on that line.
>
> Exactly. That line should say that even though I have been the author of
> de.po, I still assign copyright (or the assign-able parts of it) to the
> package's copyright owner, which in this case is Linus. As Junio says,
> this is a suggestion from gettext, and I'd simply follow it here.
How about Junio instead? Linus created Git, but Junio is the official
maintainer (by mutual agreement).
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH 3/5] Internationalization of git-gui
From: Christian Stimming @ 2007-07-22 12:57 UTC (permalink / raw)
To: Johannes Schindelin
Cc: Junio C Hamano, Shawn O. Pearce, Brett Schwarz, git,
Paul Mackerras
In-Reply-To: <Pine.LNX.4.64.0707221344200.14781@racer.site>
Am Sonntag, 22. Juli 2007 14:44 schrieb Johannes Schindelin:
> > > >> Subject: [PATCH] Initial German translation for testing of i18n.
> > > >> diff --git a/po/de.po b/po/de.po
> > > >> new file mode 100644
> > > >> index 0000000..0592836
> > > >> --- /dev/null
> > > >> +++ b/po/de.po
> > > >> @@ -0,0 +1,265 @@
> > > >> +# Translation of git-gui to German.
> > > >> +# Copyright (C) 2007 Linux Torvalds
> > > >
> > > > I didn't realize Linus wrote German. ;-)
> > > >
> > > > Or are you assigning the copyright to Linus, much as other chunks
> > > > of Git are copyrighted by Linus?
> > >
> > > The convention for xx.po, judging from the way template pot file
> > > is written out, is to name the package's copyright holder, not
> > > translation's, on that line.
> >
> > Exactly. That line should say that even though I have been the author of
> > de.po, I still assign copyright (or the assign-able parts of it) to the
> > package's copyright owner, which in this case is Linus. As Junio says,
> > this is a suggestion from gettext, and I'd simply follow it here.
>
> How about Junio instead? Linus created Git, but Junio is the official
> maintainer (by mutual agreement).
Then the copyright line should probably better read
Copyright (C) 2007 Shawn Pearce, et al.
because that's what the copyright for the other git-gui files say.
Christian
^ permalink raw reply
* Re: segfault in diff-delta.c on mac os x (commit 8433669)
From: Steffen Prohaska @ 2007-07-22 12:59 UTC (permalink / raw)
To: Git Mailing List; +Cc: Brian Gernhardt
In-Reply-To: <6A487E9A-27E5-4212-A7C9-EBB6528791FE@zib.de>
On Jul 22, 2007, at 10:49 AM, Steffen Prohaska wrote:
>
> On Jul 22, 2007, at 5:35 AM, Brian Gernhardt wrote:
>
>>
>> On Jul 21, 2007, at 11:15 AM, Steffen Prohaska wrote:
>>
>>> 843366961cf14aad6490fbeb30f7b98f37f8833a may cause segfaults on
>>> Mac OS X. See backtrace below. I only observed the segfault with
>>> -O2 builds.
>>
>> I have been using git on my OS X box for quite a while, and that
>> commit appears to be nearly two months old. I have yet to see any
>> packing errors in any of my repositories. (This is with -O2,
>> which appears to be the default.)
>>
>> My gcc reports itself as build 5367 instead of 5250. Perhaps
>> there is a compiler error in an older copy of the DevTools?
>
> This seems to be the case. I upgraded the compiler and
> tried again. The segfault didn't happen again. Note, this
> was not exactly the same situation as before because the
> git repository used for testing changed a bit since the
> first segfault.
>
> I'll do some more repacking over the day and will report
> my observations.
I did a lot more testing and am pretty convinced now that
the problem is not present with the newer compiler. Using
build 5367 of gcc seems to creating a working git executable
while build 5250 creates a broken one.
Steffen
^ permalink raw reply
* update-po
From: Johannes Schindelin @ 2007-07-22 13:05 UTC (permalink / raw)
To: Nanako Shiraishi, Xudong Guan; +Cc: git
Hi,
I just ran "update-po", and got 4 new messages...
msgid "Current Branch:"
msgstr ""
msgid "Staged Changes (Will Be Committed)"
msgstr ""
msgid "Unstaged Changes (Will Not Be Committed)"
msgstr ""
msgid "Add Existing"
msgstr ""
Actually, the 1st and the fourth copied the translation from somewhere
else for ja and zh_cn.
Could you please pull from repo.or.cz and fill in these translations?
Thanks,
Dscho
^ permalink raw reply
* Re: [PATCH 3/5] Internationalization of git-gui
From: Johannes Schindelin @ 2007-07-22 13:06 UTC (permalink / raw)
To: Christian Stimming
Cc: Junio C Hamano, Shawn O. Pearce, Brett Schwarz, git,
Paul Mackerras
In-Reply-To: <200707221457.52542.stimming@tuhh.de>
Hi,
On Sun, 22 Jul 2007, Christian Stimming wrote:
> Am Sonntag, 22. Juli 2007 14:44 schrieb Johannes Schindelin:
>
> > [Christian, I think, wrote]
> >
> > > That line should say that even though I have been the author of
> > > de.po, I still assign copyright (or the assign-able parts of it) to
> > > the package's copyright owner, which in this case is Linus. As Junio
> > > says, this is a suggestion from gettext, and I'd simply follow it
> > > here.
> >
> > How about Junio instead? Linus created Git, but Junio is the official
> > maintainer (by mutual agreement).
>
> Then the copyright line should probably better read
>
> Copyright (C) 2007 Shawn Pearce, et al.
>
> because that's what the copyright for the other git-gui files say.
Oops. Yes, of course.
Ciao,
Dscho
^ permalink raw reply
* Re: German translations
From: Christian Stimming @ 2007-07-22 13:16 UTC (permalink / raw)
To: David Kastrup; +Cc: git
In-Reply-To: <85tzrxr0m9.fsf@lola.goethe.zz>
Am Samstag, 21. Juli 2007 21:57 schrieb David Kastrup:
> > Thanks for additional word proposals. I'll discuss these and the two
> > followups in German below.
> >
> >> > +#: git-gui.sh:1627 git-gui.sh:1802 git-gui.sh:2134
> >> > +msgid "Commit"
> >> > +msgstr "Übertragen"
> >>
> >> Einpflegen ist als Verb gebräuchlich, aber dann ist es schwer, ein
> >> passendes Substantiv zu finden. "Sendung"?
> >
> > Ich habe im Glossar "übertragen (senden?, übergeben?)". .
>
> Ich habe was: Einspielen, Ausspielen, Einspielung, Ausspielung.
> Symmetrisch, verständlich, als Verb und Substantiv zu gebrauchen.
Einspielen und Einspielung sind auch Möglichkeiten, aber bisher finde ich das
noch nicht überzeugender als die Übertragung.
Für was ist Ausspielung gemeint? Checkout? Für mich klingt
ausspielen/Ausspielung hauptsächlich nach einer Pokerrunde (oder eher
destruktiv, "dieser Mitarbeiter hat im Projekt wirklich ausgespielt") und
nicht nach dem Ablegen in Akten oder dem Rüberschicken zum Archiv-Server.
Aber stimmt, "checkout" braucht noch einen Begriff und bisher habe ich auch
keinen überzeugenden Vorschlag.
> > Deswegen wird was anderes benötigt. Für fetch und pull gleichermaßen
> > würden holen/ziehen/übernehmen gehen und man muss sich halt auf eine
> > Zuordnung festlegen.
>
> fetch = anfordern, pull = übernehmen?
Klingt gut, ok, vielen Dank.
> >> > +#: git-gui.sh:1632 git-gui.sh:2140
> >> > +msgid "Push"
> >> > +msgstr "Schieben"
> >
> > Glossar: "schieben (hochladen? verschicken?)"
>
> Ausliefern? Durchgeben?
Ausliefern ist gut, danke.
> >> > +#: git-gui.sh:1641
> >> > +msgid "Browse Current Branch"
> >> > +msgstr "Aktuellen Zweig durchblättern"
> >>
> >> Im aktuellen Zweig stöbern.
> >
> > stöbern für "to browse"? Das ist aber definitiv nicht das, was
> > normalerweise als Übersetzung von "to browse" gewählt wird. Da ist
> > man eben bei blättern.
>
> Aber das wäre "leafing through" und ist eben auf Bücher beschränkt.
Von den Büchern kommt die Bedeutung her, ja, aber browse und leafing through
sind halt beide ein blättern, da sehe ich keinen Widerspruch zur möglichen
Verwendung hier.
> "wühlen" wäre flapsig. Etwas
> hochsprachlicher wäre noch "durchforsten", aber das trägt uns
> natürlich den Zorn der Förster für den Begriffsmißbrauch zu.
> "erkunden" wäre auch noch möglich.
Beim Erkunden fehlt mir die Bedeutung, dass man da einzelne Schritte einen
nach dem anderen durchgehen kann. Das finde ich im Blättern weiterhin am
besten wiederzuerkennen. Dann noch eher durchforsten als erkunden.
> >> > David Kastrup wrote:
> >> >>> +#: git-gui.sh:1798 git-gui.sh:2130 git-gui.sh:2228
> >> >>> +msgid "Sign Off"
> >> >>> +msgstr "Freizeichnen"
> >> >>
> >> >> Gegenzeichnen?
> >> >
> >> > Abzeichnen!
> >>
> >> Absegnen. Ich denke mal, in der Form mit "Ab" ist das dermaßen
> >> gebräuchlich, daß man damit keine religiösen Befindlichkeiten
> >> verletzt.
> >>
> >> Ansonsten: Abnicken oder Gutheißen.
> >
> > Absegnen ist zu flapsig, Abnicken und Gutheißen erst recht.
>
> Abnicken ja, aber Gutheißen ist nun wirklich ein hochsprachlicher
> Begriff.
>
> > Abzeichnen wäre okay, aber das ist Freizeichnen auch.
>
> Freizeichnen ist viel zu nischensprachlich. Mit Abzeichnen könnte ich
> leben, obwohl ich Gutheißen besser fände.
Abzeichnen ist ok.
Am Samstag, 21. Juli 2007 22:09 schrieb David Kastrup:
> After a view of the glossary:
>
> "amend" "ergänzen"
> ist nicht ganz korrekt. "nachbessern" wäre da erheblich besser.
Ok.
> "message" würde ich als "Nachricht" statt "Meldung" übersetzen.
Irgendwie Geschmackssache. Man muss sich das ein bisschen im Kontext
vorstellen: "Die Meldung zur Einspielung/Übertragung", "Die Nachricht zur
Einspielung/Übertragung", ich würde da erstmal bei Meldung bleiben.
> "revert" "zurückkehren" würde ich eher als "revidieren" oder
> "aufheben" bezeichnen.
"revidieren" ist gut.
> "revision" ist wohl schlicht eine "Version" statt der "Revision", die
> einem das Finanzamt ins Haus bringt.
Auch das ist gut, allerdings frage ich mich natürlich auch, warum das Dingens
dann nicht auch gleich auf Englisch "version" heißt :-)
Bisheriger Zwischenstand wird im glossary.csv nachgetragen; zur Anpassung von
de.po hab ich noch keine Zeit gehabt, kommt aber sobald neue Strings drin
sind.
Christian
^ permalink raw reply
* Re: [PATCH 1/5] Internationalization of git-gui
From: Christian Stimming @ 2007-07-22 13:35 UTC (permalink / raw)
To: Junio C Hamano
Cc: Johannes Schindelin, Shawn O. Pearce, Brett Schwarz, git,
Paul Mackerras
In-Reply-To: <7vabtpv43d.fsf@assigned-by-dhcp.cox.net>
Am Samstag, 21. Juli 2007 23:28 schrieb Junio C Hamano:
> > Agreed. I propose to throw away the "add glossary" patch and I'll
> > resubmit, this time in a separate po/glossary/ directory, where each
> > language will get a po file for the glossary.
>
> Actually, I would even suggest that we should NOT have a
> separate glossary file at all, if gettext suite allows what I
> outline below.
>
> How about having it as a part of header comment in each of the
> xx.po file?
I don't think this would work well. In particular, you don't get all the nice
gettext *merging* features that you only get with a full-blown po file.
> The division of labor I think would make sense for message l10n
> process goes like this:
>
> - The software developer (primarily Shawn): responsible for
> marking messages subject to i18n;
Yes, except those developers who don't happen to be translators as well tend
to forget the markups. I don't blame anyone for doing so - just keep in mind
that translators have to give feedback about missing markups, and they
hopefully will do so.
> - The i18n coordinator (could be Shawn but anybody else can
> volunteer; as things stand, I think Christian and Johannes
> are doing this): responsible for running "make
> po/git-gui.pot; make update-po" from time to time in order to
> keep po/*.po in sync with the vocabulary.
Actually, please DO NOT RUN update-po except right before a new tarball is
being packaged and distributed! It sucks royally if I have updated my de.po
translation, only to discover someone has run update-po on the server and I
have to figure out how to get out of the de.po conflicts. There will be
conflicts after each and every update-po because the line numbers in the po
file will have changed inevitably -- but the actualy content in terms of
messages might be completely unchanged.
For that reason, please use the update-po rule AS SELDOM AS POSSIBLE. Thanks a
lot.
> initially, populate "glossary" part in po/git-gui.pot;
>
> as needed, add entries "glossary" part in po/git-gui.pot, and
> (if possible) add corresponding placeholders to po/*.po;
Again, this doesn't work well, and depending on the po file editor that is
used by a translator they might not see this comment block anyway. I would
instead propose a subdirectory po/glossary; a CSV file that contains the
terms itself; a csv-to-po converter script that will turn the terms into a
git-gui-glossary.pot; and a po file for each language.
> - Translators (one for each language): responsible for updating
> po/xx.po file;
>
> initially, start by copying po/git-gui.pot to create
> po/xx.po;
>
> maintainance of "glossary" part of po/xx.po could also be
> made this person's responsibility instead of i18n
> coordinator's.
>
> This way, the translators do not have to be so familiar with the
> gettext toolchain nor even have to have gettext installed.
Translators who are unfamiliar with gettext are a mixed blessing. Anyone is
able to contribute a bunch of initial string translations, especially if
there hasn't been a translation before. But if someone or a team wants to
achieve a really *high-quality*, 100%, consistent, and understandable
translation, the translators must be able to test the translation a lot,
which implies they must be able to generate the .msg files, which requires
the gettext toolchain anyway. For that reason I wouldn't spent too much
effort to enable translation work without gettext tools; instead, I'd rather
encourage to optimize the setup for those translators that have the full
toolchain available.
Christian
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox