diff options
| author | Christian S <christian@pix-art.de> | 2015-09-15 10:38:52 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-09-15 10:38:52 +0200 |
| commit | eb829eb307b69989ae4efdcb23cf2d8a28979b33 (patch) | |
| tree | 18d56593e47e1db1e7775c2e7b35ed0325e68ed6 /src/main/res/values-eu/strings.xml | |
| parent | 58a07c4ca2652a4fb92fe7da7c3861b4ffbccab4 (diff) | |
| parent | 183dad281c6d610b8a4cffa1f13c923a6e423355 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values-eu/strings.xml')
| -rw-r--r-- | src/main/res/values-eu/strings.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 9c99d7cf7..5af10b9c8 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -188,6 +188,8 @@ <string name="server_info_blocking">XEP-0191: Blocking Command</string> <string name="server_info_roster_version">XEP-0237: Roster Versioning</string> <string name="server_info_stream_management">XEP-0198: Stream Management</string> + <string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string> + <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string> <string name="server_info_available">eskuragarri</string> <string name="server_info_unavailable">ez eskuragarri</string> <string name="missing_public_keys">Gako publikoen iragarpenak faltan</string> @@ -406,7 +408,6 @@ <string name="public_conference">Publikoki edonor sar daiteken konferentzia</string> <string name="private_conference">Konferentzia pribatua, kideentzat soilik</string> <string name="conference_options">Konferentziaren aukerak</string> - <string name="members_only">Pribatua (kideak soilik)</string> <string name="non_anonymous">Ez anonimoa</string> <string name="modified_conference_options">Konferentziaren aukerak aldatu dira</string> <string name="could_not_modify_conference_options">Konferentziaren aukerak ezin izan dira aldatu</string> |