Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
translations:msgmerge [2011/05/11 22:41] – pjotr | translations:msgmerge [2011/10/31 22:22] – [Merge between stable and development branch] 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 |
- | An example with a Dutch translation | + | msgmerge --backup=none -U your-po-file reference-po-file |
- | Both files are in the Downloads folder. | + | This has the same effect, except the output is directly written inside '' |
- | Copy/paste the following command | + | You can use a POT file as reference po file in order to sync your current translations with new and suppressed messages. |
- | cd Downloads | + | ===== Merge between stable and development branch ===== |
- | (press Enter) | + | 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. |
- | Now copy/ | + | A specific example is probably handy. Suppose you are working on the project //Thunar//, you can download PO files on [[https:// |
- | msgmerge packageW-xfce-4-8.nl.po packageW-master.nl.po > NEWpackageW.master.nl.po | + | Let's say //Thunar// is fully translated in the stable "xfce-4.8" branch and needs to be merged with an incomplete Dutch translation file in the development branch "master". |
- | (press Enter) | + | Once downloaded, let's say both files are available in the directory " |
- | Then delete both " | + | Copy/ |
- | Then rename " | + | cd Downloads |
+ | |||
+ | Now copy/paste the following command in your terminal: | ||
- | Finally: upload " | + | msgmerge Thunar-xfce-4-8.nl.po Thunar-master.nl.po |
- | Note that you cannot send the output directly to " | + | Then delete both '' |
+ | Upload '' |