Differences
This shows you the differences between two versions of the page.
Next revision | Previous revisionNext revisionBoth sides next revision | ||
translations:msgmerge [2009/08/17 14:56] – created mike | translations:msgmerge [2011/10/31 22:21] – Rework this page, it looks clumsy -- introduce option msgmerge -U to avoid redirection mike | ||
---|---|---|---|
Line 1: | Line 1: | ||
====== Merge PO files ====== | ====== Merge PO files ====== | ||
- | The command line tool '' | + | The command line tool '' |
- | msgmerge | + | msgmerge |
- | The result in output.po contains | + | The result in '' |
- | This tool can be used to merge strings | + | It is possible |
- | Example with a PO file: | + | msgmerge --backup=none -U your-po-file reference-po-file |
- | msgmerge ~/ | + | This has the same effect, except the output is directly written inside '' |
- | mv fr.po.new fr.po | + | |
- | Note that you cannot send the output directly on fr.po because it will fail with an 100% untranslated PO file. | + | You can use a POT file as reference |
+ | ===== Merge between stable and development branch ===== | ||
+ | |||
+ | You can use this tool to merge strings from a development branch into the stable branch or vice versa. This is highly recommended to avoid unnecessary work. | ||
+ | |||
+ | A specific example is probably handy. Suppose you are working on the project //Thunar//, you can download PO files on [[https:// | ||
+ | |||
+ | Let's say //Thunar// is fully translated in the stable " | ||
+ | |||
+ | Once downloaded, let's say both files are available in the directory " | ||
+ | |||
+ | Copy/paste the following command in your terminal: | ||
+ | |||
+ | cd Downloads | ||
+ | |||
+ | Now copy/paste the following command in your terminal: | ||
+ | |||
+ | msgmerge Thunar-xfce-4-8.nl.po Thunar-master.nl.po > NEW-Thunar-master.nl.po | ||
+ | |||
+ | Then delete both " | ||
+ | |||
+ | Upload " |