Xfce Wiki

Sub domains
 

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
translations:msgmerge [2011/10/31 22:21] – Rework this page, it looks clumsy -- introduce option msgmerge -U to avoid redirection miketranslations: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 ''your-po-file''. This has the same effect, except the output is directly written inside ''your-po-file''.
  
-You can use a POT file as reference po file in order to sync your current translations with new and suppressed messages.+You can use a POT file as reference PO file in order to sync your current translations with new and suppressed messages.
  
 ===== 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" (you don't need it anymore) and "Thunar-master.nl.po" (you don't want a name conflict in the next step).+Then delete both ''Thunar-xfce-4-8.nl.po'' (you don't need it anymore) and ''Thunar-master.nl.po'' (you don't want a name conflict in the next step). 
 + 
 +Upload ''NEW-Thunar-master.nl.po'' in Transifex. 
  
-Upload "NEW-Thunar-master.nl.po" in Transifex.