diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-02 10:11:18 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-02 10:11:18 +0200 |
| commit | 8b08b1b455b474de3fa376dfafa3de63727364ea (patch) | |
| tree | 536b2d4ba4f979d69f4f6e73755e06635345f78a /core/l10n/cs_CZ.php | |
| parent | 084f76fd14125023d5b7277c558eb86a20ea07d3 (diff) | |
| parent | 535ed8369f701a184340a428e82cc8d7cc7588bb (diff) | |
| download | nextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.tar.gz nextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/private/util.php
Diffstat (limited to 'core/l10n/cs_CZ.php')
| -rw-r--r-- | core/l10n/cs_CZ.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index 449a49f5686..8b63079c87a 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -59,7 +59,10 @@ $TRANSLATIONS = array( "Ok" => "Ok", "Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"One file conflict" => "Jeden konflikt souboru", +"Which files do you want to keep?" => "Které soubory chcete ponechat?", "Cancel" => "Zrušit", +"Continue" => "Pokračovat", "The object type is not specified." => "Není určen typ objektu.", "Error" => "Chyba", "The app name is not specified." => "Není určen název aplikace.", |