Salome HOME
projects
/
modules
/
hydro.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
973d8a5
)
- Selected merge type translation is fixed.
author
rkv
<rkv@opencascade.com>
Fri, 1 Nov 2013 07:07:52 +0000
(07:07 +0000)
committer
rkv
<rkv@opencascade.com>
Fri, 1 Nov 2013 07:07:52 +0000
(07:07 +0000)
src/HYDROGUI/resources/HYDROGUI_msg_en.ts
patch
|
blob
|
history
diff --git
a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
index c99e1aa067336c30ce03e89b9281a6910f068447..27f2979243879d75ef568f3f88180cec1909a260 100644
(file)
--- a/
src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/
src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@
-60,6
+60,18
@@
does not exist or you have not enough permissions to open it.</translation>
<source>ZONE_BATHYMETRY</source>
<translation>Bathymetry</translation>
</message>
<source>ZONE_BATHYMETRY</source>
<translation>Bathymetry</translation>
</message>
+ <message>
+ <source>MERGE_UNKNOWN</source>
+ <translation>Unresolved Conflict</translation>
+ </message>
+ <message>
+ <source>MERGE_ZMIN</source>
+ <translation>ZMIN</translation>
+ </message>
+ <message>
+ <source>MERGE_ZMAX</source>
+ <translation>ZMAX</translation>
+ </message>
</context>
<context>
</context>
<context>
@@
-88,18
+100,6
@@
does not exist or you have not enough permissions to open it.</translation>
<source>REMOVE</source>
<translation>Remove</translation>
</message>
<source>REMOVE</source>
<translation>Remove</translation>
</message>
- <message>
- <source>MERGE_UNKNOWN</source>
- <translation>Unresolved Conflict</translation>
- </message>
- <message>
- <source>MERGE_ZMIN</source>
- <translation>ZMIN</translation>
- </message>
- <message>
- <source>MERGE_ZMAX</source>
- <translation>ZMAX</translation>
- </message>
</context>
<context>
</context>
<context>