On Sat, Mar 15, 2014 at 11:56 PM, Justin Lebar <jlebar@xxxxxxxxxx> wrote: > There's a similar incompatibility with the l10n change and "Fix > misuses of "nor" outside comments": The former references strings > changed in the latter. Should I merge these, or should I enforce a > particular ordering between these patches? (Right now the l10n patch > comes before the string changes in the code, but that's probably wrong > now that I think about it.) I think you can drop the l10n patch. After the source code is updated, new .pot will be generated (probably by Jiang) and .po also automatically updated. Updated strings in .po are most likely marked "fuzzy" so translators can double check. So you changes in the source code will be propagated to .po eventually. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html