Skip to content

Commit 95b1fff

Browse files
committed
Merge branch 'master' into stable-v0.5
2 parents ab56a2e + e7ca530 commit 95b1fff

File tree

6 files changed

+93
-51
lines changed

6 files changed

+93
-51
lines changed

locale/en/LC_MESSAGES/php.mo

140 Bytes
Binary file not shown.

locale/en/LC_MESSAGES/php.po

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: part-db\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2018-10-08 19:33+0200\n"
6-
"PO-Revision-Date: 2018-10-08 22:01\n"
5+
"POT-Creation-Date: 2018-10-14 17:28+0200\n"
6+
"PO-Revision-Date: 2018-10-14 15:37\n"
77
"Last-Translator: do9jhb <[email protected]>\n"
88
"Language-Team: English\n"
99
"Language: en_US\n"
@@ -14,7 +14,7 @@ msgstr ""
1414
"X-Generator: crowdin.com\n"
1515
"X-Crowdin-Project: part-db\n"
1616
"X-Crowdin-Language: en\n"
17-
"X-Crowdin-File: /nextgen/locale/php.pot\n"
17+
"X-Crowdin-File: /master/locale/php.pot\n"
1818

1919
#: api.php:416
2020
msgid "Übersicht"
@@ -112,7 +112,7 @@ msgstr "The filetype can not be removed!"
112112
msgid "Die neuen Werte konnten nicht gespeichert werden!"
113113
msgstr "The new values could not be saved!"
114114

115-
#: edit_categories.php:95 inc/lib.php:1001 lib/Part.php:2993
115+
#: edit_categories.php:95 inc/lib.php:1001 lib/Part.php:2992
116116
#: lib/Permissions/PermissionManager.php:259 show_category_parts.php:206
117117
msgid "Kategorien"
118118
msgstr "Categories"
@@ -710,7 +710,7 @@ msgstr "Resistor calculator"
710710

711711
#: inc/lib.php:928
712712
msgid "3D Footprints"
713-
msgstr "3D Footprints"
713+
msgstr "3D footprints"
714714

715715
#: inc/lib.php:931
716716
msgid "Labelgenerator"
@@ -1269,6 +1269,10 @@ msgstr "There is no record with the ID \"%d\" in the table \"%s\"!"
12691269
msgid "$values ist kein gültiges Array!"
12701270
msgstr "$values is not a valid array!"
12711271

1272+
#: lib/Database.php:961
1273+
msgid "Datenbankgröße kann nur für MySQL Datenbanken ermittelt werden!"
1274+
msgstr "Database size can only be determined for MySQL databases!"
1275+
12721276
#: lib/Device.php:136
12731277
#, php-format
12741278
msgid "Die Baugruppe \"%s\" konnte nicht gelöscht werden!\\n"
@@ -1646,7 +1650,7 @@ msgstr "The selected manufacturer does not exist!"
16461650
msgid "Die gewählte Datei existiert nicht!"
16471651
msgstr "The selected file does not exist!"
16481652

1649-
#: lib/Part.php:2992
1653+
#: lib/Part.php:2991
16501654
msgid "Keine"
16511655
msgstr "None"
16521656

locale/php.pot

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-10-08 19:33+0200\n"
11+
"POT-Creation-Date: 2018-10-14 17:28+0200\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -117,7 +117,7 @@ msgstr ""
117117
msgid "Die neuen Werte konnten nicht gespeichert werden!"
118118
msgstr ""
119119

120-
#: edit_categories.php:95 inc/lib.php:1001 lib/Part.php:2993
120+
#: edit_categories.php:95 inc/lib.php:1001 lib/Part.php:2992
121121
#: lib/Permissions/PermissionManager.php:259 show_category_parts.php:206
122122
msgid "Kategorien"
123123
msgstr ""
@@ -1347,6 +1347,10 @@ msgstr ""
13471347
msgid "$values ist kein gültiges Array!"
13481348
msgstr ""
13491349

1350+
#: lib/Database.php:961
1351+
msgid "Datenbankgröße kann nur für MySQL Datenbanken ermittelt werden!"
1352+
msgstr ""
1353+
13501354
#: lib/Device.php:136
13511355
#, php-format
13521356
msgid "Die Baugruppe \"%s\" konnte nicht gelöscht werden!\\n"
@@ -1733,7 +1737,7 @@ msgstr ""
17331737
msgid "Die gewählte Datei existiert nicht!"
17341738
msgstr ""
17351739

1736-
#: lib/Part.php:2992
1740+
#: lib/Part.php:2991
17371741
msgid "Keine"
17381742
msgstr ""
17391743

462 Bytes
Binary file not shown.

templates/nextgen/locale/en/LC_MESSAGES/partdb.po

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ msgstr ""
55
"X-Generator: crowdin.com\n"
66
"X-Crowdin-Project: part-db\n"
77
"X-Crowdin-Language: en\n"
8-
"X-Crowdin-File: /nextgen/templates/nextgen/locale/partdb.pot\n"
8+
"X-Crowdin-File: /master/templates/nextgen/locale/partdb.pot\n"
99
"Project-Id-Version: part-db\n"
1010
"Last-Translator: do9jhb <[email protected]>\n"
1111
"Language-Team: English\n"
1212
"Language: en_US\n"
13-
"PO-Revision-Date: 2018-10-08 22:01\n"
13+
"PO-Revision-Date: 2018-10-14 15:38\n"
1414

1515
#: templates/nextgen/developer_tools.php/smarty_developer_tools.tpl:5
1616
msgid "Tabs durch Leerzeichen ersetzen / Backup-Dateien löschen"
@@ -889,7 +889,7 @@ msgstr "Add"
889889
#: templates/nextgen/show_device_parts.php/smarty_attachements.tpl:84
890890
#: templates/nextgen/show_order_parts.php/smarty_show_order_parts.tpl:31
891891
#: templates/nextgen/show_part_info.php/smarty_main.tpl:208
892-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:154
892+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:163
893893
msgid "Übernehmen"
894894
msgstr "Apply"
895895

@@ -1281,6 +1281,7 @@ msgstr "e.g. Development"
12811281
#: templates/nextgen/install.php/smarty_set_db_settings.tpl:14
12821282
#: templates/nextgen/system_config.php/smarty_system_config.tpl:385
12831283
#: templates/nextgen/system_config.php/smarty_system_config.tpl:399
1284+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:57
12841285
msgid "Achtung:"
12851286
msgstr "Warning:"
12861287

@@ -1391,7 +1392,11 @@ msgstr "Congratulations, the Installation or the Update of Part-DB is almost com
13911392
msgid "Sie können sich nun mit dem Nutzernamen \"admin\" und dem eben festgelegten Password einloggen."
13921393
msgstr "You can login now with the user name \"admin\" and the newly set password."
13931394

1394-
#: templates/nextgen/install.php/smarty_finish.tpl:10
1395+
#: templates/nextgen/install.php/smarty_finish.tpl:9
1396+
msgid "Prüfen sie unter System->Benutzer bzw. System->Gruppen ob die Berechtigungen die von die gewünschten Werte haben"
1397+
msgstr "Check under system-> user or system group-> if the permissions have the desired values"
1398+
1399+
#: templates/nextgen/install.php/smarty_finish.tpl:11
13951400
msgid "Fertigstellen"
13961401
msgstr "Complete"
13971402

@@ -1486,12 +1491,12 @@ msgid "Benutzen Sie eine bereits vorhandene Datenbank weiter, sollten Sie jetzt
14861491
msgstr "If you continue to use an existing database, you should now create a backup of it!"
14871492

14881493
#: templates/nextgen/install.php/smarty_set_db_settings.tpl:23
1489-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:84
1494+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:93
14901495
msgid "Datenbanktyp:"
14911496
msgstr "Database type:"
14921497

14931498
#: templates/nextgen/install.php/smarty_set_db_settings.tpl:33
1494-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:96
1499+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:105
14951500
msgid "Host:"
14961501
msgstr "Host:"
14971502

@@ -1500,7 +1505,7 @@ msgid "z.B. localhost"
15001505
msgstr "e.g. localhost"
15011506

15021507
#: templates/nextgen/install.php/smarty_set_db_settings.tpl:40
1503-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:105
1508+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:114
15041509
msgid "Datenbankname:"
15051510
msgstr "Databasename:"
15061511

@@ -1511,13 +1516,13 @@ msgstr "e.g. part-db"
15111516

15121517
#: templates/nextgen/install.php/smarty_set_db_settings.tpl:46
15131518
#: templates/nextgen/system_config.php/smarty_system_config.tpl:393
1514-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:113
1519+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:122
15151520
#: templates/nextgen/system_log.php/smarty_main.tpl:28
15161521
msgid "Benutzer:"
15171522
msgstr "User:"
15181523

15191524
#: templates/nextgen/install.php/smarty_set_db_settings.tpl:53
1520-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:122
1525+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:131
15211526
msgid "Datenbankpasswort:"
15221527
msgstr "Databasepassword:"
15231528

@@ -1997,7 +2002,7 @@ msgid "Alle an/abwählen:"
19972002
msgstr "Check/Uncheck all:"
19982003

19992004
#: templates/nextgen/show_order_parts.php/smarty_show_order_parts.tpl:74
2000-
#: templates/nextgen/smarty_table.tpl:295
2005+
#: templates/nextgen/smarty_table.tpl:297
20012006
msgid "Einbuchen"
20022007
msgstr "Add Stock"
20032008

@@ -2180,12 +2185,14 @@ msgstr "Part properties"
21802185

21812186
#: templates/nextgen/show_part_info.php/smarty_properties.tpl:15
21822187
#: templates/nextgen/system_config.php/smarty_system_config.tpl:458
2188+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:21
21832189
msgid "Eigenschaft"
21842190
msgstr "Property"
21852191

21862192
#: templates/nextgen/show_part_info.php/smarty_properties.tpl:16
21872193
#: templates/nextgen/smarty_permissions.tpl:39
21882194
#: templates/nextgen/system_config.php/smarty_system_config.tpl:459
2195+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:22
21892196
msgid "Wert"
21902197
msgstr "Value"
21912198

@@ -2712,7 +2719,7 @@ msgstr "Release"
27122719
msgid "Changelog"
27132720
msgstr "changelog"
27142721

2715-
#: templates/nextgen/smarty_table.tpl:300
2722+
#: templates/nextgen/smarty_table.tpl:302
27162723
msgid "Aus Liste löschen"
27172724
msgstr "Remove from list"
27182725

@@ -3211,7 +3218,7 @@ msgid "Logging deaktiviert"
32113218
msgstr "Logging disabled"
32123219

32133220
#: templates/nextgen/system_config.php/smarty_system_config.tpl:439
3214-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:134
3221+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:143
32153222
msgid "Einstellungen übernehmen"
32163223
msgstr "Apply settings"
32173224

@@ -3269,15 +3276,23 @@ msgstr "Current version:"
32693276
msgid "Benötigte Version:"
32703277
msgstr "Needed version:"
32713278

3272-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:48
3279+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:46
3280+
msgid "Datenbank Größe"
3281+
msgstr "Database size"
3282+
3283+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:55
32733284
msgid "Die Datenbank benötigt ein Update!"
32743285
msgstr "The database needs an update!"
32753286

3276-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:52
3287+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:57
3288+
msgid "Prüfen sie nach dem Update, ob die Berechtigungen der Benutzer und Gruppen noch korrekt sind!"
3289+
msgstr "After the update, check that the permissions of the user and group are still correct!"
3290+
3291+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:61
32773292
msgid "ACHTUNG:"
32783293
msgstr "WARNING:"
32793294

3280-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:53
3295+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:62
32813296
msgid "Das letzte Update ist fehlgeschlagen. Sie können beliebig oft versuchen,\n"
32823297
" das Update an der Stelle des letzten Abbruchs fortzusetzen.\n"
32833298
" Falls Sie zwischenzeitlich aber eine neue Datenbank geladen haben\n"
@@ -3289,31 +3304,31 @@ msgstr "The last update failed. You can try as often as you like,\n"
32893304
" (e. g. a backup), the update must be restarted from the beginning. <br>\n"
32903305
" You therefore have the following two options:"
32913306

3292-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:60
3307+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:69
32933308
msgid "Letztes, fehlgeschlagenes Update fortsetzen"
32943309
msgstr "Continue the last failed update"
32953310

3296-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:61
3311+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:70
32973312
msgid "Neuer Update-Versuch beginnen (von Vorne)"
32983313
msgstr "Start new Update attempt"
32993314

3300-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:64
3315+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:73
33013316
msgid "Jetzt Datenbank updaten"
33023317
msgstr "Update database now"
33033318

3304-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:67
3319+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:76
33053320
msgid "Die Datenbank ist auf dem neusten Stand."
33063321
msgstr "The database has the newest version."
33073322

3308-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:79
3323+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:88
33093324
msgid "Datenbank-Einstellungen"
33103325
msgstr "Database settings"
33113326

3312-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:141
3327+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:150
33133328
msgid "Datenbankoptionen:"
33143329
msgstr "Database options:"
33153330

3316-
#: templates/nextgen/system_database.php/smarty_system_database.tpl:146
3331+
#: templates/nextgen/system_database.php/smarty_system_database.tpl:155
33173332
msgid "Automatische Updates aktivieren"
33183333
msgstr "Activate automatic updates:"
33193334

0 commit comments

Comments
 (0)