mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5616 from owncloud/fixing-l10n-master 

Fixing l10n master
This commit is contained in:
Vincent Petry 2013-10-30 02:44:54 -07:00
parent de342a5ac7 ffb0e14d7b
commit 4c7ef85252
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/lib/app.php
View File

@ -57,7 +57,7 @@ class App {
// rename to "/Shared" is denied // rename to "/Shared" is denied
if( $dir === '/' and $newname === 'Shared' ) { if( $dir === '/' and $newname === 'Shared' ) {
$result['data'] = array( $result['data'] = array(
'message' => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved by ownCloud") 'message' => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved.")
); );
// rename to existing file is denied // rename to existing file is denied
} else if ($this->view->file_exists($dir . '/' . $newname)) { } else if ($this->view->file_exists($dir . '/' . $newname)) {

2
apps/files/tests/ajax_rename.php
View File

@ -88,7 +88,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
$result = $this->files->rename($dir, $oldname, $newname); $result = $this->files->rename($dir, $oldname, $newname);
$expected = array( $expected = array(
'success' => false, 'success' => false,
'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud") 'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved.")
); );
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);

3
apps/files_encryption/files/error.php
View File

@ -12,7 +12,8 @@ if (!isset($_)) { //also provide standalone error page
$errorMsg = $l->t('Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app.'); $errorMsg = $l->t('Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app.');
break; break;
case \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR: case \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR:
$errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.'); $theme = new OC_Defaults();
$errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.', array($theme->getName()));
break; break;
case \OCA\Encryption\Crypt::ENCRYPTION_NO_SHARE_KEY_FOUND: case \OCA\Encryption\Crypt::ENCRYPTION_NO_SHARE_KEY_FOUND:
$errorMsg = $l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.'); $errorMsg = $l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');

2
apps/user_ldap/ajax/testConfiguration.php
View File

@ -41,5 +41,5 @@ if($connection->setConfiguration($_POST)) {
} }
} else { } else {
OCP\JSON::error(array('message' OCP\JSON::error(array('message'
=> $l->t('The configuration is invalid. Please look in the ownCloud log for further details.'))); => $l->t('The configuration is invalid. Please have a look at the logs for further details.')));
} }

2
apps/user_ldap/lib/access.php
View File

@ -356,7 +356,7 @@ class Access extends LDAPUtility {
} }
//if everything else did not help.. //if everything else did not help..
\OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$dn.'.', \OCP\Util::INFO); \OCP\Util::writeLog('user_ldap', 'Could not create unique name for '.$dn.'.', \OCP\Util::INFO);
return false; return false;
} }