From a433b6e03d0151d6b5ae698e9dfb64a045080c8e Mon Sep 17 00:00:00 2001
From: frisco <>
Date: Sun, 19 Jul 2009 07:04:56 +0000
Subject: [PATCH] tags/v0.3.5: Merged translations from
 branches/translation-base-v0.4

---
 stuff/debian-package_policy.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stuff/debian-package_policy.txt b/stuff/debian-package_policy.txt
index 16fa38c..ce932f4 100644
--- a/stuff/debian-package_policy.txt
+++ b/stuff/debian-package_policy.txt
@@ -22,6 +22,10 @@ just bugfix or language releases.
 	find -type f -name \*.po | grep /intl/es/ | while read po_file
 	  do	svn cp "$po_file" "tags/v0.x.y/$po_file"
 	 done
+ 
+ (In many cases it may be more appropriate just to do a `svn merge', similar to
+ "svn merge -r1099:1191 https://svn.systemausfall.org/svn/cryptobox/branches/translation-base-x.y \
+ working_dir_to_apply_merge")
 
  Add possible new languages to the "Languages" setting in
  'conf-examples/cryptobox.conf'.