Skip to content

Commit

Permalink
Merge branch 'master' of github.com:humhub/humhub
Browse files Browse the repository at this point in the history
  • Loading branch information
luke- committed Sep 25, 2018
2 parents 1ec0c7d + bec130d commit 106c265
Show file tree
Hide file tree
Showing 31 changed files with 159 additions and 346 deletions.
2 changes: 1 addition & 1 deletion protected/humhub/messages/it/archive.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion protected/humhub/messages/ja/archive.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion protected/humhub/messages/nb_no/archive.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion protected/humhub/messages/nl/archive.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion protected/humhub/messages/nl/base.php
Expand Up @@ -78,5 +78,5 @@
'Unsubscribe' => 'Afmelden',
'Upload' => 'Upload',
'Upload file' => 'Upload bestand',
'You are not allowed to run this action.' => 'U mag deze actie niet uitvoeren..',
'You are not allowed to run this action.' => 'U mag deze actie niet uitvoeren.',
);
2 changes: 1 addition & 1 deletion protected/humhub/messages/tr/archive.json

Large diffs are not rendered by default.

23 changes: 3 additions & 20 deletions protected/humhub/modules/admin/messages/fi/views_invite_delete.php
@@ -1,21 +1,4 @@
<?php
/**
* Message translations.
*
* This file is automatically generated by 'yii message/extract' command.
* It contains the localizable messages extracted from source code.
* You may modify this file by translating the extracted messages.
*
* Each array element represents the translation (value) of a message (key).
* If the value is empty, the message is considered as not translated.
* Messages that no longer need translation will have their translations
* enclosed between a pair of '@@' marks.
*
* Message string can be used with plural forms format. Check i18n section
* of the guide for details.
*
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
'Delete invitation?' => '',
];
return array (
'Delete invitation?' => 'Haluatko poista kutsun?',
);
23 changes: 3 additions & 20 deletions protected/humhub/modules/admin/messages/fi/views_invite_resend.php
@@ -1,21 +1,4 @@
<?php
/**
* Message translations.
*
* This file is automatically generated by 'yii message/extract' command.
* It contains the localizable messages extracted from source code.
* You may modify this file by translating the extracted messages.
*
* Each array element represents the translation (value) of a message (key).
* If the value is empty, the message is considered as not translated.
* Messages that no longer need translation will have their translations
* enclosed between a pair of '@@' marks.
*
* Message string can be used with plural forms format. Check i18n section
* of the guide for details.
*
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
'Send invitation email again?' => '',
];
return array (
'Send invitation email again?' => 'Haluatko lähettä kutsun uudelleen?',
);
6 changes: 3 additions & 3 deletions protected/humhub/modules/admin/messages/it/information.php
Expand Up @@ -4,8 +4,8 @@
'<strong>Queue</strong> Status' => 'Stato <strong>Attività in background</strong>',
'About HumHub' => 'Informazioni su HumHub',
'Background Jobs' => 'Attività in background',
'Database' => 'Base dati',
'Database migration results:' => 'Risultato della migrazione della base dati:',
'Database' => 'Database',
'Database migration results:' => 'Risultato della migrazione del database:',
'Delayed' => 'Posticipato',
'Done' => 'Fatto',
'Driver' => 'Driver',
Expand All @@ -18,6 +18,6 @@
'Queue successfully cleared.' => 'Coda svuotata correttamente',
'Reserved' => 'Riservato',
'Search index rebuild in progress.' => 'Ricostruzione indice di ricerca in corso.',
'The current main HumHub database name is ' => 'La base dati Humhub si chiama:',
'The current main HumHub database name is ' => 'Il database principale di Humhub si chiama:',
'Waiting' => 'In attesa',
);
93 changes: 38 additions & 55 deletions protected/humhub/modules/admin/messages/tr/base.php
@@ -1,56 +1,39 @@
<?php
/**
* Message translations.
*
* This file is automatically generated by 'yii message/extract' command.
* It contains the localizable messages extracted from source code.
* You may modify this file by translating the extracted messages.
*
* Each array element represents the translation (value) of a message (key).
* If the value is empty, the message is considered as not translated.
* Messages that no longer need translation will have their translations
* enclosed between a pair of '@@' marks.
*
* Message string can be used with plural forms format. Check i18n section
* of the guide for details.
*
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
'<strong>Warning</strong> incomplete setup!' => '',
'Back to user overview' => '',
'Base URL needs to begin with http:// or https://' => '',
'Groups (Note: The Administrator group of this user can\'t be managed with your permissions)' => '',
'Invite' => '',
'Invited by' => '',
'Open documentation' => '',
'Pending user registrations' => '',
'Sign up' => '',
'The cron job for the background jobs (queue) does not seem to work properly.' => '',
'The cron job for the regular tasks (cron) does not seem to work properly.' => '',
'About' => 'Hakkımda',
'Add purchased module by licence key' => 'Satın alınan lisans anahtarı ile modül ekle',
'Admin' => 'Yönetici',
'Administration' => 'Yönetim',
'Approval' => 'Onay',
'Authentication' => 'Kimlik doğrulama',
'Back to overview' => 'Geri dön',
'Basic' => 'Temel',
'Caching' => 'Ön bellekleme',
'Cronjobs' => 'Cronjobs',
'Design' => 'Tasarım',
'Files' => 'Dosyalar',
'Groups' => 'Gruplar',
'Logging' => 'Oturum',
'Mailing' => 'Posta',
'Modules' => 'Modüller',
'OEmbed providers' => 'OEmbed sağlayıcılar',
'Proxy' => 'Proxy',
'Security' => 'Güvenlik',
'Self test' => 'Test et',
'Spaces' => 'Mekanlar',
'Statistics' => 'İstatistikler',
'User posts' => 'Kullanıcı mesajlar',
'Userprofiles' => 'Kullanıcı profilleri',
'Users' => 'Kullanıcılar',
];
return array (
'<strong>Warning</strong> incomplete setup!' => '',
'About' => 'Hakkında',
'Add purchased module by licence key' => 'Satın alınan lisans anahtarı ile modül ekle',
'Admin' => 'Yönetici',
'Administration' => 'Yönetim',
'Approval' => 'Onay',
'Authentication' => 'Kimlik doğrulama',
'Back to overview' => 'Geri dön',
'Back to user overview' => '',
'Base URL needs to begin with http:// or https://' => '',
'Basic' => 'Temel',
'Caching' => 'Ön bellekleme',
'Cronjobs' => 'Cronjobs',
'Design' => 'Tasarım',
'Files' => 'Dosyalar',
'Groups' => 'Gruplar',
'Groups (Note: The Administrator group of this user can\'t be managed with your permissions)' => '',
'Invite' => '',
'Invited by' => '',
'Logging' => 'Oturum',
'Mailing' => 'Posta',
'Modules' => 'Modüller',
'OEmbed providers' => 'OEmbed sağlayıcılar',
'Open documentation' => '',
'Pending user registrations' => '',
'Proxy' => 'Proxy',
'Security' => 'Güvenlik',
'Self test' => 'Test et',
'Sign up' => '',
'Spaces' => 'Mekanlar',
'Statistics' => 'İstatistikler',
'The cron job for the background jobs (queue) does not seem to work properly.' => '',
'The cron job for the regular tasks (cron) does not seem to work properly.' => '',
'User posts' => 'Kullanıcı mesajlar',
'Userprofiles' => 'Kullanıcı profilleri',
'Users' => 'Kullanıcılar',
);
97 changes: 40 additions & 57 deletions protected/humhub/modules/directory/messages/nb_no/base.php
@@ -1,58 +1,41 @@
<?php
/**
* Message translations.
*
* This file is automatically generated by 'yii message/extract' command.
* It contains the localizable messages extracted from source code.
* You may modify this file by translating the extracted messages.
*
* Each array element represents the translation (value) of a message (key).
* If the value is empty, the message is considered as not translated.
* Messages that no longer need translation will have their translations
* enclosed between a pair of '@@' marks.
*
* Message string can be used with plural forms format. Check i18n section
* of the guide for details.
*
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
'Access directory' => '',
'Can access the directory section.' => '',
'<b>Nobody wrote something yet.</b><br>Make the beginning and post something...' => '<b>Ingen har skrevet noe enda.</b><br>Start ved og poste ett innlegg...',
'<b>There are no profile posts yet!</b>' => '<b>Det er ingen profil poster enda!</b>',
'<strong>Directory</strong> menu' => '<strong>Innholds</strong> meny',
'<strong>Group</strong> members - {group}' => '<strong>Gruppe</strong> brukere - {group}',
'<strong>Group</strong> stats' => '<strong>Gruppe</strong>statistikk',
'<strong>Member</strong> Group Directory' => '<strong>Medlemmer</strong> Gruppe innhold',
'<strong>Member</strong> directory' => '<strong>Brukerområde</strong>',
'<strong>Member</strong> stats' => '<strong>Brukerstatistikk</strong>',
'<strong>New</strong> people' => '<strong>Nye</strong> Brukere',
'<strong>New</strong> spaces' => '<strong>Nye</strong> Grupper',
'<strong>Space</strong> directory' => '<strong>Område</strong> oversikt',
'<strong>Space</strong> stats' => '<strong>Gruppestatistikk</strong>',
'Average members' => 'Gjennomsnittlig antall påloggede',
'Directory' => 'Innhold',
'Follows somebody' => 'Noen som følger andre',
'Groups' => 'Grupper',
'Members' => 'Medlemmer',
'Most members' => 'Flest medlemmer',
'No members found!' => 'Ingen brukere funnet!',
'No spaces found!' => 'Ingen grupper funnet',
'Online right now' => 'Online akkurat nå',
'Private spaces' => 'Private grupper',
'Search' => 'Søk',
'See all' => 'Se alt',
'Send invite' => 'Send invitasjon',
'Spaces' => 'Grupper',
'This group has no members yet.' => 'Denne gruppen har ingen medlemmer.',
'Top Group' => 'Mest besøkte',
'Total groups' => 'Totalt antall grupper',
'Total spaces' => 'Antall grupper totalt',
'Total users' => 'Brukere totalt ',
'User profile posts' => 'Brukerinnlegg',
'You are a member of this space' => 'Du er medlem av dette område',
'search for members' => 'Søk etter brukere',
'search for spaces' => 'Søk etter område',
'show all members' => 'Vis alle medlemmer',
];
return array (
'<b>Nobody wrote something yet.</b><br>Make the beginning and post something...' => '<b>Ingen har skrevet noe enda.</b><br>Start ved og poste ett innlegg...',
'<b>There are no profile posts yet!</b>' => '<b>Det er ingen profil poster enda!</b>',
'<strong>Directory</strong> menu' => '<strong>Innholds</strong> meny',
'<strong>Group</strong> members - {group}' => '<strong>Gruppe</strong> brukere - {group}',
'<strong>Group</strong> stats' => '<strong>Gruppe</strong>statistikk',
'<strong>Member</strong> Group Directory' => '<strong>Medlemmer</strong> Gruppe innhold',
'<strong>Member</strong> directory' => '<strong>Brukerområde</strong>',
'<strong>Member</strong> stats' => '<strong>Brukerstatistikk</strong>',
'<strong>New</strong> people' => '<strong>Nye</strong> Brukere',
'<strong>New</strong> spaces' => '<strong>Nye</strong> Grupper',
'<strong>Space</strong> directory' => '<strong>Område</strong> oversikt',
'<strong>Space</strong> stats' => '<strong>Gruppestatistikk</strong>',
'Access directory' => 'Tilgangskatalog',
'Average members' => 'Gjennomsnittlig antall påloggede',
'Can access the directory section.' => 'Kan få tilgang til katalogdelen.',
'Directory' => 'Innhold',
'Follows somebody' => 'Noen som følger andre',
'Groups' => 'Grupper',
'Members' => 'Medlemmer',
'Most members' => 'Flest medlemmer',
'No members found!' => 'Ingen brukere funnet!',
'No spaces found!' => 'Ingen grupper funnet',
'Online right now' => 'Online akkurat nå',
'Private spaces' => 'Private grupper',
'Search' => 'Søk',
'See all' => 'Se alt',
'Send invite' => 'Send invitasjon',
'Spaces' => 'Grupper',
'This group has no members yet.' => 'Denne gruppen har ingen medlemmer.',
'Top Group' => 'Mest besøkte',
'Total groups' => 'Totalt antall grupper',
'Total spaces' => 'Antall grupper totalt',
'Total users' => 'Brukere totalt ',
'User profile posts' => 'Brukerinnlegg',
'You are a member of this space' => 'Du er medlem av dette område',
'search for members' => 'Søk etter brukere',
'search for spaces' => 'Søk etter område',
'show all members' => 'Vis alle medlemmer',
);
@@ -1,26 +1,9 @@
<?php
/**
* Message translations.
*
* This file is automatically generated by 'yii message/extract' command.
* It contains the localizable messages extracted from source code.
* You may modify this file by translating the extracted messages.
*
* Each array element represents the translation (value) of a message (key).
* If the value is empty, the message is considered as not translated.
* Messages that no longer need translation will have their translations
* enclosed between a pair of '@@' marks.
*
* Message string can be used with plural forms format. Check i18n section
* of the guide for details.
*
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
'<strong>Notification</strong> Overview' => '<strong>Ilmoituksen</strong> Yleiskatsaus',
'Apply' => 'Hyväksy',
'Filter' => 'Suofatin',
'Mark all as seen' => 'Merkitse kaikki luetuiksi',
'Module Filter' => 'Laajennus Suodatin',
'No notifications found!' => 'Ilmoituksia ei löytynyt!',
];
return array (
'<strong>Notification</strong> Overview' => '<strong>Ilmoitus</strong>',
'Apply' => 'Hyväksy',
'Filter' => 'Suodatin',
'Mark all as seen' => 'Merkitse kaikki luetuiksi',
'Module Filter' => 'Laajennuksen Suodatin',
'No notifications found!' => 'Ilmoituksia ei löytynyt!',
);
@@ -1,25 +1,8 @@
<?php
/**
* Message translations.
*
* This file is automatically generated by 'yii message/extract' command.
* It contains the localizable messages extracted from source code.
* You may modify this file by translating the extracted messages.
*
* Each array element represents the translation (value) of a message (key).
* If the value is empty, the message is considered as not translated.
* Messages that no longer need translation will have their translations
* enclosed between a pair of '@@' marks.
*
* Message string can be used with plural forms format. Check i18n section
* of the guide for details.
*
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
'Open the notification dropdown menu' => '',
'Mark all as seen' => 'Marker alle som sett',
'Notifications' => 'Oppdateringer',
'Show all notifications' => 'Vis alle oppdateringer',
'There are no notifications yet.' => 'Det er ingen oppdateringer enda.',
];
return array (
'Mark all as seen' => 'Marker alle som sett',
'Notifications' => 'Oppdateringer',
'Open the notification dropdown menu' => 'Åpne nedtreksmenyen for varsel ',
'Show all notifications' => 'Vis alle oppdateringer',
'There are no notifications yet.' => 'Det er ingen oppdateringer enda.',
);
2 changes: 1 addition & 1 deletion protected/humhub/modules/space/messages/it/manage.php
@@ -1,6 +1,6 @@
<?php
return array (
'As owner of this space you can transfer this role to another administrator in space.' => 'Come proprietario di questo Space puoi trasferirne la proprietà ad un altro amministratore dello spazio. ',
'As owner of this space you can transfer this role to another administrator in space.' => 'Come proprietario di questo spazio puoi trasferirne la proprietà ad un altro amministratore dello spazio. ',
'Remove from space' => 'Rimuovi dallo spazio',
'Show all' => 'Mostra tutti',
'Space owner' => 'Proprietario dello Spazio',
Expand Down
27 changes: 5 additions & 22 deletions protected/humhub/modules/space/messages/it/views_admin_delete.php
@@ -1,23 +1,6 @@
<?php
/**
* Message translations.
*
* This file is automatically generated by 'yii message/extract' command.
* It contains the localizable messages extracted from source code.
* You may modify this file by translating the extracted messages.
*
* Each array element represents the translation (value) of a message (key).
* If the value is empty, the message is considered as not translated.
* Messages that no longer need translation will have their translations
* enclosed between a pair of '@@' marks.
*
* Message string can be used with plural forms format. Check i18n section
* of the guide for details.
*
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
'Are you sure, that you want to delete this space? All published content will be removed!' => 'Sei sicuro di voler eliminare questo space? Tutto il contenuto pubblicato sarà rimosso!',
'Delete' => 'Elimina',
'Please provide your password to continue!' => 'Per favore fornisci la tua password per continuare!',
];
return array (
'Are you sure, that you want to delete this space? All published content will be removed!' => 'Sei sicuro di voler eliminare questo spazio? Tutto il contenuto pubblicato sarà rimosso!',
'Delete' => 'Elimina',
'Please provide your password to continue!' => 'Per favore fornisci la tua password per continuare!',
);
Expand Up @@ -6,5 +6,5 @@
'Choose the security level for this workspace to define the visibleness.' => 'Scegli il livello di sicurezza di questo workspace per definirne la visibilità.',
'Delete' => 'Cancella',
'Save' => 'Salva',
'Unarchive' => 'Disarchivia',
'Unarchive' => 'Ripristina',
);
@@ -1,11 +1,11 @@
<?php
return array (
'<strong>Space</strong> Modules' => 'Moduli dello <strong>Space</strong>',
'<strong>Space</strong> Modules' => 'Moduli dello <strong>Spazio</strong>',
'Activated' => 'Attivato',
'Are you sure? *ALL* module data for this space will be deleted!' => 'Sei sicuro? *TUTTI* i dati dei moduli di questo space saranno cancellati!',
'Are you sure? *ALL* module data for this space will be deleted!' => 'Sei sicuro? *TUTTI* i dati dei moduli di questo spazio saranno cancellati!',
'Configure' => 'Configura',
'Currently there are no modules available for this space!' => 'Al momento non ci sono moduli disponibili per questo space!',
'Currently there are no modules available for this space!' => 'Al momento non ci sono moduli disponibili per questo spazio!',
'Disable' => 'Disabilita',
'Enable' => 'Abilita',
'Enhance this space with modules.' => 'Potenzia questo space con i moduli',
'Enhance this space with modules.' => 'Potenzia questo spazio con i moduli',
);

0 comments on commit 106c265

Please sign in to comment.