Merged feature-filter into master

This commit is contained in:
Xian Nox
2013-11-28 07:07:57 +01:00
parent 8c083ea0a4
commit 698f12e2d7
10 changed files with 178 additions and 10 deletions

View File

@@ -72,22 +72,28 @@
<translation>使</translation>
</message>
<message>
<location filename="../../backupmanagerform.cpp" line="54"/>
<location filename="../../backupmanagerform.ui" line="122"/>
<location filename="../../backupmanagerform.cpp" line="210"/>
<source>Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../backupmanagerform.cpp" line="55"/>
<source>Default account</source>
<translation></translation>
</message>
<message>
<location filename="../../backupmanagerform.cpp" line="61"/>
<location filename="../../backupmanagerform.cpp" line="62"/>
<source>Are you sure to remove the backup of the following entry?</source>
<translation>?</translation>
</message>
<message>
<location filename="../../backupmanagerform.cpp" line="84"/>
<location filename="../../backupmanagerform.cpp" line="85"/>
<source>Backup disk usage: %1</source>
<translation>使: %1</translation>
</message>
<message>
<location filename="../../backupmanagerform.cpp" line="175"/>
<location filename="../../backupmanagerform.cpp" line="176"/>
<source> - (Launcher only)</source>
<translation> - (LiveArea専用)</translation>
</message>
@@ -294,6 +300,15 @@
</translation>
</message>
</context>
<context>
<name>FilterLineEdit</name>
<message>
<location filename="../../filterlineedit.cpp" line="21"/>
<location filename="../../filterlineedit.cpp" line="40"/>
<source>Filter</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWidget</name>
<message>