Internationalization from gettext manual [1]:
"Simplify translatable strings so that they don't contain command
substitution ("`...`" or "$(...)") [...]"
[1]
http://www.gnu.org/software/gettext/manual/gettext.html#Preparing-Shell-Scripts
Signed-off-by: Vasco Almei
Mark messages in git-merge-octopus.sh for translation.
Signed-off-by: Vasco Almeida
---
git-merge-octopus.sh | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index dc2fd1b..89e967a 100755
--- a/git-merge
Marks several messages for translation and updates tests to pass under
GETTEXT_POISON. Some tests were updated to fit previous i18n marks, others
were updated to fit marks made by these patches. Patches that only touch
test file refer to marks done in commits previous to these ones.
Vasco Almeida
ing on the message we are giving.
See gettext documentation for details:
http://www.gnu.org/software/gettext/manual/html_node/Preparing-Strings.html
Helped-by: Junio C Hamano
Signed-off-by: Vasco Almeida
---
I removed "Please," in favor of "Please" as Junio C Hamano s
Remove a comma from string marked for translation. Make the string match the
one in builtin/mv.c. Now translators have do handle this string only once.
Signed-off-by: Vasco Almeida
---
builtin/rm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/rm.c b/builtin/rm.c
Some translations might also translate "" and "".
Signed-off-by: Vasco Almeida
---
builtin/pull.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 596b92f..96b98ea 100644
--- a/builtin/pull.c
+++ b/builtin/pull.
zy and the translator needs to correct it herself.
Signed-off-by: Vasco Almeida
---
builtin/pull.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 96b98ea..1d7333c 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -495,10 +495,10 @@ s
Mark description and parameter for option "set-upstream-to" for translation.
Signed-off-by: Vasco Almeida
---
builtin/branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 0adba62..b7d906d 100644
--- a/builtin/bran
Git could output "completed with 1 local objects", but in this case
using "object" instead of "objects" is the correct form.
Use Q_() instead of _().
Signed-off-by: Vasco Almeida
---
builtin/index-pack.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
dif
Mark strings seen by the user inside setup_unpack_trees_porcelain() and
display_error_msgs() functions for translation.
Signed-off-by: Vasco Almeida
---
unpack-trees.c | 74 ++
1 file changed, 54 insertions(+), 20 deletions(-)
diff --git
This re-roll upadates patch
i18n: unpack-trees: mark strings for translation
I have decoupled/untangled some strings to mark entire sentences instead of
assemble them using placeholders "%s". This makes the translation work
easier and more reliable.
Vasco Almeida (7):
i18n: index
Change Makefile to include git-parse-remote.sh in LOCALIZED_SH.
TODO: remove 3rd argument of error_on_missing_default_upstream function
that is no longer required.
Signed-off-by: Vasco Almeida
---
Makefile| 2 +-
git-parse-remote.sh | 46
Signed-off-by: Vasco Almeida
---
Documentation/git-mailinfo.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 0947084..3bbc731 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git
Signed-off-by: Vasco Almeida
---
Oops, fix typo.
#: gitk:3081
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr [-"<%s-Baixo>\tDescolar-]{+"<%s-Baixo>\tDeslocar+} a lista de commits
uma
Add comment drawing translator attention in order to align "Push
URL:" and "Fetch URL:" fields translation of git remote show output.
Aligning both fields makes the output more appealing and easier to
grasp.
Signed-off-by: Vasco Almeida
---
Translators, you can check if y
Mark strings for translation in lib/index.tcl that were seemingly
left behind by 700e560 ("git-gui: Mark forgotten strings for
translation.", 2008-09-04) which marks string in do_revert_selection
procedure.
These strings are passed to unstage_help and add_helper procedures.
Signed-off
1bb1d1 ("git-gui: Paper bag fix missing translated strings",
2007-09-14) fixes the same issue slightly differently.
[1] http://www.tcl.tk/man/tcl/TclCmd/append.htm
Signed-off-by: Vasco Almeida
---
lib/blame.tcl| 2 +-
lib/branch_checkout.tcl | 2 +-
lib/branch_
Mark command-line "usage:" string for translation in git-gui.sh.
Signed-off-by: Vasco Almeida
---
git-gui.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh
index 11048c7..4ae344f 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -3007,7 +3007
Mark string "$hook hook failed:" in lib/error.tcl for translation.
Signed-off-by: Vasco Almeida
---
lib/error.tcl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/error.tcl b/lib/error.tcl
index 71dc860..8968a57 100644
--- a/lib/error.tcl
+++ b/lib/error.tc
Internationalize use of colon punctuation ':' in options window, windows
titles, database statistics window. Some languages might use a different
style, for instance French uses "User Name :" (space before colon).
Signed-off-by: Vasco Almeida
---
lib/branch_delete.tcl | 2
Signed-off-by: Vasco Almeida
---
I think translation work is ready. Don't expect another re-roll soon.
po/pt_pt.po | 1376 +++
1 file changed, 1376 insertions(+)
create mode 100644 po/pt_pt.po
diff --git a/po/pt_pt.po b/po/pt_pt.p
Add Portuguese glossary.
Signed-off-by: Vasco Almeida
---
po/glossary/pt_pt.po | 293 ++
po/pt_pt.po | 2716 ++
2 files changed, 3009 insertions(+)
create mode 100644 po/glossary/pt_pt.po
create mode 100644 po/pt_pt.po
diff --git
Às 11:23 de 05-05-2016, Vasco Almeida escreveu:
> Add Portuguese glossary.
>
> Signed-off-by: Vasco Almeida
> ---
> po/glossary/pt_pt.po | 177
> po/pt_pt.po | 2574
++
> 2 files changed, 2751 insertions(+)
>
Signed-off-by: Vasco Almeida
---
po/pt_pt.po | 1376 +++
1 file changed, 1376 insertions(+)
create mode 100644 po/pt_pt.po
diff --git a/po/pt_pt.po b/po/pt_pt.po
new file mode 100644
index 000..c181acc
--- /dev/null
+++ b/po/pt_pt.po
Force creation of destination bin directory. Before this commit, gitk
would fail to install if this directory didn't already exist.
Signed-off-by: Vasco Almeida
---
Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
index 5acdc90..5bdd52a 100644
--- a/Mak
Add Portuguese glossary.
Signed-off-by: Vasco Almeida
---
po/glossary/pt_pt.po | 177
po/pt_pt.po | 2574 ++
2 files changed, 2751 insertions(+)
create mode 100644 po/glossary/pt_pt.po
create mode 100644 po/pt_pt.po
diff --git a
Mark strings seen by the user inside setup_unpack_trees_porcelain() and
display_error_msgs() functions for translation.
Signed-off-by: Vasco Almeida
---
unpack-trees.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
Remove a comma from string marked for translation. Make the string match the
one in builtin/mv.c. Now translators have do handle this string only once.
Signed-off-by: Vasco Almeida
---
builtin/rm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/rm.c b/builtin/rm.c
zy and the translator needs to correct it herself.
Signed-off-by: Vasco Almeida
---
builtin/pull.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index c199f28..2ec5a9b 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -491,10 +491,10 @@ s
Some translations might also translate "" and "".
Signed-off-by: Vasco Almeida
---
I opted to mark also the brackets of placeholders, which I think is a good
compromise between consistency and letting the translators know what
they're translating.
builtin/pull.c | 6
Mark description and parameter for option "set-upstream-to" for translation.
Signed-off-by: Vasco Almeida
---
builtin/branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 0adba62..b7d906d 100644
--- a/builtin/bran
Git could output "completed with 1 local objects", but in this case
using "object" instead of "objects" is the correct form.
Use Q_() instead of _().
Signed-off-by: Vasco Almeida
---
builtin/index-pack.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
dif
Change Makefile to include git-parse-remote.sh in LOCALIZED_SH.
TODO: remove 3rd argument of error_on_missing_default_upstream function
that is no longer required.
Signed-off-by: Vasco Almeida
---
Makefile| 2 +-
git-parse-remote.sh | 46
Signed-off-by: Vasco Almeida
---
po/pt.po | 1377 ++
1 file changed, 1377 insertions(+)
create mode 100644 po/pt.po
diff --git a/po/pt.po b/po/pt.po
new file mode 100644
index 000..596aded
--- /dev/null
+++ b/po/pt.po
@@ -0,0
Unmark strings for translation for command help/hint.
These strings can not be translated, just copied.
Signed-off-by: Vasco Almeida
---
Moreover, prevent a possible translation mistake, e.g. wrong leading
spacing.
builtin/branch.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions
Move and split comment for translators (marked by TRANSLATORS) to be
immediately above the strings marked for translation.
As a result, the comment can now be extracted by xgettext.
Signed-off-by: Vasco Almeida
---
builtin/branch.c | 6 --
1 file changed, 4 insertions(+), 2 deletions
Às 18:01 de 10-04-2016, Junio C Hamano escreveu:
> Vasco Almeida writes:
>
>> Some translations might also translate "" and "".
>
> This offers an interesting observation that I didn't think of while
> reviewing the first round of this series.
>
Remove a comma from string marked for translation. Make the string match the
one in builtin/mv.c. Now translators have do handle this string only once.
Signed-off-by: Vasco Almeida
---
builtin/rm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/rm.c b/builtin/rm.c
zy and the translator needs to correct it herself.
Signed-off-by: Vasco Almeida
---
builtin/pull.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 9e8883c..617893c 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -475,10 +475,10 @@ s
Mark description and parameter for option "set-upstream-to" for translation.
Signed-off-by: Vasco Almeida
---
builtin/branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 7b45b6b..5ab106b 100644
--- a/builtin/bran
Some translations might also translate "" and "".
Signed-off-by: Vasco Almeida
---
builtin/pull.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 10eff03..9e8883c 100644
--- a/builtin/pull.c
+++ b/builtin/pull.
Change Makefile to include git-parse-remote.sh in LOCALIZED_SH.
TODO: remove 3rd argument of error_on_missing_default_upstream function
that is no longer required.
Signed-off-by: Vasco Almeida
---
Makefile| 2 +-
git-parse-remote.sh | 50
Mark strings seen by the user inside setup_unpack_trees_porcelain() and
display_error_msgs() functions for translation.
Signed-off-by: Vasco Almeida
---
unpack-trees.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
Git could output "completed with 1 local objects", but in this case
using "object" instead of "objects" is the correct form.
Use Q_() instead of _().
Signed-off-by: Vasco Almeida
---
builtin/index-pack.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
dif
Às 20:33 de 08-04-2016, Junio C Hamano escreveu:
> Vasco Almeida writes:
>
>> Some translations might also translate "" and "".
>> ...
>> fprintf_ln(stderr, _("See git-pull(1) for details."));
>> fprintf(std
Às 20:23 de 08-04-2016, Junio C Hamano escreveu:
> Vasco Almeida writes:
>
>> Mark strings seen by the user inside setup_unpack_trees_porcelain() and
>> display_error_msgs() functions for translation.
>>
>> One case Git outputs the named strings is when the user doe
zy and the translator needs to correct it herself.
Signed-off-by: Vasco Almeida
---
builtin/pull.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index a99d6b9..ac942f6 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -475,9 +475,9 @@ s
Mark description and parameter for option "set-upstream-to" for translation.
Signed-off-by: Vasco Almeida
---
builtin/branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 7b45b6b..5ab106b 100644
--- a/builtin/bran
Some translations might also translate "" and "".
Signed-off-by: Vasco Almeida
---
builtin/pull.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 10eff03..a99d6b9 100644
--- a/builtin/pull.c
+++ b/builtin/pull.
Change Makefile to include git-parse-remote.sh in LOCALIZED_SH.
TODO: remove 3rd argument of error_on_missing_default_upstream function
that is no longer required.
Signed-off-by: Vasco Almeida
---
Makefile| 2 +-
git-parse-remote.sh | 49
Add a comma to string marked for translation. Make the string match the
one in rm.c. Now translators have do handle this string only once.
Signed-off-by: Vasco Almeida
---
builtin/mv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index aeae855
Git could output "completed with 1 local objects", but in this case
using "object" instead of "objects" is the correct form.
Use Q_() instead of _().
Signed-off-by: Vasco Almeida
---
builtin/index-pack.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
dif
is the case of the first string marked.
Signed-off-by: Vasco Almeida
---
unpack-trees.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 9f55cc2..4bc6b4f 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -61,21
401 - 453 of 453 matches
Mail list logo
