Merge commit '97de9bb8605eaeb47edd4d80b444605676bb83e2' into slop

[git.ikiwiki.info.git] / doc / translation / discussion.mdwn

diff --git a/doc/translation/discussion.mdwn b/doc/translation/discussion.mdwn
index 26097b5559dbcd48ebea1a20c6eddd256ed90276..35e8fd0542be20f994507d098d8610c44412cf44 100644 (file)
--- a/doc/translation/discussion.mdwn
+++ b/doc/translation/discussion.mdwn
@@ -17,15 +17,8 @@ updating my PO file? Should I send it to you for every ikiwiki issue?
 Maybe you should give write access to ikiwiki repository for translators
 of PO files?
 
 Maybe you should give write access to ikiwiki repository for translators
 of PO files?
 

-  > I recently set up a git repository mirroring the main svn repository (see
-  > [[download]]) and one idea is that perhaps translators can use that for a
-  > distributed revision control system that I can merge back from into svn.
-  > I can set up accounts for svn, but as it's on my own personal server and
-  > not a sourceforge/alioth like thing, it's a bit of a pain and maintenance
-  > burden for me.
-
-  >> OK, I've picked up Subversion for your ikiwiki, so I can get into
-  >> Git now ;)
+  > We use git now, so you can clone my repo, commit to your clone, and
+  > use git to mail me patches. --[[Joey]] 

 
 3. What is the best way to update my PO file when you do some changes in
 `ikiwiki.pot` file? Should I translate my PO file from scratch or
 
 3. What is the best way to update my PO file when you do some changes in
 `ikiwiki.pot` file? Should I translate my PO file from scratch or


@@ -94,4 +87,4 @@ translators. Thank you! :) --[[Paweł|ptecza]]
 > size limits. This is generally done by adding comments in the pot file,
 > and I've turned that on, and added a few. --[[Joey]]
 
 > size limits. This is generally done by adding comments in the pot file,
 > and I've turned that on, and added a few. --[[Joey]]
 

->> Thank you very much! It also will be a big help for me. --[[Paweł|ptecza]]
\ No newline at end of file
+>> Thank you very much! It also will be a big help for me. --[[Paweł|ptecza]]