diff options
author | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
---|---|---|
committer | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
commit | 11a40dd1fef6c5b78b054617caba4325f95ee386 (patch) | |
tree | de2e1d7efd6423ef4d1256dd5c90a972ad172719 /plugins/userinfo/localization | |
parent | 187fd666aa2f32dedfe544d69b7cb213698197f2 (diff) | |
parent | ba084313bfc9c7a5a83e0611fe4376543cc1653d (diff) |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
Diffstat (limited to 'plugins/userinfo/localization')
-rw-r--r-- | plugins/userinfo/localization/ast.inc | 4 | ||||
-rw-r--r-- | plugins/userinfo/localization/ko_KR.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/userinfo/localization/ast.inc b/plugins/userinfo/localization/ast.inc index 179c5ba29..e70d0a6d7 100644 --- a/plugins/userinfo/localization/ast.inc +++ b/plugins/userinfo/localization/ast.inc @@ -17,6 +17,6 @@ */ $labels['userinfo'] = 'Información d\'usuariu'; $labels['created'] = 'Creáu'; -$labels['lastlogin'] = 'Cabera conexón'; -$labels['defaultidentity'] = 'Identidá predeterminada'; +$labels['lastlogin'] = 'Aniciu de sesión caberu'; +$labels['defaultidentity'] = 'Identidá por defeutu'; ?>
\ No newline at end of file diff --git a/plugins/userinfo/localization/ko_KR.inc b/plugins/userinfo/localization/ko_KR.inc index 5a95d2e77..98d4fc2e3 100644 --- a/plugins/userinfo/localization/ko_KR.inc +++ b/plugins/userinfo/localization/ko_KR.inc @@ -16,7 +16,7 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/ */ $labels['userinfo'] = '사용자 정보'; -$labels['created'] = '생성됨'; +$labels['created'] = '생성함'; $labels['lastlogin'] = '마지막 로그인'; -$labels['defaultidentity'] = '기본 신분증'; +$labels['defaultidentity'] = '기본 신원'; ?>
\ No newline at end of file |