Skip to content

Commit

Permalink
Updated Dutch and English and pre-updated Simplified Chinese via @mao…
Browse files Browse the repository at this point in the history
  • Loading branch information
annejan committed Oct 12, 2016
1 parent 116bbe8 commit ffef3e0
Show file tree
Hide file tree
Showing 6 changed files with 318 additions and 331 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

**Implemented enhancements:**

- More options for password generation [\#98](https://github.com/IJHack/QtPass/issues/98)
- Git hangs on windows [\#71](https://github.com/IJHack/QtPass/issues/71)

**Closed issues:**
Expand All @@ -16,6 +15,8 @@

**Merged pull requests:**

- Password templates [\#207](https://github.com/IJHack/QtPass/pull/207) ([jounathaen](https://github.com/jounathaen))
- Updated German Translation [\#206](https://github.com/IJHack/QtPass/pull/206) ([jounathaen](https://github.com/jounathaen))
- Italian translation [\#204](https://github.com/IJHack/QtPass/pull/204) ([dakk](https://github.com/dakk))
- keygendialog email and name validition \(issue 202\) [\#203](https://github.com/IJHack/QtPass/pull/203) ([dakk](https://github.com/dakk))
- Lookup validity field to check if keys are valid [\#201](https://github.com/IJHack/QtPass/pull/201) ([thotypous](https://github.com/thotypous))
Expand Down
30 changes: 15 additions & 15 deletions localization/localization_en_GB.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,27 +72,27 @@
<message>
<location filename="../configdialog.ui" line="322"/>
<source>Select character set for password generation</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../configdialog.ui" line="326"/>
<source>All Characters</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../configdialog.ui" line="331"/>
<source>Alphabetical</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../configdialog.ui" line="336"/>
<source>Alphanumerical</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../configdialog.ui" line="341"/>
<source>Custom</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../configdialog.ui" line="379"/>
Expand Down Expand Up @@ -441,22 +441,22 @@ Expire-Date: 0
<message>
<location filename="../keygendialog.cpp" line="133"/>
<source>Invalid name</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../keygendialog.cpp" line="134"/>
<source>Name must be at least 5 characters long.</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../keygendialog.cpp" line="144"/>
<source>Invalid email</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../keygendialog.cpp" line="145"/>
<source>The email address you typed is not a valid email address.</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../keygendialog.cpp" line="160"/>
Expand Down Expand Up @@ -845,32 +845,32 @@ You will not be able to decrypt any newly added passwords!</translation>
<message>
<location filename="../passworddialog.ui" line="101"/>
<source>Character Set:</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../passworddialog.ui" line="109"/>
<source>All Characters</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../passworddialog.ui" line="114"/>
<source>Alphabetical</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../passworddialog.ui" line="119"/>
<source>Alphanumerical</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../passworddialog.ui" line="124"/>
<source>Custom</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../passworddialog.ui" line="142"/>
<source>Length:</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
Expand Down
30 changes: 15 additions & 15 deletions localization/localization_en_US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,27 +72,27 @@
<message>
<location filename="../configdialog.ui" line="322"/>
<source>Select character set for password generation</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../configdialog.ui" line="326"/>
<source>All Characters</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../configdialog.ui" line="331"/>
<source>Alphabetical</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../configdialog.ui" line="336"/>
<source>Alphanumerical</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../configdialog.ui" line="341"/>
<source>Custom</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../configdialog.ui" line="379"/>
Expand Down Expand Up @@ -441,22 +441,22 @@ Expire-Date: 0
<message>
<location filename="../keygendialog.cpp" line="133"/>
<source>Invalid name</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../keygendialog.cpp" line="134"/>
<source>Name must be at least 5 characters long.</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../keygendialog.cpp" line="144"/>
<source>Invalid email</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../keygendialog.cpp" line="145"/>
<source>The email address you typed is not a valid email address.</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../keygendialog.cpp" line="160"/>
Expand Down Expand Up @@ -845,32 +845,32 @@ You will not be able to decrypt any newly added passwords!</translation>
<message>
<location filename="../passworddialog.ui" line="101"/>
<source>Character Set:</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../passworddialog.ui" line="109"/>
<source>All Characters</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../passworddialog.ui" line="114"/>
<source>Alphabetical</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../passworddialog.ui" line="119"/>
<source>Alphanumerical</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../passworddialog.ui" line="124"/>
<source>Custom</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../passworddialog.ui" line="142"/>
<source>Length:</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
Expand Down
28 changes: 14 additions & 14 deletions localization/localization_nl_BE.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,27 +117,27 @@
<message>
<location filename="../configdialog.ui" line="322"/>
<source>Select character set for password generation</source>
<translation type="unfinished"></translation>
<translation>Kies tekenset voor wachtwoord generatie</translation>
</message>
<message>
<location filename="../configdialog.ui" line="326"/>
<source>All Characters</source>
<translation type="unfinished"></translation>
<translation>Alle tekens</translation>
</message>
<message>
<location filename="../configdialog.ui" line="331"/>
<source>Alphabetical</source>
<translation type="unfinished"></translation>
<translation>Alphabetisch</translation>
</message>
<message>
<location filename="../configdialog.ui" line="336"/>
<source>Alphanumerical</source>
<translation type="unfinished"></translation>
<translation>Alphanumeriek</translation>
</message>
<message>
<location filename="../configdialog.ui" line="341"/>
<source>Custom</source>
<translation type="unfinished"></translation>
<translation>Eigen tekenset</translation>
</message>
<message>
<location filename="../configdialog.ui" line="403"/>
Expand Down Expand Up @@ -501,17 +501,17 @@ Expire-Date: 0
<message>
<location filename="../keygendialog.cpp" line="134"/>
<source>Name must be at least 5 characters long.</source>
<translation type="unfinished"></translation>
<translation>Naam dient minstens 5 karakters lang te zijn.</translation>
</message>
<message>
<location filename="../keygendialog.cpp" line="144"/>
<source>Invalid email</source>
<translation type="unfinished"></translation>
<translation>Ongeldig emailadres</translation>
</message>
<message>
<location filename="../keygendialog.cpp" line="145"/>
<source>The email address you typed is not a valid email address.</source>
<translation type="unfinished"></translation>
<translation>Het emailadres dat u heeft ingevoerd is voldoet niet aan de email standaard.</translation>
</message>
<message>
<source>The name should be longer than 4 characters.</source>
Expand Down Expand Up @@ -1072,32 +1072,32 @@ Je kan nieuw toegevoegde wachtwoorden niet lezen!</translation>
<message>
<location filename="../passworddialog.ui" line="101"/>
<source>Character Set:</source>
<translation type="unfinished"></translation>
<translation>Karakterset:</translation>
</message>
<message>
<location filename="../passworddialog.ui" line="109"/>
<source>All Characters</source>
<translation type="unfinished"></translation>
<translation>Alle karakters</translation>
</message>
<message>
<location filename="../passworddialog.ui" line="114"/>
<source>Alphabetical</source>
<translation type="unfinished"></translation>
<translation>Alphabetisch</translation>
</message>
<message>
<location filename="../passworddialog.ui" line="119"/>
<source>Alphanumerical</source>
<translation type="unfinished"></translation>
<translation>Alphanumeriek</translation>
</message>
<message>
<location filename="../passworddialog.ui" line="124"/>
<source>Custom</source>
<translation type="unfinished"></translation>
<translation>Eigen tekenset</translation>
</message>
<message>
<location filename="../passworddialog.ui" line="142"/>
<source>Length:</source>
<translation type="unfinished"></translation>
<translation>Lengte:</translation>
</message>
</context>
<context>
Expand Down
Loading

0 comments on commit ffef3e0

Please sign in to comment.