summaryrefslogtreecommitdiffstats
path: root/core/l10n/pa.php
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2014-01-31 16:43:12 +0100
committerBart Visscher <bartv@thisnet.nl>2014-01-31 16:43:12 +0100
commitbca725dc32e159d756f023d428816b8f9821b732 (patch)
treec3e1910e952728433c2572cea96fa8024c79d1d5 /core/l10n/pa.php
parent09d2ba017e603fe6ac237da7830d86d74b2da61c (diff)
parent271088a7a23ffcdb2082b6dfc5b6f50833612a0f (diff)
downloadnextcloud-server-bca725dc32e159d756f023d428816b8f9821b732.tar.gz
nextcloud-server-bca725dc32e159d756f023d428816b8f9821b732.zip
Merge branch 'master' into setup
Conflicts: core/setup.php
Diffstat (limited to 'core/l10n/pa.php')
-rw-r--r--core/l10n/pa.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/l10n/pa.php b/core/l10n/pa.php
index c8078d06c73..b637c429a6e 100644
--- a/core/l10n/pa.php
+++ b/core/l10n/pa.php
@@ -37,10 +37,12 @@ $TRANSLATIONS = array(
"Ok" => "ਠੀਕ ਹੈ",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "ਰੱਦ ਕਰੋ",
-"Error" => "ਗਲ",
"Share" => "ਸਾਂਝਾ ਕਰੋ",
+"Error" => "ਗਲ",
"Password" => "ਪਾਸਵਰ",
"Send" => "ਭੇਜੋ",
+"Warning" => "ਚੇਤਾਵਨੀ",
+"Delete" => "ਹਟਾਓ",
"Username" => "ਯੂਜ਼ਰ-ਨਾਂ",
"Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ"
);