hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'stable-1.1' of git@github.com:LMMS/lmms.git

Browse Source 
Conflicts:
	src/gui/MainWindow.cpp
	src/gui/plugin_browser.cpp
This commit is contained in:
Lukas W
2014-11-25 01:01:47 +01:00
parent 9e245f7ca0 e47c1242b8
commit 02cbc89f0f
22 changed files with 872 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
data/locale/en.ts
View File

@@ -42,11 +42,11 @@ If you're interested in translating LMMS in another language or want to imp
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://lmms.sourceforge.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://lmms.sourceforge.net&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<source>LMMS</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>LMMS</source>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://lmms.io&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://lmms.io&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -651,6 +651,60 @@ If you&apos;re interested in translating LMMS in another language or want to imp
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DelayControls</name>
<message>
<source>Delay Samples</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feedback</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Lfo Frequency</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Lfo Amount</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DelayControlsDialog</name>
<message>
<source>Delay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delay Time Samples:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feedback</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feedback Amount:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Lfo Hz</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Lfo Hz:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Lfo Amt</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Lfo Amt:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DualFilterControlDialog</name>
<message>
@@ -7016,6 +7070,10 @@ This chip was used in the Commodore 64 computer.</source>
<source>A NES-like synthesizer</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A native delay plugin</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>projectNotes</name>

BIN
data/locale/it.qm
View File

Binary file not shown.

2
data/locale/it.ts
View File

@@ -2741,7 +2741,7 @@ Visitare http://lmms.sf.net/wiki per la documentazione di LMMS.</translation>
</message>
<message>
<source>E&amp;xport tracks...</source>
<translation>E&amp;sporta traccie...</translation>
<translation type="unfinished">E&amp;sporta tracce...</translation>
</message>
<message>
<source>LMMS (*.mmp *.mmpz)</source>