Completed
Pull Request — master (#360)
by Sander
07:41 queued 01:48
created
lib/Service/IconService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -181,7 +181,7 @@
 block discarded – undo
181 181
 	}
182 182
 
183 183
 
184
-	private function parseLinkElement($htmlHead, $pageUrlInfo, $base_href){
184
+	private function parseLinkElement($htmlHead, $pageUrlInfo, $base_href) {
185 185
 		if (preg_match('#<\s*link[^>]*(rel=(["\'])[^>\2]*icon[^>\2]*\2)[^>]*>#i', $htmlHead, $matches)) {
186 186
 			$link_tag = $matches[0];
187 187
 			$this->debugInfo['link_tag'] = $link_tag;
Please login to merge, or discard this patch.
controller/translationcontroller.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -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.