PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Change wording on keyserver upload and disable by default for new keys

Browse source
This commit is contained in:
Vincent Breitmoser 2018-03-26 21:39:04 +02:00
parent b598a4d965
commit f96fdd582f
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
View file

@ -149,10 +149,7 @@ public class CreateKeyFinalFragment extends Fragment {
}
});
// If this is a debug build, don't upload by default
if (Constants.DEBUG) {
mUploadCheckbox.setChecked(false);
}
mUploadCheckbox.setChecked(false);
return view;
}

1
OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
View file

@ -72,7 +72,6 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:checked="true"
android:text="@string/create_key_upload"
android:id="@+id/create_key_upload" />

4
OpenKeychain/src/main/res/values/strings.xml
View file

@ -707,7 +707,7 @@
<string name="key_view_action_share_with">"Share with…"</string>
<string name="key_view_action_share_ssh_with">"Share as SSH public key with…"</string>
<string name="key_view_action_share_nfc">"Share over NFC"</string>
<string name="key_view_action_upload">"Upload to keyserver"</string>
<string name="key_view_action_upload">"Publish on keyserver"</string>
<string name="key_view_tab_main">"Main Info"</string>
<string name="key_view_tab_start">"Start"</string>
<string name="key_view_tab_share">"Share"</string>
@ -787,7 +787,7 @@
<string name="edit_key_error_bad_security_token_stripped">"Cannot move key to Security Token (either stripped or already on Security Token)!"</string>
<!-- Create key -->
<string name="create_key_upload">"Synchronize with the Internet"</string>
<string name="create_key_upload">"Publish on keyservers"</string>
<string name="create_key_empty">"This field is required"</string>
<string name="create_key_passphrases_not_equal">"Passwords do not match"</string>
<string name="create_key_final_text">"You entered the following identity:"</string>