| 
                                                        @@ -41,7 +41,7 @@  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    41
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    41
                                                                                                                                                                                                 | 
                                                             	public function getLanguageStrings() { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    42
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    42
                                                                                                                                                                                                 | 
                                                             		$translations = array(  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    43
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    43
                                                                                                                                                                                                 | 
                                                             			// js/app/controllers/bookmarklet.js  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    44
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			'generating.sharing.keys' =>  $this->trans->t('Generating sharing keys (%s/2)','%step'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    44
                                                                                                                                                                                                 | 
                                                            +			'generating.sharing.keys' =>  $this->trans->t('Generating sharing keys (%s/2)', '%step'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    45
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    45
                                                                                                                                                                                                 | 
                                                             			'invalid.vault.key' => $this->trans->t('Incorrect vault password!'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    46
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    46
                                                                                                                                                                                                 | 
                                                             			'password.do.not.match' => $this->trans->t('Passwords do not match'), | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    47
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    47
                                                                                                                                                                                                 | 
                                                             			'general' => $this->trans->t('General'), | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.