Updated dcl's django.po to resolve some conflict
This commit is contained in:
		
					parent
					
						
							
								0a6275bcef
							
						
					
				
			
			
				commit
				
					
						ed26ac8b59
					
				
			
		
					 1 changed files with 5 additions and 3 deletions
				
			
		| 
						 | 
					@ -99,9 +99,11 @@ msgid ""
 | 
				
			||||||
"datacenterlight account.<br/>\n"
 | 
					"datacenterlight account.<br/>\n"
 | 
				
			||||||
"                %(base_url)s%(activation_link)s\n"
 | 
					"                %(base_url)s%(activation_link)s\n"
 | 
				
			||||||
"                "
 | 
					"                "
 | 
				
			||||||
msgstr "<a href="
 | 
					msgstr "\n"
 | 
				
			||||||
"\"%(base_url)s%(activation_link)s\">Klicke hier</a> um deinen %(dcl_text)s zu aktivieren.<br/><br/>Oder kopiere den folgenden Link in die Adressleiste deines Browsers und folge dann dem Link um deinen Data Center Light Account zu aktivieren.<br/>"
 | 
					"                <a href=\"%(base_url)s%(activation_link)s\">Klicke hier</a> um deinen %(dcl_text)s zu aktivieren.<br/><br/>\n"
 | 
				
			||||||
"%(base_url)s%(activation_link)s\n"
 | 
					"                Oder kopiere den folgenden Link in die Adressleiste deines Browsers und folge dann dem Link um deinen Data Center Light Account zu aktivieren.<br/>\n"
 | 
				
			||||||
 | 
					"                %(base_url)s%(activation_link)s\n"
 | 
				
			||||||
 | 
					"                "
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: templates/datacenterlight/emails/user_activation.html:123
 | 
					#: templates/datacenterlight/emails/user_activation.html:123
 | 
				
			||||||
#: templates/datacenterlight/emails/user_activation.txt:11
 | 
					#: templates/datacenterlight/emails/user_activation.txt:11
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue