diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index a124df4ca..1516b4c9f 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -335,7 +335,7 @@ - GPG Name + PGP Name @@ -352,7 +352,7 @@ - GPG Email + PGP Email @@ -389,14 +389,14 @@ - GPG Id + PGP Id - GPG Hash + PGP Hash diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui index 698ff4ee3..04ce626fa 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui +++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui @@ -65,7 +65,7 @@ - Chose for Merge + Choose for Merge diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index f89207834..e42e360ce 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -6424,19 +6424,19 @@ p, li { white-space: pre-wrap; } - GPG Name + PGP Name - GPG Email + PGP Email - GPG Id + PGP Id - GPG Hash + PGP Hash @@ -12150,10 +12150,6 @@ Try to be patient! Enable Obsolete Edits - - Chose for Merge - - Merge for Republish (TODO) @@ -12214,6 +12210,10 @@ Try to be patient! Edit Wiki Page + + Choose for Merge + + WikiGroupDialog