diff options
| author | lookshe <github@lookshe.org> | 2016-03-08 21:13:24 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-08 21:13:24 +0100 |
| commit | 74d6d10cb76b7440f57db193a3c38e476206969c (patch) | |
| tree | 665b7787c0f7bcb6d759e849972fa9658e84423f /src/main/res/values-nb-rNO/strings.xml | |
| parent | 7be757de90fb71042b79b88a76cd36fc07b2ee87 (diff) | |
| parent | f051dd0bcdbd35d101420fb1f75f33a565a1e0f8 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values-nb-rNO/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index 47d7334d..623013e1 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -96,7 +96,6 @@ <string name="contact_has_no_pgp_key">Conversations kan ikke kryptere din melding fordi din kontakt ikke annonserer sin offentlige nøkkel.\n\n<small>Spør din kontakt om å sette opp OpenPGP.</small></string> <string name="no_pgp_keys">Ingen OpenPGP-nøkler funnet</string> <string name="contacts_have_no_pgp_keys">Conversations kan ikke kryptere din melding fordi dine kontakter ikke annonserer sine offentlige nøkkler.\n\n<small>Spør din kontakt om å sette opp OpenPGP.</small></string> - <string name="encrypted_message_received"><i>Kryptert melding mottatt. Trykk for å dekryptere.</i></string> <string name="pref_general">Generelt</string> <string name="pref_xmpp_resource">XMPP-ressurs</string> <string name="pref_xmpp_resource_summary">Navnet denne klienten identifiserer seg med</string> @@ -239,7 +238,6 @@ <string name="bookmark_already_exists">Dette bokmerket finnes allerede</string> <string name="you">Deg</string> <string name="action_edit_subject">Rediger temaet for konferansen</string> - <string name="conference_not_found">Fant ikke konferansen</string> <string name="leave">Forlat</string> <string name="contact_added_you">Kontakt la deg til i sin liste</string> <string name="add_back">Gjengjeld tjenesten</string> |