1.5.5dev: merge [17681] from 1.4-stable (closes #13572)

[skip ci]


git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@17682 af82e41b-90c4-0310-8c96-b1721e28e2e2

.tx/config

@@ -1,19 +1,18 @@
 [main]
 host = https://www.transifex.com
 
-[trac.trunk-messages-js-pot]
+[o:cboos:p:trac:r:trunk-messages-js-pot]
 file_filter = trac/locale/<lang>/LC_MESSAGES/messages-js.po
 source_file = trac/locale/messages-js.pot
 source_lang = en
 
-[trac.trunk-messages-pot]
+[o:cboos:p:trac:r:trunk-messages-pot]
 file_filter = trac/locale/<lang>/LC_MESSAGES/messages.po
 source_file = trac/locale/messages.pot
 source_lang = en
 
-[trac.trunk-tracini-pot]
+[o:cboos:p:trac:r:trunk-tracini-pot]
 file_filter = trac/locale/<lang>/LC_MESSAGES/tracini.po
 source_file = trac/locale/tracini.pot
 source_lang = en
-type = PO
 

Makefile

@@ -304,7 +304,7 @@ tx-merge-%:
 	    touch $(catalog.po); \
 	    mv $(catalog.po) $(catalog.po).orig; \
 	)
-	@tx pull --force --no-interactive -l $(*)
+	@tx pull --force --silent -l $(*)
 	@$(foreach catalog,$(catalogs), \
 	    [ -f $(catalog.po) ] && mv $(catalog.po) $(catalog.po).tx; \
 	    mv $(catalog.po).orig $(catalog.po); \