i18n: init-db: join message pieces
Join message displayed during repository initialization in one entire sentence. That would improve translations since it's easier translate an entire sentence than translating each piece. Update Icelandic translation to reflect the changes. The Icelandic translation of these messages is used with test t0204-gettext-reencode-sanity.sh and not updating the translation would fail the test. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Jun 17, 2016 at 21:54 UTC
c30364d0804e260049c0933879a3bafe01e5e57e
2 files changed
+38
-25
builtin/init-db.c
+10
-7
@@ -397,13 +397,16 @@ int init_db(const char *template_dir, unsigned int flags)
397
if (!(flags & INIT_DB_QUIET)) {
398
int len = strlen(git_dir);
399
400
- /* TRANSLATORS: The first '%s' is either "Reinitialized
401
- existing" or "Initialized empty", the second " shared" or
402
- "", and the last '%s%s' is the verbatim directory name. */
403
- printf(_("%s%s Git repository in %s%s\n"),
404
- reinit ? _("Reinitialized existing") : _("Initialized empty"),
405
- get_shared_repository() ? _(" shared") : "",
406
- git_dir, len && git_dir[len-1] != '/' ? "/" : "");
400
+ if (reinit)
401
+ printf(get_shared_repository()
402
+ ? _("Reinitialized existing shared Git repository in %s%s\n")
403
+ : _("Reinitialized existing Git repository in %s%s\n"),
404
+ git_dir, len && git_dir[len-1] != '/' ? "/" : "");
405
+ else
406
+ printf(get_shared_repository()
407
+ ? _("Initialized empty shared Git repository in %s%s\n")
408
+ : _("Initialized empty Git repository in %s%s\n"),
409
+ git_dir, len && git_dir[len-1] != '/' ? "/" : "");
410
}
411
412
return 0;
po/is.po
+28
-18
@@ -7,14 +7,15 @@ msgid ""
7
msgstr ""
8
"Project-Id-Version: Git\n"
9
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10
-"POT-Creation-Date: 2010-09-20 14:44+0000\n"
11
-"PO-Revision-Date: 2010-06-05 19:06 +0000\n"
12
-"Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
10
+"POT-Creation-Date: 2016-06-17 18:55+0000\n"
11
+"PO-Revision-Date: 2016-06-17 19:17+0000\n"
12
+"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
13
"Language-Team: Git Mailing List <git@vger.kernel.org>\n"
14
"Language: is\n"
15
"MIME-Version: 1.0\n"
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
+"X-Generator: Poedit 1.8.5\n"
19
20
#. TRANSLATORS: This is a test. You don't need to translate it.
21
#: t/t0200/test.c:5
@@ -72,22 +73,31 @@ msgstr "TILRAUN: Perl tilraunastrengur"
73
msgid "TEST: A Perl test variable %s"
74
msgstr "TILRAUN: Perl tilraunastrengur með breytunni %s"
75
75
-#. TRANSLATORS: The first '%s' is either "Reinitialized
76
-#. existing" or "Initialized empty", the second " shared" or
77
-#. "", and the last '%s%s' is the verbatim directory name.
78
-#: builtin/init-db.c:355
76
+#: builtin/init-db.c:402
77
#, c-format
80
-msgid "%s%s Git repository in %s%s\n"
81
-msgstr "%s%s Git lind í %s%s\n"
78
+msgid "Reinitialized existing shared Git repository in %s%s\n"
79
+msgstr "Endurgerði Git lind í %s%s\n"
80
83
-#: builtin/init-db.c:356
84
-msgid "Reinitialized existing"
85
-msgstr "Endurgerði"
81
+#: builtin/init-db.c:403
82
+#, c-format
83
+msgid "Reinitialized existing Git repository in %s%s\n"
84
+msgstr "Endurgerði Git lind í %s%s\n"
85
+
86
+#: builtin/init-db.c:407
87
+#, c-format
88
+msgid "Initialized empty shared Git repository in %s%s\n"
89
+msgstr "Bjó til tóma sameiginlega Git lind í %s%s\n"
90
+
91
+#: builtin/init-db.c:408
92
+#, c-format
93
+msgid "Initialized empty Git repository in %s%s\n"
94
+msgstr "Bjó til tóma Git lind í %s%s\n"
95
+
96
+#~ msgid "Reinitialized existing"
97
+#~ msgstr "Endurgerði"
98
87
-#: builtin/init-db.c:356
88
-msgid "Initialized empty"
89
-msgstr "Bjó til tóma"
99
+#~ msgid "Initialized empty"
100
+#~ msgstr "Bjó til tóma"
101
91
-#: builtin/init-db.c:357
92
-msgid " shared"
93
-msgstr " sameiginlega"
102
+#~ msgid " shared"
103
+#~ msgstr " sameiginlega"