diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:20:00 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:22:13 -0400 |
| commit | 4c7fd8cd0191871e48704f693f48554d4ee7a726 (patch) | |
| tree | a66a930783de938deaa3d2362dcf779e5c2b45af /apps/calendar/l10n/vi.php | |
| parent | 64ef1e21819979d7fdc406d2628bc175b16fe554 (diff) | |
| parent | 62e4f55f721971dacd06649cecefe0487626aa75 (diff) | |
| download | nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.tar.gz nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.zip | |
Merge branch 'master' into share_api
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
Diffstat (limited to 'apps/calendar/l10n/vi.php')
| -rw-r--r-- | apps/calendar/l10n/vi.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/apps/calendar/l10n/vi.php b/apps/calendar/l10n/vi.php index 059b89e1635..3594a095eba 100644 --- a/apps/calendar/l10n/vi.php +++ b/apps/calendar/l10n/vi.php @@ -79,9 +79,6 @@ "Month" => "Tháng", "List" => "Danh sách", "Today" => "Hôm nay", -"Calendars" => "Lịch", -"There was a fail, while parsing the file." => "Có một thất bại, trong khi phân tích các tập tin.", -"Choose active calendars" => "Chọn lịch hoạt động", "Your calendars" => "Lịch của bạn", "CalDav Link" => "Liên kết CalDav ", "Shared calendars" => "Chia sẻ lịch", @@ -129,7 +126,6 @@ "of" => "của", "at" => "tại", "Timezone" => "Múi giờ", -"Check always for changes of the timezone" => "Luôn kiểm tra múi giờ", "24h" => "24h", "12h" => "12h" ); |