Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
translations:msgmerge [2011/10/31 22:21] – Rework this page, it looks clumsy -- introduce option msgmerge -U to avoid redirection mike | translations:msgmerge [2012/01/30 17:55] (current) – gymka | ||
---|---|---|---|
Line 8: | Line 8: | ||
It is possible to merge strings by bypassing the redirection with the following options: | It is possible to merge strings by bypassing the redirection with the following options: | ||
- | msgmerge --backup=none -U your-po-file reference-po-file | + | msgmerge --backup=none -U your-po-file reference-po-or-pot-file |
This has the same effect, except the output is directly written inside '' | This has the same effect, except the output is directly written inside '' | ||
- | You can use a POT file as reference | + | You can use a POT file as reference |
===== Merge between stable and development branch ===== | ===== Merge between stable and development branch ===== | ||
Line 32: | Line 32: | ||
msgmerge Thunar-xfce-4-8.nl.po Thunar-master.nl.po > NEW-Thunar-master.nl.po | msgmerge Thunar-xfce-4-8.nl.po Thunar-master.nl.po > NEW-Thunar-master.nl.po | ||
- | Then delete both "Thunar-xfce-4-8.nl.po" | + | Then delete both '' |
+ | |||
+ | Upload '' | ||
- | Upload " |