Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added patch from Henry

Browse Source 
- some more corrections

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6026 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-12-21 20:26:09 +00:00
parent f1777abb59
commit fc78f6c7ac
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/Identity/IdDialog.ui
View File

@ -335,7 +335,7 @@
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>GPG Name</string> <string>PGP Name</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -352,7 +352,7 @@
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>GPG Email</string> <string>PGP Email</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -389,14 +389,14 @@
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>GPG Id</string> <string>PGP Id</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>GPG Hash</string> <string>PGP Hash</string>
</property> </property>
</widget> </widget>
</item> </item>

2
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui
View File

@ -65,7 +65,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_Merge"> <widget class="QCheckBox" name="checkBox_Merge">
<property name="text"> <property name="text">
<string>Chose for Merge</string> <string>Choose for Merge</string>
</property> </property>
</widget> </widget>
</item> </item>

16
retroshare-gui/src/lang/retroshare_en.ts
View File

@ -6424,19 +6424,19 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>GPG Name</source> <source>PGP Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>GPG Email</source> <source>PGP Email</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>GPG Id</source> <source>PGP Id</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>GPG Hash</source> <source>PGP Hash</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -12150,10 +12150,6 @@ Try to be patient!</source>
<source>Enable Obsolete Edits</source> <source>Enable Obsolete Edits</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Chose for Merge</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Merge for Republish (TODO)</source> <source>Merge for Republish (TODO)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -12214,6 +12210,10 @@ Try to be patient!</source>
<source>Edit Wiki Page</source> <source>Edit Wiki Page</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Choose for Merge</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>WikiGroupDialog</name> <name>WikiGroupDialog</name>