diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-10-02 18:23:59 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-10-02 18:23:59 +0200 |
| commit | a90ea2c069998d378ec49825ce53b7651a459c1a (patch) | |
| tree | 7b1afe4ef7dd5509f25c4be7829aa6834877a979 /core/l10n/cy_GB.php | |
| parent | 5db98aadd30b9f1218dda8f836acca0062ce1d9f (diff) | |
| parent | 551e80979046358b9cbc8a0f8db0ff9cdf919e33 (diff) | |
| download | nextcloud-server-a90ea2c069998d378ec49825ce53b7651a459c1a.tar.gz nextcloud-server-a90ea2c069998d378ec49825ce53b7651a459c1a.zip | |
Merge remote-tracking branch 'origin/master' into setup
Diffstat (limited to 'core/l10n/cy_GB.php')
| -rw-r--r-- | core/l10n/cy_GB.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php index 1f6c50524b3..78eb6ba9698 100644 --- a/core/l10n/cy_GB.php +++ b/core/l10n/cy_GB.php @@ -44,6 +44,8 @@ $TRANSLATIONS = array( "Yes" => "Ie", "No" => "Na", "Ok" => "Iawn", +"_{count} file conflict_::_{count} file conflicts_" => array("","","",""), +"Cancel" => "Diddymu", "The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.", "Error" => "Gwall", "The app name is not specified." => "Nid yw enw'r pecyn wedi cael ei nodi.", |