SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/guitorri/qucs

Browse Source 
Conflicts:
	qucs/qucs/qucs_de.ts
This commit is contained in:
Frans Schreuder 2012-08-08 13:00:03 +02:00
commit dfe82c0d75
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qucs/qucs_de.ts
View File

@ -1034,19 +1034,11 @@
</message>
<message>
<source>Type</source>
<<<<<<< HEAD
<translation type="unfinished">Typ</translation>
</message>
<message>
<source>Type:</source>
<translation type="unfinished">Typ:</translation>
=======
<translation>Typ</translation>
</message>
<message>
<source>Type:</source>
<translation>Typ:</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
</context>
<context>
@ -7637,12 +7629,17 @@ Verwendung: qucsedit [-r] Datei
<translation type="obsolete">Text</translation>
</message>
<message>
<<<<<<< HEAD
<source>Rectangle</source>
<translation type="obsolete">Rechteck</translation>
</message>
<message>
<source>filled Rectangle</source>
<translation type="obsolete">gefülltes Rechteck</translation>
=======
<source>Others</source>
<translation type="unfinished"></translation>
>>>>>>> b4ab12f2ac6cfbd5b300105abf64c2c0fc8adc30
</message>
<message>
<source>wrong dependency</source>