diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 11:18:00 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 11:18:00 +0200 |
| commit | fc76a13c520d1d5345c721e0616d770e1fd344ea (patch) | |
| tree | 1dc8e108588a52182e0c8c346423aab171e66944 /core/l10n/af_ZA.php | |
| parent | 534d93d2d3d549039db2661cdc4b9e939a0abe0d (diff) | |
| parent | 9851f0f4f2a97dc6ac1382bcd533eb23feffa4e0 (diff) | |
| download | nextcloud-server-fc76a13c520d1d5345c721e0616d770e1fd344ea.tar.gz nextcloud-server-fc76a13c520d1d5345c721e0616d770e1fd344ea.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/public/share.php
Diffstat (limited to 'core/l10n/af_ZA.php')
| -rw-r--r-- | core/l10n/af_ZA.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php index 41447055609..6a0bbc53ac9 100644 --- a/core/l10n/af_ZA.php +++ b/core/l10n/af_ZA.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Password" => "Wagwoord", "Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}", "You will receive a link to reset your password via Email." => "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.", |