diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2014-03-31 21:38:54 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2014-03-31 21:38:54 +0200 |
| commit | 6b061c236dd5730837b567f2c39a19af1617d33c (patch) | |
| tree | 27de0d46deae2987ea398f2f2aee4e26786c6f48 /settings/l10n/pa.php | |
| parent | 8951328a87c16e5ebfe4d3e5c392347db1e54f92 (diff) | |
| parent | ab696edba685cd6d2a64c2e48907f03197aae53f (diff) | |
| download | nextcloud-server-6b061c236dd5730837b567f2c39a19af1617d33c.tar.gz nextcloud-server-6b061c236dd5730837b567f2c39a19af1617d33c.zip | |
Merge branch 'master' into type-hinting
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
Diffstat (limited to 'settings/l10n/pa.php')
| -rw-r--r-- | settings/l10n/pa.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/settings/l10n/pa.php b/settings/l10n/pa.php index 795a80f7d42..aa83e11266d 100644 --- a/settings/l10n/pa.php +++ b/settings/l10n/pa.php @@ -7,7 +7,6 @@ $TRANSLATIONS = array( "Updating...." => "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ", "Error" => "ਗਲਤੀ", "Updated" => "ਅੱਪਡੇਟ ਕੀਤਾ", -"Saving..." => "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ", "deleted" => "ਹਟਾਈ", "undo" => "ਵਾਪਸ", "Groups" => "ਗਰੁੱਪ", @@ -15,10 +14,14 @@ $TRANSLATIONS = array( "Delete" => "ਹਟਾਓ", "add group" => "ਗਰੁੱਪ ਸ਼ਾਮਲ", "__language_name__" => "__ਭਾਸ਼ਾ_ਨਾਂ__", +"Login" => "ਲਾਗਇਨ", "Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ", "Setup Warning" => "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ", +"Server address" => "ਸਰਵਰ ਐਡਰੈਸ", "Password" => "ਪਾਸਵਰ", "Change password" => "ਪਾਸਵਰਡ ਬਦਲੋ", +"Cancel" => "ਰੱਦ ਕਰੋ", +"Login Name" => "ਲਾਗਇਨ", "Username" => "ਯੂਜ਼ਰ-ਨਾਂ" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; |