@glissandoo/lib 1.53.6 → 1.53.8

package/helpers/musicStyles/orders.js

@@ -6,195 +6,199 @@ const utils_1 = require("../utils");
 const index_1 = require("./index");
 exports.orders = {
     [index_1.MusicStyleId.Band]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Piccolo,
-        instruments_1.InstrumentId.Flute,
-        instruments_1.InstrumentId.Oboe,
-        instruments_1.InstrumentId.EnglishHorn,
-        instruments_1.InstrumentId.Bassoon,
-        instruments_1.InstrumentId.BassoonContra,
-        instruments_1.InstrumentId.ClarinetLittle,
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.ClarinetBass,
-        instruments_1.InstrumentId.SaxSoprano,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.SaxBaritone,
-        instruments_1.InstrumentId.FrenchHorn,
-        instruments_1.InstrumentId.FlugeHorn,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.TromboneLow,
-        instruments_1.InstrumentId.Euphonium,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.Cello,
-        instruments_1.InstrumentId.DoubleBass,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.BassDrum,
-        instruments_1.InstrumentId.Cymbals,
-        instruments_1.InstrumentId.Timpani,
-        instruments_1.InstrumentId.Mallets,
-        instruments_1.InstrumentId.DrumSet,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Piccolo,
+        instruments_1.DefaultInstrumentId.Flute,
+        instruments_1.DefaultInstrumentId.Oboe,
+        instruments_1.DefaultInstrumentId.EnglishHorn,
+        instruments_1.DefaultInstrumentId.Bassoon,
+        instruments_1.DefaultInstrumentId.BassoonContra,
+        instruments_1.DefaultInstrumentId.ClarinetLittle,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.ClarinetBass,
+        instruments_1.DefaultInstrumentId.SaxSoprano,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.SaxBaritone,
+        instruments_1.DefaultInstrumentId.FrenchHorn,
+        instruments_1.DefaultInstrumentId.FlugeHorn,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.TromboneLow,
+        instruments_1.DefaultInstrumentId.Euphonium,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.Cello,
+        instruments_1.DefaultInstrumentId.DoubleBass,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.Cymbals,
+        instruments_1.DefaultInstrumentId.Timpani,
+        instruments_1.DefaultInstrumentId.Mallets,
+        instruments_1.DefaultInstrumentId.DrumSet,
     ],
     [index_1.MusicStyleId.MarchingBand]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Piccolo,
-        instruments_1.InstrumentId.Flute,
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.ClarinetBass,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.SaxBaritone,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.TromboneLow,
-        instruments_1.InstrumentId.Euphonium,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.MarchingToms,
-        instruments_1.InstrumentId.BassDrum,
-        instruments_1.InstrumentId.Cymbals,
-        instruments_1.InstrumentId.Timpani,
-        instruments_1.InstrumentId.Mallets,
-        instruments_1.InstrumentId.DrumSet,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Piccolo,
+        instruments_1.DefaultInstrumentId.Flute,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.ClarinetBass,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.SaxBaritone,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.TromboneLow,
+        instruments_1.DefaultInstrumentId.Euphonium,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.MarchingToms,
+        instruments_1.DefaultInstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.Cymbals,
+        instruments_1.DefaultInstrumentId.Timpani,
+        instruments_1.DefaultInstrumentId.Mallets,
+        instruments_1.DefaultInstrumentId.DrumSet,
     ],
     [index_1.MusicStyleId.Orchestra]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Violin,
-        instruments_1.InstrumentId.Viola,
-        instruments_1.InstrumentId.Cello,
-        instruments_1.InstrumentId.DoubleBass,
-        instruments_1.InstrumentId.Piccolo,
-        instruments_1.InstrumentId.Flute,
-        instruments_1.InstrumentId.FluteLow,
-        instruments_1.InstrumentId.Oboe,
-        instruments_1.InstrumentId.EnglishHorn,
-        instruments_1.InstrumentId.Bassoon,
-        instruments_1.InstrumentId.BassoonContra,
-        instruments_1.InstrumentId.ClarinetLittle,
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.ClarinetBass,
-        instruments_1.InstrumentId.SaxSoprano,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.SaxBaritone,
-        instruments_1.InstrumentId.FrenchHorn,
-        instruments_1.InstrumentId.FlugeHorn,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.TrumpetLow,
-        instruments_1.InstrumentId.TrumpetPiccolo,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.TromboneHigh,
-        instruments_1.InstrumentId.TromboneLow,
-        instruments_1.InstrumentId.Euphonium,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.BassDrum,
-        instruments_1.InstrumentId.Cymbals,
-        instruments_1.InstrumentId.Timpani,
-        instruments_1.InstrumentId.Mallets,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Violin,
+        instruments_1.DefaultInstrumentId.Viola,
+        instruments_1.DefaultInstrumentId.Cello,
+        instruments_1.DefaultInstrumentId.DoubleBass,
+        instruments_1.DefaultInstrumentId.Piccolo,
+        instruments_1.DefaultInstrumentId.Flute,
+        instruments_1.DefaultInstrumentId.FluteLow,
+        instruments_1.DefaultInstrumentId.Oboe,
+        instruments_1.DefaultInstrumentId.EnglishHorn,
+        instruments_1.DefaultInstrumentId.Bassoon,
+        instruments_1.DefaultInstrumentId.BassoonContra,
+        instruments_1.DefaultInstrumentId.ClarinetLittle,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.ClarinetBass,
+        instruments_1.DefaultInstrumentId.SaxSoprano,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.SaxBaritone,
+        instruments_1.DefaultInstrumentId.FrenchHorn,
+        instruments_1.DefaultInstrumentId.FlugeHorn,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.TrumpetLow,
+        instruments_1.DefaultInstrumentId.TrumpetPiccolo,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.TromboneHigh,
+        instruments_1.DefaultInstrumentId.TromboneLow,
+        instruments_1.DefaultInstrumentId.Euphonium,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.Cymbals,
+        instruments_1.DefaultInstrumentId.Timpani,
+        instruments_1.DefaultInstrumentId.Mallets,
     ],
     [index_1.MusicStyleId.Choir]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Soprano,
-        instruments_1.InstrumentId.MezzoSoprano,
-        instruments_1.InstrumentId.ContraAlto,
-        instruments_1.InstrumentId.CounterTenor,
-        instruments_1.InstrumentId.BassChoir,
-        instruments_1.InstrumentId.Tenor,
-        instruments_1.InstrumentId.Baritone,
-        instruments_1.InstrumentId.Choir,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Soprano,
+        instruments_1.DefaultInstrumentId.MezzoSoprano,
+        instruments_1.DefaultInstrumentId.ContraAlto,
+        instruments_1.DefaultInstrumentId.CounterTenor,
+        instruments_1.DefaultInstrumentId.BassChoir,
+        instruments_1.DefaultInstrumentId.Tenor,
+        instruments_1.DefaultInstrumentId.Baritone,
+        instruments_1.DefaultInstrumentId.Choir,
     ],
     [index_1.MusicStyleId.BigBand]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Piccolo,
-        instruments_1.InstrumentId.Flute,
-        instruments_1.InstrumentId.FluteLow,
-        instruments_1.InstrumentId.Oboe,
-        instruments_1.InstrumentId.EnglishHorn,
-        instruments_1.InstrumentId.Bassoon,
-        instruments_1.InstrumentId.BassoonContra,
-        instruments_1.InstrumentId.ClarinetLittle,
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.ClarinetBass,
-        instruments_1.InstrumentId.SaxSoprano,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.SaxBaritone,
-        instruments_1.InstrumentId.FrenchHorn,
-        instruments_1.InstrumentId.FlugeHorn,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.TromboneLow,
-        instruments_1.InstrumentId.Euphonium,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.Cello,
-        instruments_1.InstrumentId.DoubleBass,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.DrumSet,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Piccolo,
+        instruments_1.DefaultInstrumentId.Flute,
+        instruments_1.DefaultInstrumentId.FluteLow,
+        instruments_1.DefaultInstrumentId.Oboe,
+        instruments_1.DefaultInstrumentId.EnglishHorn,
+        instruments_1.DefaultInstrumentId.Bassoon,
+        instruments_1.DefaultInstrumentId.BassoonContra,
+        instruments_1.DefaultInstrumentId.ClarinetLittle,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.ClarinetBass,
+        instruments_1.DefaultInstrumentId.SaxSoprano,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.SaxBaritone,
+        instruments_1.DefaultInstrumentId.FrenchHorn,
+        instruments_1.DefaultInstrumentId.FlugeHorn,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.TromboneLow,
+        instruments_1.DefaultInstrumentId.Euphonium,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.Cello,
+        instruments_1.DefaultInstrumentId.DoubleBass,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.DrumSet,
+    ],
+    [index_1.MusicStyleId.TxistularisBand]: [
+        instruments_1.DefaultInstrumentId.Txistu,
+        instruments_1.DefaultInstrumentId.Silbote,
+        instruments_1.DefaultInstrumentId.Tabal,
     ],
-    [index_1.MusicStyleId.TxistularisBand]: [instruments_1.InstrumentId.Txistu, instruments_1.InstrumentId.Silbote, instruments_1.InstrumentId.Tabal],
     [index_1.MusicStyleId.Colla]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Dulzaina,
-        instruments_1.InstrumentId.DulzainaFa,
-        instruments_1.InstrumentId.Tarota,
-        instruments_1.InstrumentId.Bagpipes,
-        instruments_1.InstrumentId.Tabal,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.BassDrum,
-        instruments_1.InstrumentId.Cymbals,
-        instruments_1.InstrumentId.Timpani,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Dulzaina,
+        instruments_1.DefaultInstrumentId.DulzainaFa,
+        instruments_1.DefaultInstrumentId.Tarota,
+        instruments_1.DefaultInstrumentId.Bagpipes,
+        instruments_1.DefaultInstrumentId.Tabal,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.Cymbals,
+        instruments_1.DefaultInstrumentId.Timpani,
     ],
     [index_1.MusicStyleId.Charanga]: [
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.Euphonium,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.BassDrum,
-        instruments_1.InstrumentId.MarchingToms,
-        instruments_1.InstrumentId.Cymbals,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.Euphonium,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.MarchingToms,
+        instruments_1.DefaultInstrumentId.Cymbals,
     ],
     [index_1.MusicStyleId.BandaCornetasYTambores]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Cornet,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Cornet,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.BassDrum,
     ],
     [index_1.MusicStyleId.JazzBand]: [
-        instruments_1.InstrumentId.Flute,
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.SaxSoprano,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.SaxBaritone,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.DoubleBass,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.DrumSet,
+        instruments_1.DefaultInstrumentId.Flute,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.SaxSoprano,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.SaxBaritone,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.DoubleBass,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.DrumSet,
     ],
     [index_1.MusicStyleId.Batucada]: [
-        instruments_1.InstrumentId.Repique,
-        instruments_1.InstrumentId.TambourineBrazilian,
-        instruments_1.InstrumentId.TimbalBrazilian,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.Surdo,
-        instruments_1.InstrumentId.Agogo,
-        instruments_1.InstrumentId.Chocalho,
+        instruments_1.DefaultInstrumentId.Repique,
+        instruments_1.DefaultInstrumentId.TambourineBrazilian,
+        instruments_1.DefaultInstrumentId.TimbalBrazilian,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.Surdo,
+        instruments_1.DefaultInstrumentId.Agogo,
+        instruments_1.DefaultInstrumentId.Chocalho,
     ],
 };
 const getInstrumentsOrderByMusicStyle = (musicStyle) => {
-    return musicStyle in exports.orders ? exports.orders[musicStyle] : Object.values(instruments_1.InstrumentId);
+    return musicStyle in exports.orders ? exports.orders[musicStyle] : Object.values(instruments_1.DefaultInstrumentId);
 };
 exports.getInstrumentsOrderByMusicStyle = getInstrumentsOrderByMusicStyle;
 const orderByMusicStyle = (list, field, musicStyle) => {

package/helpers/notifications/placeholders.js

@@ -36,6 +36,11 @@ const getTypeAndPathFromPlaceholder = (placeholder) => {
         formatValue: (formatValue || 'shortDate'),
     };
 };
+const getPropsPathsFromArrayPlaceholderInPath = (path) => {
+    const placeholder = path.pop();
+    const props = placeholder ? placeholder.slice(1, -1).replace(' ', '').split(',') : [];
+    return props.map((prop) => [...path, prop]);
+};
 const replaceKeysNotification = (text, values, lang) => {
     const placeholders = text.match(/(\{).+?(\})/g);
     if (!placeholders || placeholders.length === 0) {
@@ -51,21 +56,23 @@ const replaceKeysNotification = (text, values, lang) => {
         const { type, path, formatValue } = getTypeAndPathFromPlaceholder(placeholder);
         switch (type) {
             case PlaceholderType.Instrument: {
-                const instrumentId = (0, lodash_1.get)(newValues, path);
+                const [instrumentIdPropPath, customInstrumentNamePropPath] = getPropsPathsFromArrayPlaceholderInPath(path);
+                const customInstrumentName = (0, lodash_1.get)(newValues, customInstrumentNamePropPath);
+                if (customInstrumentName) {
+                    return text.replace(placeholder, customInstrumentName.toLowerCase());
+                }
+                const instrumentId = (0, lodash_1.get)(newValues, instrumentIdPropPath);
                 const instrument = new Instrument_1.default(instrumentId, lang);
                 if (!instrument)
                     return text;
                 return text.replace(placeholder, instrument.name.toLowerCase());
             }
             case PlaceholderType.Date: {
-                const lastPath = path.pop();
-                const [datetimeProp, timezoneProp] = lastPath
-                    ? lastPath.slice(1, -1).replace(' ', '').split(',')
-                    : [];
-                const datetime = (0, lodash_1.get)(newValues, [...path, datetimeProp]);
+                const [datetimePropPath, timezonePropPath] = getPropsPathsFromArrayPlaceholderInPath(path);
+                const datetime = (0, lodash_1.get)(newValues, datetimePropPath);
                 if (!datetime)
                     return text.replace(placeholder, '');
-                const timezone = (0, lodash_1.get)(newValues, [...path, timezoneProp]) || 'Europe/Madrid';
+                const timezone = (0, lodash_1.get)(newValues, timezonePropPath) || 'Europe/Madrid';
                 const zonedDatetime = (0, date_fns_tz_1.utcToZonedTime)(datetime.toDate(), timezone);
                 const dateLang = (0, lang_1.getDateLang)(lang);
                 const dateFormat = (0, date_fns_1.format)(zonedDatetime, (0, lodash_1.get)(dateLang.format, formatValue), {

package/helpers/objects.d.ts

@@ -1,4 +1,4 @@
-export declare const mapToArray: <K extends string, V extends object, O extends Record<K, V>>(obj: O) => (O[`${Exclude<keyof O, symbol>}`] & {
+export declare const mapToArray: <K extends string, V extends object, O extends Record<K, V | undefined>>(obj: O) => (O[`${Exclude<keyof O, symbol>}`] & {
     id: keyof O;
 })[];
 export declare const orderedMapToArray: <K extends string, V extends {

package/lang/ca.json

@@ -46,6 +46,7 @@
     "instruments.agogo": "Agogó",
     "instruments.altoClarinet": "Clarinet Alt",
     "instruments.altoSaxophone": "Saxòfon alt",
+    "instruments.auxiliar": "Auxiliar",
     "instruments.bagpipes": "Sac de gemecs",
     "instruments.bandurria": "Bandúrria",
     "instruments.banjo": "Banjo",
@@ -77,6 +78,7 @@
     "instruments.englishHorn": "Corn anglès",
     "instruments.euphonium": "Bombardí",
     "instruments.flabiol": "Flabiol",
+    "instruments.flagBearer": "Abanderat",
     "instruments.flugelhorn": "Fiscorn",
     "instruments.flute": "Flauta",
     "instruments.frenchHorn": "Trompa",
@@ -168,10 +170,10 @@
     "performance.edit.stage.title": "Concert - Mapa de l'escenari modificat",
     "performance.edit.title.text": "S'ha actualitzat el títol de {string:event.0.displayName}",
     "performance.edit.title.title": "Acte - canvi de nom",
-    "performance.interest.confirm.text": "{string:user.0.displayName} està interessat en {string:event.0.displayName}",
-    "performance.interest.confirm.title": "Interès confirmat per al concert",
-    "performance.interest.lose.text": "{string:user.0.displayName} ja no està interessat en {string:event.0.displayName}",
-    "performance.interest.lose.title": "Interès perdut per al concert",
+    "performance.interest.confirm.text": "{string:user.0.displayName} s'ha apuntat a {string:event.0.displayName}",
+    "performance.interest.confirm.title": "Nova inscripció per al concert",
+    "performance.interest.lose.text": "{string:user.0.displayName} ja no està apuntat a {string:event.0.displayName}",
+    "performance.interest.lose.title": "Inscripció anulada per al concert",
     "performance.players.add.text": "T'han afegit a {string:event.0.displayName}",
     "performance.players.add.title": "Nou acte",
     "performance.players.remove.text": "Has estat esborrat de {string:event.0.displayName}",
@@ -188,8 +190,8 @@
     "performance.reminderDeadlineSoon.pending.title": "Recordatori data límit acte",
     "performance.rollCallReminder.text": "Ara es el millor moment per a passar llista",
     "performance.rollCallReminder.title": "Pots passar llista a l'assaig",
-    "performance.selection.deselect.text": "Has estat deseleccionat per a participar en {string:event.0.displayName}",
-    "performance.selection.deselect.title": "Deseleccionat per al concert",
+    "performance.selection.deselect.text": "No has estat seleccionat per a participar en {string:event.0.displayName}",
+    "performance.selection.deselect.title": "No estàs seleccionat per al concert",
     "performance.selection.select.text": "Has estat seleccionat per a participar en {string:event.0.displayName}",
     "performance.selection.select.title": "Seleccionat per al concert",
     "practice": "Assaig",
@@ -221,10 +223,10 @@
     "practice.edit.stage.title": "Assaig - Mapa actualitzat",
     "practice.edit.title.text": "S'ha actualitzat el títol de l'assaig del {date:event.0.[datetime,timezone]:date}",
     "practice.edit.title.title": "Assaig - canvi de nom",
-    "practice.interest.confirm.text": "{string:user.0.displayName} està interessat en el assaig de {string:group.0.displayName} el {date:event.0.[datetime,timezone]:date}",
-    "practice.interest.confirm.title": "Interès confirmat per a l'assaig",
-    "practice.interest.lose.text": "{string:user.0.displayName} ja no està interessat en el assaig de {string:group.0.displayName} el {date:event.0.[datetime,timezone]:date}",
-    "practice.interest.lose.title": "Interès perdut per a l'assaig",
+    "practice.interest.confirm.text": "{string:user.0.displayName} s'ha apuntat al assaig de {string:group.0.displayName} el {date:event.0.[datetime,timezone]:date}",
+    "practice.interest.confirm.title": "Nova inscripció per a l'assaig",
+    "practice.interest.lose.text": "{string:user.0.displayName} ja està apuntat al assaig de {string:group.0.displayName} el {date:event.0.[datetime,timezone]:date}",
+    "practice.interest.lose.title": "Inscripció anulada per a l'assaig",
     "practice.players.add.text": "T'han afegit a un assaig de {string:group.0.displayName} programat pel {date:event.0.[datetime,timezone]:datetime}",
     "practice.players.add.title": "Nou assaig",
     "practice.players.remove.text": "Has estat esborrat de l'assaig de {string:group.0.displayName} pel {date:event.0.[datetime,timezone]:date}",
@@ -241,8 +243,8 @@
     "practice.reminderDeadlineSoon.pending.title": "Recordatori data límit assaig",
     "practice.rollCallReminder.text": "Ara es el millor moment per a passar llista",
     "practice.rollCallReminder.title": "Pots passar llista al vostre darrer assaig",
-    "practice.selection.deselect.text": "Has estat deseleccionat per a participar en l'assaig de {string:group.0.displayName} el {date:event.0.[datetime,timezone]:date}",
-    "practice.selection.deselect.title": "Deseleccionat per a l'assaig",
+    "practice.selection.deselect.text": "No has estat seleccionat per a participar en l'assaig de {string:group.0.displayName} el {date:event.0.[datetime,timezone]:date}",
+    "practice.selection.deselect.title": "No estàs seleccionat per a l'assaig",
     "practice.selection.select.text": "Has estat seleccionat per a participar en l'assaig de {string:group.0.displayName} el {date:event.0.[datetime,timezone]:date}",
     "practice.selection.select.title": "Seleccionat per a l'assaig",
     "practices.cancel.text": "S'han cancel·lat {string:extra.num} assajos de {string:group.0.displayName} des del {date:event.0.[datetime,timezone]:shortDate} fins al {date:event.1.[datetime,timezone]:shortDate}",
@@ -254,7 +256,7 @@
     "practices.edit.comments.text": "Una serie d'assajos han actualitzat els seus comentaris",
     "practices.edit.comments.title": "Assajos - comentaris actualitzats",
     "practices.edit.datetime.text": "Una serie d'assajos han actualitzat el seu horari",
-    "practices.edit.datetime.title": "Assajos - canvi d’horari",
+    "practices.edit.datetime.title": "Assajos - canvi d'horari",
     "practices.edit.locality.text": "Una serie d'assajos han actualitzat la seva adreça",
     "practices.edit.locality.title": "Assajos - canvi d'adreça",
     "practices.edit.repertory.text": "Una serie d'assajos han actualitzat el seu repertori",
@@ -275,8 +277,8 @@
     "repertoireTags.4": "4t",
     "repertoireTags.principal": "Principal",
     "sections.all": "Tots",
-    "theme.claim.new.text": "{string:user.0.displayName} ha reclamat la partitura de {instrument:extra.instrumentId} de l'obra \"{string:extra.title}\"",
+    "theme.claim.new.text": "{string:user.0.displayName} ha reclamat la partitura de {instrument:extra.[instrumentId,customInstrumentName]} de l'obra \"{string:extra.title}\"",
     "theme.claim.new.title": "Han demanat una partitura",
-    "theme.claim.update.text": "S'afegit la partitura de {instrument:extra.instrumentId} de l'obra \"{string:extra.title}\"",
-    "theme.claim.update.title": "Nova partitura de {instrument:extra.instrumentId}"
+    "theme.claim.update.text": "S'afegit la partitura de {instrument:extra.[instrumentId,customInstrumentName]} de l'obra \"{string:extra.title}\"",
+    "theme.claim.update.title": "Nova partitura de {instrument:extra.[instrumentId,customInstrumentName]}"
 }