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>

builtin/init-db.c

@@ -397,13 +397,16 @@ int init_db(const char *template_dir, unsigned int flags)
 	if (!(flags & INIT_DB_QUIET)) {
 		int len = strlen(git_dir);
 
-		/* TRANSLATORS: The first '%s' is either "Reinitialized
+		if (reinit)
-		   existing" or "Initialized empty", the second " shared" or
+			printf(get_shared_repository()
-		   "", and the last '%s%s' is the verbatim directory name. */
+			       ? _("Reinitialized existing shared Git repository in %s%s\n")
-		printf(_("%s%s Git repository in %s%s\n"),
+			       : _("Reinitialized existing Git repository in %s%s\n"),
-		       reinit ? _("Reinitialized existing") : _("Initialized empty"),
+			       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
-		       get_shared_repository() ? _(" shared") : "",
+		else
-		       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
+			printf(get_shared_repository()
+			       ? _("Initialized empty shared Git repository in %s%s\n")
+			       : _("Initialized empty Git repository in %s%s\n"),
+			       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
 	}
 
 	return 0;

po/is.po

@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2010-09-20 14:44+0000\n"
+"POT-Creation-Date: 2016-06-17 18:55+0000\n"
-"PO-Revision-Date: 2010-06-05 19:06 +0000\n"
+"PO-Revision-Date: 2016-06-17 19:17+0000\n"
-"Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
+"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Git Mailing List <git@vger.kernel.org>\n"
 "Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.5\n"
 
 #. TRANSLATORS: This is a test. You don't need to translate it.
 #: t/t0200/test.c:5
@@ -72,22 +73,31 @@ msgstr "TILRAUN: Perl tilraunastrengur"
 msgid "TEST: A Perl test variable %s"
 msgstr "TILRAUN: Perl tilraunastrengur með breytunni %s"
 
-#. TRANSLATORS: The first '%s' is either "Reinitialized
+#: builtin/init-db.c:402
-#. existing" or "Initialized empty", the second " shared" or
-#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:355
 #, c-format
-msgid "%s%s Git repository in %s%s\n"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
-msgstr "%s%s Git lind í %s%s\n"
+msgstr "Endurgerði Git lind í %s%s\n"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:403
-msgid "Reinitialized existing"
+#, c-format
-msgstr "Endurgerði"
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Endurgerði Git lind í %s%s\n"
+
+#: builtin/init-db.c:407
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Bjó til tóma sameiginlega Git lind í %s%s\n"
+
+#: builtin/init-db.c:408
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Bjó til tóma Git lind í %s%s\n"
+
+#~ msgid "Reinitialized existing"
+#~ msgstr "Endurgerði"
 
-#: builtin/init-db.c:356
+#~ msgid "Initialized empty"
-msgid "Initialized empty"
+#~ msgstr "Bjó til tóma"
-msgstr "Bjó til tóma"
 
-#: builtin/init-db.c:357
+#~ msgid " shared"
-msgid " shared"
+#~ msgstr " sameiginlega"
-msgstr " sameiginlega"