diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-02-12 00:06:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-02-12 00:06:13 +0100 |
| commit | 6f9adc9f7215a362d23e45b861017638ec67c723 (patch) | |
| tree | 81c07fa6ddc8dca328c269bdfc8f2534c46ccd2c /src/tools | |
| parent | eade5cc8657f51d1d768b705936e918f8d1f53ee (diff) | |
| parent | eb04ac87ccfa046dd342ca7b9e6478c3bdcabbba (diff) | |
Merge branch 'main' into v2.17.x
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 19 | ||||
| -rw-r--r-- | src/tools/po/sl_SI.po | 39 |
2 files changed, 28 insertions, 30 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 024422965..5333f34ae 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1446,7 +1446,8 @@ private: void config_changed (Config::Property what) { /* Instantly save any config changes when using the DCP-o-matic GUI */ - if (what == Config::CINEMAS) { + switch (what) { + case Config::CINEMAS: try { Config::instance()->write_cinemas(); } catch (exception& e) { @@ -1458,7 +1459,21 @@ private: ) ); } - } else { + break; + case Config::DKDM_RECIPIENTS: + try { + Config::instance()->write_dkdm_recipients(); + } catch (exception& e) { + error_dialog ( + this, + wxString::Format ( + _("Could not write to DKDM recipients file at %s. Your changes have not been saved."), + std_to_wx(Config::instance()->dkdm_recipients_file().string()).data() + ) + ); + } + break; + default: try { Config::instance()->write_config(); } catch (exception& e) { diff --git a/src/tools/po/sl_SI.po b/src/tools/po/sl_SI.po index f649c071a..1ae1b2aed 100644 --- a/src/tools/po/sl_SI.po +++ b/src/tools/po/sl_SI.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-12 00:54+0100\n" -"PO-Revision-Date: 2023-09-14 22:47+0200\n" +"PO-Revision-Date: 2024-02-10 16:05+0100\n" "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n" "Language-Team: \n" "Language: sl_SI\n" @@ -381,7 +381,7 @@ msgstr "" #: src/tools/dcpomatic.cc:771 msgid "Could not remove existing preferences file" -msgstr "" +msgstr "Obstoječe datoteke z nastavitvami ni bilo mogoče odstraniti" #: src/tools/dcpomatic.cc:605 src/tools/dcpomatic.cc:1278 msgid "Could not save project." @@ -1028,7 +1028,6 @@ msgstr "" "verigo potrdil za podpisovanje DCP-jev in KDM-jev?" #: src/tools/dcpomatic.cc:1927 -#, fuzzy msgid "" "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs " "contains a small error\n" @@ -1041,8 +1040,10 @@ msgstr "" "Veriga potrdil, ki jo DCP-o-matic uporablja za podpisovanje DCP-jev in KDM-" "jev, vsebuje majhno\n" "napako, ki bo preprečila pravilno validacijo DCP-jev v nekaterih sistemih. " -"Ali želite ponovno ustvariti\n" -"verigo potrdil za podpisovanje DCP-jev in KDM-jev?" +"To napako je povzročila\n" +"napaka v DCP-o-matic, ki pa je že odpravljena. Ali želite ponovno ustvariti " +"verigo potrdil\n" +"za podpisovanje DCP-jev in KDM-jev?" #: src/tools/dcpomatic.cc:1886 msgid "" @@ -1193,9 +1194,9 @@ msgstr "" "\n" "<tt>%s</tt>\n" "\n" -"<span weight=\"bold\" size=\"larger\">POMEMBNO JE,</span> da <span " -"weight=\"bold\" size=\"larger\">DA VARNOSTNO KOPIRATE TO DATOTEKO</span>, " -"ker če izgubite DKDM (in DCP-ji, ki jih ščitijo), bodo postali neuporabni." +"<span weight=\"bold\" size=\"larger\">POMEMBNO JE,</span> da <span weight=" +"\"bold\" size=\"larger\">DA VARNOSTNO KOPIRATE TO DATOTEKO</span>, ker če " +"izgubite DKDM (in DCP-ji, ki jih ščitijo), bodo postali neuporabni." #: src/tools/dcpomatic.cc:809 msgid "" @@ -1203,8 +1204,8 @@ msgid "" "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the " "film and the metadata files within the DCP.\n" "\n" -"You should ensure that these files are <span weight=\"bold\" " -"size=\"larger\">BACKED UP</span> if you want to make KDMs for this film." +"You should ensure that these files are <span weight=\"bold\" size=\"larger" +"\">BACKED UP</span> if you want to make KDMs for this film." msgstr "" "Izdelujete šifriran DCP. KDM-jev za ta DCP ne bo mogoče izdelati, razen če " "imate kopije datoteke <tt>metadata.xml</tt> znotraj filma in datotek " @@ -1259,21 +1260,3 @@ msgstr "" "Pri pošiljanju prevodov morate vnesti veljaven e-poštni naslov, sicer vam " "vzdrževalci DCP-o-matic ne morejo pripisati zaslug ali se obrniti na vas z " "vprašanji." - -#~ msgid "" -#~ "For some of these KDMs the recipient certificate's validity period will " -#~ "not cover the whole of the KDM validity period. This might cause " -#~ "problems with the KDMs." -#~ msgstr "" -#~ "Pri nekaterih od teh KDM-jev obdobje veljavnosti prejemnikovega potrdila " -#~ "ne pokriva celotnega obdobja veljavnosti KDM. To lahko povzroči težave s " -#~ "KDM-ji." - -#~ msgid "" -#~ "Some KDMs would have validity periods which are completely outside the " -#~ "recipient certificate periods. Such KDMs are very unlikely to work, so " -#~ "will not be created." -#~ msgstr "" -#~ "Nekateri KDM bi imeli obdobja veljavnosti, ki so povsem zunaj obdobij " -#~ "veljavnosti prejemnikovega potrdila. Takšni KDM najverjetneje ne bodo " -#~ "delovali, zato ne bodo ustvarjeni." |
