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/vcard_attachments | |
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/vcard_attachments')
-rw-r--r-- | plugins/vcard_attachments/localization/ast.inc | 20 | ||||
-rw-r--r-- | plugins/vcard_attachments/localization/ko_KR.inc | 4 | ||||
-rw-r--r-- | plugins/vcard_attachments/skins/larry/style.css | 5 |
3 files changed, 22 insertions, 7 deletions
diff --git a/plugins/vcard_attachments/localization/ast.inc b/plugins/vcard_attachments/localization/ast.inc new file mode 100644 index 000000000..899e8a2d0 --- /dev/null +++ b/plugins/vcard_attachments/localization/ast.inc @@ -0,0 +1,20 @@ +<?php + +/* + +-----------------------------------------------------------------------+ + | plugins/vcard_attachments/localization/<lang>.inc | + | | + | Localization file of the Roundcube Webmail Vcard Attachments plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/ +*/ +$labels['addvcardmsg'] = 'Amestar vCard a la llibreta de direiciones'; +$labels['vcardsavefailed'] = 'Nun pue guardase la vCard'; +?>
\ No newline at end of file diff --git a/plugins/vcard_attachments/localization/ko_KR.inc b/plugins/vcard_attachments/localization/ko_KR.inc index b9b6906d2..fbbb73921 100644 --- a/plugins/vcard_attachments/localization/ko_KR.inc +++ b/plugins/vcard_attachments/localization/ko_KR.inc @@ -15,6 +15,6 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/ */ -$labels['addvcardmsg'] = '주소록에 vCard를 추가'; -$labels['vcardsavefailed'] = 'vCard 저장이 불가능함'; +$labels['addvcardmsg'] = '주소록에 vCard 추가'; +$labels['vcardsavefailed'] = 'vCard를 저장할 수 없음'; ?>
\ No newline at end of file diff --git a/plugins/vcard_attachments/skins/larry/style.css b/plugins/vcard_attachments/skins/larry/style.css index eb70082ee..4f9f61b81 100644 --- a/plugins/vcard_attachments/skins/larry/style.css +++ b/plugins/vcard_attachments/skins/larry/style.css @@ -4,14 +4,9 @@ p.vcardattachment { width: auto; background: #f9f9f9; border: 1px solid #d3d3d3; - border-radius:4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; border-radius: 4px; box-shadow: 0 0 2px #ccc; - -o-box-shadow: 0 0 2px #ccc; -webkit-box-shadow: 0 0 2px #ccc; - -moz-box-shadow: 0 0 2px #ccc; } p.vcardattachment a { |