diff --git a/BuildFiles/Packaging/scripts/repackage-one b/BuildFiles/Packaging/scripts/repackage-one index 03365a28..e95e6f93 100755 --- a/BuildFiles/Packaging/scripts/repackage-one +++ b/BuildFiles/Packaging/scripts/repackage-one @@ -137,13 +137,26 @@ else fi fi +if [ -e "../templates/preinst-$PACKAGE.template" ]; then + echo "Adding $PACKAGE preinst script..." + cp ../templates/preinst-$PACKAGE.template DEBIAN/preinst + chmod +x DEBIAN/preinst +else + if [ -e "DEBIAN/preinst" ]; then + echo "Deleting old preinst script..." + rm DEBIAN/preinst + fi +fi + echo "Converting CRLF line endings in scripts to LF-only..." dos2unix -q DEBIAN/* dos2unix -q etc/init.d/* echo "Setting build number $BUILDID..." -sed -i "s/--BuildNumber--/$BUILDID/" DEBIAN/control -echo $BUILDID > $DEPLOYDIR/$TARGETDIR/BuildIdentity.txt +sed -i "s/--BuildNumber--/$BUILDID/g" DEBIAN/control +if [ -e $DEPLOYDIR/$TARGETDIR ]; then + echo $BUILDID > $DEPLOYDIR/$TARGETDIR/BuildIdentity.txt +fi # Calculating new checksums echo "Creating MD5 checksum file..." diff --git a/BuildFiles/Packaging/templates/control-backend-sprint.template b/BuildFiles/Packaging/templates/control-backend-sprint.template index eb18a5c6..91d27c33 100644 --- a/BuildFiles/Packaging/templates/control-backend-sprint.template +++ b/BuildFiles/Packaging/templates/control-backend-sprint.template @@ -2,7 +2,7 @@ Package: swarmops-backend Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common,mono-runtime (>= 3.2.8),libmono-corlib4.0-cil (>= 3.2.8),libmono-posix4.0-cil (>= 3.2.8),libmono-system-data4.0-cil (>= 3.2.8),libmono-system-web-http4.0-cil (>= 3.2.8) +Depends: swarmops-common (>= --BuildNumber--),mono-runtime (>= 3.2.8),libmono-corlib4.0-cil (>= 3.2.8),libmono-posix4.0-cil (>= 3.2.8),libmono-system-data4.0-cil (>= 3.2.8),libmono-system-web-http4.0-cil (>= 3.2.8) Conflicts: swarmops-backend-internal,swarmops-backend-stable Homepage: http://swarmops.com/ Description: Swarmops Backend diff --git a/BuildFiles/Packaging/templates/control-frontend-sprint.template b/BuildFiles/Packaging/templates/control-frontend-sprint.template index c0c3200f..b82ed4b8 100644 --- a/BuildFiles/Packaging/templates/control-frontend-sprint.template +++ b/BuildFiles/Packaging/templates/control-frontend-sprint.template @@ -2,7 +2,7 @@ Package: swarmops-frontend Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) -Depends: swarmops-common, apache2 (>= 2.2.20), mono-apache-server4 (>= 3.0.11), libapache2-mod-mono (>= 2.11), libgdiplus (>= 2.11), imagemagick, ghostscript +Depends: swarmops-common (>= --BuildNumber--), apache2 (>= 2.2.20), mono-apache-server4 (>= 3.0.11), libapache2-mod-mono (>= 2.11), libgdiplus (>= 2.11), imagemagick, ghostscript Conflicts: swarmops-frontend-internal,swarmops-frontend-stable Homepage: http://swarmops.com/ Description: Swarmops Frontend diff --git a/BuildFiles/Packaging/templates/postinst-frontend.template b/BuildFiles/Packaging/templates/postinst-frontend.template index b72414a9..135bd74f 100644 --- a/BuildFiles/Packaging/templates/postinst-frontend.template +++ b/BuildFiles/Packaging/templates/postinst-frontend.template @@ -1,6 +1,27 @@ #! /bin/bash -#echo "Swarmops Frontend post-installation script running" -#just make sure the upload folder exists and is writeable by www-data -mkdir -p /var/lib/swarmops/upload -chown www-data:www-data /var/lib/swarmops/upload +# make sure the upload folder exists and is writeable by www-data +# do not make any changes to an already existing folder + +if [ ! -e /var/lib/swarmops/upload ]; then + mkdir -p /var/lib/swarmops/upload + chown www-data:www-data /var/lib/swarmops/upload + chmod 777 /var/lib/swarmops/upload +fi + +# make sure the web frontend (and its init routine) can write to machineKey.config +# TODO: add test here - only chown if it's the pristine, unedited file + +chown www-data:www-data /etc/swarmops/machineKey.config + +# make sure the web frontend (and its init) can write to database.config + +chown www-data:www-data /etc/swarmops/database.config + +# if we stopped Apache in preinst (1st install), restart it + +if [ -e /tmp/swarmops-restart-apache.flag ]; then + /etc/init.d/apache2 start + rm /tmp/swarmops-restart-apache.flag +fi + diff --git a/BuildFiles/Packaging/templates/preinst-frontend.template b/BuildFiles/Packaging/templates/preinst-frontend.template new file mode 100644 index 00000000..58eb8536 --- /dev/null +++ b/BuildFiles/Packaging/templates/preinst-frontend.template @@ -0,0 +1,15 @@ +#! /bin/bash + +# To circumvent lib-mod-mono bug on first install, stop Apache if it is currently running, before we try to install. +# (It's very rude to shut down services without asking first like this, but even more rude of the lib-mod-mono +# installer to just bloody hang.) + +if [! -e /etc/swarmops/database.config ]; then + if /etc/init.d/apache2 status > /dev/null; then + # Set a flag to postinst to restart Apache + echo foo > /tmp/swarmops-restart-apache.flag + /etc/init.d/apache2 stop + fi +fi + + diff --git a/BuildFiles/prepare-sprint b/BuildFiles/prepare-sprint index 5ad06529..fd42efc1 100755 --- a/BuildFiles/prepare-sprint +++ b/BuildFiles/prepare-sprint @@ -10,6 +10,7 @@ cd .. #Update lines-of-code count cd .. BuildFiles/update-kaylock-count +tail -n 1 LINESOFCODE | cut -c 2-7 | xargs printf "%'d" | xargs -I {} sed -i 's/.*/{}/' Site5/Default.aspx cd BuildFiles #After this, a manual git push should be done diff --git a/LINESOFCODE b/LINESOFCODE index 0aae4532..feb8be6c 100644 --- a/LINESOFCODE +++ b/LINESOFCODE @@ -95,7 +95,7 @@ 59 ./Basic/Enums/FinancialDependencyType.cs 28 ./Basic/Enums/PersonOptionalDataKey.cs 240 ./Basic/Enums/RoleTypeClass.cs - 293 ./Basic/Enums/ObjectOptionalDataType.cs + 304 ./Basic/Enums/ObjectOptionalDataType.cs 10 ./Basic/Enums/ExpenseEventType.cs 41 ./Basic/Enums/OutboundCommPriority.cs 57 ./Basic/Enums/MailAuthorType.cs @@ -312,7 +312,7 @@ 37 ./Utility/Properties/AssemblyInfo.cs 75 ./Utility/Server/ExchangeCode.cs 144 ./Utility/Server/ActiveDirectoryCode.cs - 85 ./Utility/Communications/CommsTransmitterMail.cs + 98 ./Utility/Communications/CommsTransmitterMail.cs 260 ./Utility/Mail/NewsletterTransmitter3.cs 273 ./Utility/Mail/PressReleaseTransmitter.cs 275 ./Utility/Mail/MailTransmitter.cs @@ -338,8 +338,10 @@ 1 ./Site5/Pages/v5/Financial/Json-AttestableCosts.aspx 117 ./Site5/Pages/v5/Financial/PayOutMoney.aspx.cs 228 ./Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs + 46 ./Site5/Pages/v5/Admin/Settings.aspx 141 ./Site5/Pages/v5/Admin/CreateOrganization.aspx.cs 43 ./Site5/Pages/v5/Admin/CreateOrganization.aspx + 149 ./Site5/Pages/v5/Admin/Settings.aspx.cs 154 ./Site5/Pages/v5/Admin/Hacks/PopulateCountry2.aspx.cs 106 ./Site5/Pages/v5/Admin/Hacks/PopulateCountry2.aspx 16 ./Site5/Pages/v5/Admin/Hacks/TemporaryHack.aspx @@ -366,7 +368,7 @@ 90 ./Site5/Pages/v5/Security/Json-AccessibleOrganizationsTree.aspx.cs 40 ./Site5/Pages/v5/Security/ChangeOrganizationsAdvanced.aspx.cs 63 ./Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs - 743 ./Site5/Pages/v5/Init/Default.aspx.cs + 778 ./Site5/Pages/v5/Init/Default.aspx.cs 753 ./Site5/Pages/v5/Init/Default.aspx 738 ./Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs 133 ./Site5/Pages/v5/Ledgers/CloseLedgers.aspx.cs @@ -375,8 +377,8 @@ 334 ./Site5/Pages/v5/Ledgers/SetRootBudgets.aspx.cs 0 ./Site5/Pages/v5/Ledgers/Json-InspectLedgerData.aspx 49 ./Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs - 463 ./Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs - 239 ./Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs + 491 ./Site5/Pages/v5/Ledgers/AccountPlan.aspx.cs + 262 ./Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs 30 ./Site5/Pages/v5/Ledgers/DebugLedgers.aspx.cs 1 ./Site5/Pages/v5/Ledgers/Json-BalanceSheetData.aspx 188 ./Site5/Pages/v5/Ledgers/Json-InspectLedgerData.aspx.cs @@ -400,7 +402,7 @@ 98 ./Site5/Pages/v5/Ledgers/Csv-ProfitLossData.aspx.cs 117 ./Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx 267 ./Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx - 596 ./Site5/Pages/v5/Ledgers/AccountPlan.aspx + 658 ./Site5/Pages/v5/Ledgers/AccountPlan.aspx 114 ./Site5/Pages/v5/Ledgers/BalanceSheet.aspx 1 ./Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx 126 ./Site5/Pages/v5/Ledgers/Json-BalanceSheetData.aspx.cs @@ -420,9 +422,13 @@ 19 ./Site5/Default.aspx 376 ./Site5/Security/Login.aspx.cs 106 ./Site5/Security/Login-Old.aspx.cs - 227 ./Site5/Security/Login.aspx + 228 ./Site5/Security/Login.aspx + 146 ./Site5/Security/ResetPassword.aspx.cs + 92 ./Site5/Security/RequestPasswordReset.aspx.cs 26 ./Site5/Security/FinalizeLogin.aspx.cs + 136 ./Site5/Security/RequestPasswordReset.aspx 53 ./Site5/Security/Login-Old.aspx + 152 ./Site5/Security/ResetPassword.aspx 0 ./Site5/Security/FinalizeLogin.aspx 0 ./Site5/Automation/Json-GeographiesTree.aspx 1 ./Site5/Automation/Json-GetPersonAvatar.aspx @@ -440,7 +446,7 @@ 412 ./Site5/Automation/UploadFileHandler.ashx 1 ./Site5/Automation/Json-SearchPeoplePattern.aspx 1 ./Site5/Automation/FieldValidation.aspx - 157 ./Site5/Automation/Json-FinancialAccountsTree.aspx.cs + 159 ./Site5/Automation/Json-FinancialAccountsTree.aspx.cs 96 ./Site5/Automation/Json-TransactionTagsTree.aspx.cs 168 ./Site5/Automation/FieldValidation.aspx.cs 33 ./Site5/Automation/Json-GetPersonAvatar.aspx.cs @@ -455,6 +461,8 @@ 29 ./Site5/Controls/v5/Base/DropDown.ascx.cs 68 ./Site5/Controls/v5/Base/FileUpload.ascx 1 ./Site5/Controls/v5/Base/MainMenu.ascx + 83 ./Site5/Controls/v5/Base/AjaxTextBox.ascx + 48 ./Site5/Controls/v5/Base/AjaxTextBox.ascx.cs 40 ./Site5/Controls/v5/Base/DropDown.ascx 49 ./Site5/Controls/v5/Financial/CurrencyTextBox.ascx.cs 101 ./Site5/Controls/v5/Financial/ComboBudgets.ascx @@ -478,7 +486,7 @@ 65 ./Site5/App_Code/ControlV5Base.cs 91 ./Logic/App_GlobalResources/Logic.Communications.Transmission.DefaultCommTemplates.Designer.cs 81 ./Logic/App_GlobalResources/Logic.Communications.Transmission.MailPayload.Designer.cs - 459 ./Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.Designer.cs + 569 ./Logic/App_GlobalResources/Logic.Communications.Transmission.NotificationPayload.Designer.cs 91 ./Logic/App_GlobalResources/Logic.Financial.FinancialTransactionTagSetTypesStock.Designer.cs 171 ./Logic/App_GlobalResources/Logic.Swarm.DashboardTodos.Designer.cs 927 ./Logic/App_GlobalResources/ParticipantTitles.Designer.cs @@ -557,7 +565,7 @@ 58 ./Logic/AssemblyInfo.cs 836 ./Logic/Security/BCrypt.cs 29 ./Logic/Security/MD5.cs - 65 ./Logic/Security/Accesses.cs + 76 ./Logic/Security/Accesses.cs 310 ./Logic/Security/Authority.cs 24 ./Logic/Security/ActivityEnum.cs 29 ./Logic/Security/SHA1.cs @@ -618,7 +626,7 @@ 22 ./Logic/Communications/Transmission/PayloadEnvelope.cs 47 ./Logic/Communications/Transmission/PayloadBase.cs 122 ./Logic/Communications/Transmission/ParticipantMailPayload.cs - 149 ./Logic/Communications/Transmission/NotificationPayload.cs + 156 ./Logic/Communications/Transmission/NotificationPayload.cs 29 ./Logic/Communications/OutboundMails.cs 20 ./Logic/Communications/OutboundMailRecipients.cs 34 ./Logic/Communications/NewsletterFeeds.cs @@ -627,7 +635,7 @@ 15 ./Logic/Communications/ICommsTransmitter.cs 72 ./Logic/Communications/AutoMail.cs 45 ./Logic/Communications/PaperLetters.cs - 275 ./Logic/Communications/OutboundComm.cs + 308 ./Logic/Communications/OutboundComm.cs 41 ./Logic/Communications/OutboundCommRecipient.cs 1285 ./Logic/Communications/TypedMailTemplate.cs 13 ./Logic/Communications/OutboundComms.cs @@ -652,7 +660,7 @@ 275 ./Logic/Swarm/Membership.cs 138 ./Logic/Swarm/Memberships.cs 49 ./Logic/Swarm/Parleys.cs - 1127 ./Logic/Swarm/Person.cs + 1136 ./Logic/Swarm/Person.cs 533 ./Logic/Swarm/People.cs 143 ./Logic/Swarm/MembershipEvents.cs 82 ./Logic/Swarm/PaymentCode.cs @@ -686,10 +694,12 @@ 434 ./Logic/Support/CheckDigit.cs 22 ./Logic/Support/PirateWebDebug.cs 136 ./Logic/Support/ObjectOptionalData.cs - 66 ./Logic/Support/SingularFactory.cs + 73 ./Logic/Support/SingularFactory.cs + 103 ./Logic/Support/SystemSettings.cs 40 ./Logic/Support/ActivistEvents.cs - 23 ./Logic/Support/General.cs + 58 ./Logic/Support/General.cs 168 ./Logic/Support/Document.cs + 29 ./Logic/Support/LogEntries/PasswordResetRequestLogEntry.cs 24 ./Logic/Support/LogEntries/MembershipActionBase.cs 22 ./Logic/Support/LogEntries/FinancialActionBase.cs 30 ./Logic/Support/LogEntries/ExpenseClaimFiledLogEntry.cs @@ -699,6 +709,8 @@ 46 ./Logic/Support/LogEntries/LogEntryBase.cs 28 ./Logic/Support/LogEntries/SalaryCreatedLogEntry.cs 30 ./Logic/Support/LogEntries/CashAdvanceRequestedLogEntry.cs + 21 ./Logic/Support/LogEntries/SecurityActionBase.cs + 26 ./Logic/Support/LogEntries/PasswordResetLogEntry.cs 25 ./Logic/Support/Optimizations.cs 93 ./Logic/Support/ExtensionMethods.cs 75 ./Logic/Support/SerializableDictionary.cs @@ -739,4 +751,4 @@ 156 ./Interface/Objects/MainMenuItem.cs 173 ./Interface/Objects/ExpensePayout.cs 213 ./Interface/PersonIcon.cs - 102576 total + 103994 total diff --git a/Logic/App_GlobalResources/af-ZA/Logic.Communications.Transmission.NotificationPayload.af-ZA.resx b/Logic/App_GlobalResources/af-ZA/Logic.Communications.Transmission.NotificationPayload.af-ZA.resx index db0a5ad6..4d7e1e5e 100644 --- a/Logic/App_GlobalResources/af-ZA/Logic.Communications.Transmission.NotificationPayload.af-ZA.resx +++ b/Logic/App_GlobalResources/af-ZA/Logic.Communications.Transmission.NotificationPayload.af-ZA.resx @@ -136,11 +136,12 @@ crwdns6555541:0[OrganizationName]crwdnd6555541:0[CurrencyCode]crwdnd6555541:0[BudgetAmountFloat]crwdne6555541:0 - crwdns6553713:0[ConcernedPersonName]crwdnd6553713:0[CurrencyCode]crwdnd6553713:0[BudgetAmountFloat]crwdnd6553713:0[RequestPurpose]crwdnd6553713:0[BudgetName]crwdnd6553713:0[SystemUrl]crwdne6553713:0 + crwdns6555620:0[ConcernedPersonName]crwdnd6555620:0[CurrencyCode]crwdnd6555620:0[BudgetAmountFloat]crwdnd6555620:0[RequestPurpose]crwdnd6555620:0[BudgetName]crwdnd6555620:0[InstallationName]crwdnd6555620:0[ExternalUrl]crwdne6555620:0 This is sent to the budget owner(s) only. crwdns6555542:0[OrganizationName]crwdnd6555542:0[CurrencyCode]crwdnd6555542:0[BudgetAmountFloat]crwdne6555542:0 + ACTION ITEM should be translated. crwdns6553652:0[OrganizationName]crwdnd6553652:0[CurrencyCode]crwdnd6553652:0[BudgetAmountFloat]crwdnd6553652:0[RequestPurpose]crwdne6553652:0 @@ -150,7 +151,7 @@ crwdns6555543:0[OrganizationName]crwdnd6555543:0[CurrencyCode]crwdnd6555543:0[BudgetAmountFloat]crwdne6555543:0 - crwdns6553654:0[ConcernedPersonName]crwdnd6553654:0[BudgetName]crwdnd6553654:0[CurrencyCode]crwdnd6553654:0[BudgetAmountFloat]crwdnd6553654:0[RequestPurpose]crwdnd6553654:0[SystemUrl]crwdne6553654:0 + crwdns6555621:0[ConcernedPersonName]crwdnd6555621:0[BudgetName]crwdnd6555621:0[CurrencyCode]crwdnd6555621:0[BudgetAmountFloat]crwdnd6555621:0[RequestPurpose]crwdnd6555621:0[InstallationName]crwdnd6555621:0[ExternalUrl]crwdne6555621:0 This is sent to the budget owner(s)only. @@ -191,10 +192,11 @@ crwdns6555549:0[OrganizationName]crwdnd6555549:0[CurrencyCode]crwdnd6555549:0[BudgetAmountFloat]crwdne6555549:0 - crwdns6553820:0[Supplier]crwdnd6553820:0[Description]crwdnd6553820:0[BudgetName]crwdnd6553820:0[CurrencyCode]crwdnd6553820:0[BudgetAmountFloat]crwdnd6553820:0[SystemUrl]crwdne6553820:0 + crwdns6555622:0[Supplier]crwdnd6555622:0[Description]crwdnd6555622:0[BudgetName]crwdnd6555622:0[CurrencyCode]crwdnd6555622:0[BudgetAmountFloat]crwdnd6555622:0[InstallationName]crwdnd6555622:0[ExternalUrl]crwdne6555622:0 crwdns6555550:0[OrganizationName]crwdnd6555550:0[CurrencyCode]crwdnd6555550:0[BudgetAmountFloat]crwdne6555550:0 + ACTION ITEM should be translated. crwdns6555551:0[Regular]crwdnd6555551:0[OrganizationName]crwdne6555551:0 @@ -223,11 +225,36 @@ crwdns6555559:0[OrganizationName]crwdnd6555559:0[GeographyName]crwdne6555559:0 + + crwdns6555571:0[InstallationName]crwdnd6555571:0[InstallationName]crwdne6555571:0 + + + crwdns6555572:0[InstallationName]crwdne6555572:0 + + + crwdns6555573:0[InstallationName]crwdnd6555573:0[ExternalUrl]crwdnd6555573:0[ExternalUrl]crwdnd6555573:0[MailAddress]crwdnd6555573:0[TicketCode]crwdne6555573:0 + + + crwdns6555574:0[InstallationName]crwdne6555574:0 + + + crwdns6555575:0[OrganizationName]crwdnd6555575:0[ExternalUrl]crwdnd6555575:0[ResetPasswordTicket]crwdnd6555575:0[OrganizationName]crwdne6555575:0 + + + crwdns6555576:0[OrganizationName]crwdne6555576:0 + + + crwdns6555577:0[InstallationName]crwdnd6555577:0[ExternalUrl]crwdnd6555577:0[TicketCode]crwdne6555577:0 + + + crwdns6555578:0[InstallationName]crwdne6555578:0 + - crwdns6553822:0[SystemUrl]crwdne6553822:0 + crwdns6555623:0[InstallationName]crwdnd6555623:0[ExternalUrl]crwdne6555623:0 crwdns6555560:0[OrganizationName]crwdne6555560:0 + ACTION ITEM should be translated. crwdns6553824:0[SwarmopsVersion]crwdnd6553824:0[HostName]crwdnd6553824:0[DbVersion]crwdne6553824:0 @@ -241,6 +268,12 @@ crwdns6553665:0crwdne6553665:0 + + crwdns6555580:0[SwarmopsVersion]crwdnd6555580:0[HostName]crwdne6555580:0 + + + crwdns6555581:0crwdne6555581:0 + crwdns6553666:0[SwarmopsVersion]crwdnd6553666:0[HostName]crwdne6553666:0 diff --git a/Logic/App_GlobalResources/da-DK/Logic.Communications.Transmission.NotificationPayload.da-DK.resx b/Logic/App_GlobalResources/da-DK/Logic.Communications.Transmission.NotificationPayload.da-DK.resx index 78fdeec1..3443a364 100644 --- a/Logic/App_GlobalResources/da-DK/Logic.Communications.Transmission.NotificationPayload.da-DK.resx +++ b/Logic/App_GlobalResources/da-DK/Logic.Communications.Transmission.NotificationPayload.da-DK.resx @@ -147,6 +147,16 @@ + + + + + + + + + + diff --git a/Logic/App_GlobalResources/de-DE/Logic.Communications.Transmission.NotificationPayload.de-DE.resx b/Logic/App_GlobalResources/de-DE/Logic.Communications.Transmission.NotificationPayload.de-DE.resx index 78fdeec1..3443a364 100644 --- a/Logic/App_GlobalResources/de-DE/Logic.Communications.Transmission.NotificationPayload.de-DE.resx +++ b/Logic/App_GlobalResources/de-DE/Logic.Communications.Transmission.NotificationPayload.de-DE.resx @@ -147,6 +147,16 @@ + + + + + + + + + + diff --git a/Logic/App_GlobalResources/es-ES/Logic.Communications.Transmission.NotificationPayload.es-ES.resx b/Logic/App_GlobalResources/es-ES/Logic.Communications.Transmission.NotificationPayload.es-ES.resx index 78fdeec1..3443a364 100644 --- a/Logic/App_GlobalResources/es-ES/Logic.Communications.Transmission.NotificationPayload.es-ES.resx +++ b/Logic/App_GlobalResources/es-ES/Logic.Communications.Transmission.NotificationPayload.es-ES.resx @@ -147,6 +147,16 @@ + + + + + + + + + + diff --git a/Logic/App_GlobalResources/fi-FI/Logic.Communications.Transmission.NotificationPayload.fi-FI.resx b/Logic/App_GlobalResources/fi-FI/Logic.Communications.Transmission.NotificationPayload.fi-FI.resx index 78fdeec1..3443a364 100644 --- a/Logic/App_GlobalResources/fi-FI/Logic.Communications.Transmission.NotificationPayload.fi-FI.resx +++ b/Logic/App_GlobalResources/fi-FI/Logic.Communications.Transmission.NotificationPayload.fi-FI.resx @@ -147,6 +147,16 @@ + + + + + + + + + + diff --git a/Logic/App_GlobalResources/fr-FR/Logic.Communications.Transmission.NotificationPayload.fr-FR.resx b/Logic/App_GlobalResources/fr-FR/Logic.Communications.Transmission.NotificationPayload.fr-FR.resx index 78fdeec1..3443a364 100644 --- a/Logic/App_GlobalResources/fr-FR/Logic.Communications.Transmission.NotificationPayload.fr-FR.resx +++ b/Logic/App_GlobalResources/fr-FR/Logic.Communications.Transmission.NotificationPayload.fr-FR.resx @@ -147,6 +147,16 @@ + + + + + + + + + + diff --git a/Logic/App_GlobalResources/hi-IN/Logic.Communications.Transmission.NotificationPayload.hi-IN.resx b/Logic/App_GlobalResources/hi-IN/Logic.Communications.Transmission.NotificationPayload.hi-IN.resx index 78fdeec1..3443a364 100644 --- a/Logic/App_GlobalResources/hi-IN/Logic.Communications.Transmission.NotificationPayload.hi-IN.resx +++ b/Logic/App_GlobalResources/hi-IN/Logic.Communications.Transmission.NotificationPayload.hi-IN.resx @@ -147,6 +147,16 @@ + + + + + + + + + + diff --git a/Logic/App_GlobalResources/is-IS/Logic.Communications.Transmission.NotificationPayload.is-IS.resx b/Logic/App_GlobalResources/is-IS/Logic.Communications.Transmission.NotificationPayload.is-IS.resx index 78fdeec1..3443a364 100644 --- a/Logic/App_GlobalResources/is-IS/Logic.Communications.Transmission.NotificationPayload.is-IS.resx +++ b/Logic/App_GlobalResources/is-IS/Logic.Communications.Transmission.NotificationPayload.is-IS.resx @@ -147,6 +147,16 @@ + + + + + + + + + + diff --git a/Logic/App_GlobalResources/it-IT/Logic.Communications.Transmission.NotificationPayload.it-IT.resx b/Logic/App_GlobalResources/it-IT/Logic.Communications.Transmission.NotificationPayload.it-IT.resx index 0dbe0a3f..b5e67fec 100644 --- a/Logic/App_GlobalResources/it-IT/Logic.Communications.Transmission.NotificationPayload.it-IT.resx +++ b/Logic/App_GlobalResources/it-IT/Logic.Communications.Transmission.NotificationPayload.it-IT.resx @@ -155,6 +155,16 @@ Rimanete in attesa di ulteriori indicazioni dal responsabile del bilancio. [[OrganizationName]] Kontantförskott utbetalt: [CurrencyCode] [BudgetAmountFloat] - [ConcernedPersonName] har begärt ett kontantförskott på [CurrencyCode] [BudgetAmountFloat] rörande [RequestPurpose]. Dessa pengar är en del av din budget, [BudgetName]. + [ConcernedPersonName] har begärt ett kontantförskott på [CurrencyCode] [BudgetAmountFloat] för [RequestPurpose]. Dessa pengar är en del av din budget, [BudgetName]. -Vänligen logga på Swarmops på [SystemUrl] för att attestera eller avslå. +Vänligen logga in på [InstallationName] på [ExternalUrl]Financial/AttestCosts att attestera eller neka. This is sent to the budget owner(s) only. [[OrganizationName] - ÅTGÄRD BEHÖVS] Förskott begärt: [CurrencyCode] [BudgetAmountFloat] - attest behövs + ACTION ITEM should be translated. Ditt utläggsanspråk hos [OrganizationName] på [CurrencyCode] [BudgetAmountFloat], rörande [RequestPurpose], har attesterats av budgetägaren. Det kommer att betalas ut till dig när kvittona granskats för räkenskaperna. @@ -156,9 +157,9 @@ Vänligen logga på Swarmops på [SystemUrl] för att attestera eller avslå.[[OrganizationName]] Utläggsanspråk attesterat: [CurrencyCode] [BudgetAmountFloat] - [ConcernedPersonName] har lagt ett utläggsanspråk i [OrganizationName] mot budgeten [BudgetName] på [CurrencyCode] [BudgetAmountFloat]. Anspråket gäller [RequestPurpose]. Som budgetägare behöver du attestera det här utläggsanspråket. + [ConcernedPersonName] har lagt ett utläggsanspråk mot budgeten [BudgetName] på [CurrencyCode] [BudgetAmountFloat]. Anspråket gäller [RequestPurpose]. Det betalas bara ut om du attesterar kostnaden. -Vänligen logga på Swarmops på [SystemUrl] för att attestera eller avslå. +Logga in på [InstallationName] på [ExternalUrl]Financial/AttestCosts för att attestera eller neka anspråket. This is sent to the budget owner(s)only. @@ -209,12 +210,13 @@ Utläggsanspråket kommer att betalas ut till dig när beloppet också är attes [[OrganizationName]] Kvitton för utläggsanspråk granskade: [CurrencyCode] [BudgetAmountFloat] - En faktura från [Supplier], gällande [Description], har lagts mot din budget [BudgetName] på beloppet [CurrencyCode] [BudgetAmountFloat]. Du måste attestera fakturan innan den går till betalning. + En faktura från [Supplier] gällande [Description] har inkommit mot din budget [BudgetName]. Fakturan är på [CurrencyCode] [BudgetAmountFloat]. Du måste attestera fakturan innan den går till betalning. -Logga på Swarmops på [SystemUrl] för att attestera eller avslå. +Logga in på [InstallationName] på [ExternalUrl]Financial/AttestCosts för att attestera eller neka fakturan. [[OrganizationName] - ÅTGÄRD KRÄVS] Faktura mottagen: [CurrencyCode] [BudgetAmountFloat] - attest behövs + ACTION ITEM should be translated. En ny [Regular] lades manuellt till [OrganizationName] inom ett område där du har ansvar. @@ -245,13 +247,52 @@ Tid från order till sändningen var klar: [TransmissionTime]. [[OrganizationName]] Meddelande sänt: [GeographyName] - - Kvitton har lagts in som behöver granskas för att gå vidare till utbetalning. + + Någon, troligtvis du, har begärt en lösenordsåterställning till [InstallationName] för kontot som är kopplat till den här mailadressen. Dock har tvåfaktorsautentisering aktiverats på det här kontot för att höja säkerheten. Därför går det inte heller att återställa lösenordet lika enkelt. -Logga på Swarmops på [SystemUrl] för att godkänna eller avslå dem. +Kontakta en personaladministratör på [InstallationName] för att lösa ditt problem och utfärda ett nytt lösenord efter en identitetskontroll som överensstämmer med säkerhetsnivån för tvåfaktorsautenticering. + +Tack för din förståelse. + + + [[InstallationName]] Kan inte återställa lösenord + + + Ditt lösenord till [InstallationName] på [ExternalUrl] ändrades nyss. + +Om det inte var du som ändrade på lösenordet just nu, så gjorde någon annan det, förmodligen i syfte att logga in som dig. Om så är fallet, vänligen lås ditt konto OMEDELBART genom att klicka på följande länk: + +[ExternalUrl]Security/AccountLockdown?Mail=[MailAddress]&Ticket=[TicketCode] + +Då du bekräftar en nedlåsning på länken ovan, så kommer befintliga sessioner kommer att avslutas omedelbart, inloggningar med det nya lösenordet blir utelåsta, och administratörer kommer att kontakta dig för att kontrollera vad som hänt och arbeta med dig för att återaktivera ditt konto. + +Men om det var du själv som ändrade lösenordet just nu, och därmed ligger bakom att detta mail skickades för din kännedom, så är allt givetvis bra och precis som det ska vara. + + + [[InstallationName]] Lösenordet har ändrats + + + + [[OrganizationName]] Lösenordsåterställningskod + + + Någon, troligtvis du, har begärt en återställning av lösenordet som är kopplat till denna e-postadress på [InstallationName]. Om det var du, så följ länken nedan inom en timme för att fullfölja lösenordsåterställningen: + +[ExternalUrl]Security/ResetPassword?Ticket=[TicketCode] + +Om du INTE har begärt att lösenordet ska återställas, så kan (och bör) du ignorera detta mail. Koden ovan gäller bara i en timme. (Om du får en stor mängd sådana här lösenordsåterställningskoder som du inte har frågat efter, vänligen meddela administratörer på [InstallationName].) + + + [[InstallationName]] Lösenordsåterställningskod + + + Kvitton har lämnats in. De behöver godkännas för att gå vidare till utbetalning och andra processer. + +Logga in på [InstallationName] på [ExternalUrl]Financial/ValidateReceipts att godkänna eller underkänna dem. [[OrganizationName] - ÅTGÄRD KRÄVS] Kvitton inlagda - granskning behövs + ACTION ITEM should be translated. Swarmops Backend [SwarmopsVersion] på servern [HostName] har uppgraderat Swarmops' databasschema till version [DbVersion]. Detta är endast för information. Du behöver inte vidta någon åtgärd. @@ -265,6 +306,12 @@ Logga på Swarmops på [SystemUrl] för att godkänna eller avslå dem. Swarmops EXCEPTION! + + Detta är ett testmail som skickats av Swarmops [SwarmopsVersion] på [HostName]. Eftersom du precis ändrade mailserverinställningarna, så skickas det här testmailet för att se att dina nya inställningar fungerar. + + + Swarmops Test av Mailserver + Swarmops Backend version [SwarmopsVersion], som körs på maskinen [HostName], har startat och har anslutit till databasen och notifieringsmekanismer. diff --git a/Logic/App_GlobalResources/zh-CN/Logic.Communications.Transmission.NotificationPayload.zh-CN.resx b/Logic/App_GlobalResources/zh-CN/Logic.Communications.Transmission.NotificationPayload.zh-CN.resx index 78fdeec1..3443a364 100644 --- a/Logic/App_GlobalResources/zh-CN/Logic.Communications.Transmission.NotificationPayload.zh-CN.resx +++ b/Logic/App_GlobalResources/zh-CN/Logic.Communications.Transmission.NotificationPayload.zh-CN.resx @@ -147,6 +147,16 @@ + + + + + + + + + + diff --git a/Site5/App_GlobalResources/af-ZA/GeographyNames.af-ZA.resx b/Site5/App_GlobalResources/af-ZA/GeographyNames.af-ZA.resx index da2dd12d..ee27a829 100644 --- a/Site5/App_GlobalResources/af-ZA/GeographyNames.af-ZA.resx +++ b/Site5/App_GlobalResources/af-ZA/GeographyNames.af-ZA.resx @@ -201,7 +201,7 @@ crwdns6553989:0crwdne6553989:0 - crwdns6553990:0crwdne6553990:0 + crwdns6555582:0crwdne6555582:0 Root geography diff --git a/Site5/App_GlobalResources/af-ZA/Global.af-ZA.resx b/Site5/App_GlobalResources/af-ZA/Global.af-ZA.resx index daa89529..c91d38fb 100644 --- a/Site5/App_GlobalResources/af-ZA/Global.af-ZA.resx +++ b/Site5/App_GlobalResources/af-ZA/Global.af-ZA.resx @@ -552,4 +552,7 @@ crwdns6555404:0crwdne6555404:0 + + crwdns6555583:0crwdne6555583:0 + diff --git a/Site5/App_GlobalResources/af-ZA/Menu5.af-ZA.resx b/Site5/App_GlobalResources/af-ZA/Menu5.af-ZA.resx index a8f5b566..bec9370d 100644 --- a/Site5/App_GlobalResources/af-ZA/Menu5.af-ZA.resx +++ b/Site5/App_GlobalResources/af-ZA/Menu5.af-ZA.resx @@ -135,6 +135,9 @@ crwdns1639807:0crwdne1639807:0 + + crwdns6555584:0crwdne6555584:0 + crwdns1639808:0crwdne1639808:0 diff --git a/Site5/App_GlobalResources/af-ZA/Pages.Admin.af-ZA.resx b/Site5/App_GlobalResources/af-ZA/Pages.Admin.af-ZA.resx index cad662d1..08279b83 100644 --- a/Site5/App_GlobalResources/af-ZA/Pages.Admin.af-ZA.resx +++ b/Site5/App_GlobalResources/af-ZA/Pages.Admin.af-ZA.resx @@ -194,4 +194,31 @@ crwdns6555418:0{0}crwdne6555418:0 The {0} is the operating currency (USD etc). + + crwdns6555585:0crwdne6555585:0 + + + crwdns6555586:0crwdne6555586:0 + + + crwdns6555587:0crwdne6555587:0 + + + crwdns6555588:0crwdne6555588:0 + + + crwdns6555589:0crwdne6555589:0 + + + crwdns6555590:0crwdne6555590:0 + + + crwdns6555591:0crwdne6555591:0 + + + crwdns6555592:0crwdne6555592:0 + + + crwdns6555593:0crwdne6555593:0 + diff --git a/Site5/App_GlobalResources/af-ZA/Pages.Ledgers.af-ZA.resx b/Site5/App_GlobalResources/af-ZA/Pages.Ledgers.af-ZA.resx index 5ac612d7..a95028ab 100644 --- a/Site5/App_GlobalResources/af-ZA/Pages.Ledgers.af-ZA.resx +++ b/Site5/App_GlobalResources/af-ZA/Pages.Ledgers.af-ZA.resx @@ -134,7 +134,7 @@ crwdns6555069:0{0}crwdne6555069:0 - {0} is the organization name. The year follows immediately. + {0} is the organization name. The year follows immediately, so keep ending comma. crwdns6555070:0crwdne6555070:0 @@ -561,4 +561,16 @@ crwdns6555567:0{0}crwdnd6555567:0{1}crwdne6555567:0 {0} is the first ledger year in Swarmops. {1} is the currency code. + + crwdns6555594:0{0:N0}crwdne6555594:0 + The {0} is the number of inactive accounts. + + + crwdns6555595:0{0}crwdne6555595:0 + "Projected" as in "Budgeted". {0} is year. + + + crwdns6555596:0{0}crwdne6555596:0 + "Projected" as in "Budgeted". {0} is year. + diff --git a/Site5/App_GlobalResources/af-ZA/Pages.Security.af-ZA.resx b/Site5/App_GlobalResources/af-ZA/Pages.Security.af-ZA.resx index 38db8392..c86f441b 100644 --- a/Site5/App_GlobalResources/af-ZA/Pages.Security.af-ZA.resx +++ b/Site5/App_GlobalResources/af-ZA/Pages.Security.af-ZA.resx @@ -159,6 +159,21 @@ crwdns6555045:0crwdne6555045:0 + + crwdns6555597:0crwdne6555597:0 + + + crwdns6555598:0crwdne6555598:0 + + + crwdns6555599:0crwdne6555599:0 + + + crwdns6555600:0crwdne6555600:0 + + + crwdns6555601:0crwdne6555601:0 + crwdns6555046:0crwdne6555046:0 @@ -198,4 +213,46 @@ crwdns6555058:0crwdne6555058:0 + + crwdns6555602:0crwdne6555602:0 + + + crwdns6555603:0crwdne6555603:0 + + + crwdns6555604:0crwdne6555604:0 + + + crwdns6555605:0crwdne6555605:0 + + + crwdns6555606:0crwdne6555606:0 + + + crwdns6555607:0crwdne6555607:0 + + + crwdns6555608:0crwdne6555608:0 + + + crwdns6555609:0crwdne6555609:0 + + + crwdns6555610:0crwdne6555610:0 + + + crwdns6555611:0crwdne6555611:0 + + + crwdns6555612:0crwdne6555612:0 + + + crwdns6555613:0crwdne6555613:0 + + + crwdns6555614:0crwdne6555614:0 + + + crwdns6555615:0crwdne6555615:0 + diff --git a/Site5/App_GlobalResources/da-DK/Global.da-DK.resx b/Site5/App_GlobalResources/da-DK/Global.da-DK.resx index f96b6c55..92a72704 100644 --- a/Site5/App_GlobalResources/da-DK/Global.da-DK.resx +++ b/Site5/App_GlobalResources/da-DK/Global.da-DK.resx @@ -238,6 +238,7 @@ + diff --git a/Site5/App_GlobalResources/da-DK/Menu5.da-DK.resx b/Site5/App_GlobalResources/da-DK/Menu5.da-DK.resx index fb40a8e3..bd41b2b7 100644 --- a/Site5/App_GlobalResources/da-DK/Menu5.da-DK.resx +++ b/Site5/App_GlobalResources/da-DK/Menu5.da-DK.resx @@ -208,6 +208,7 @@ + diff --git a/Site5/App_GlobalResources/da-DK/Pages.Admin.da-DK.resx b/Site5/App_GlobalResources/da-DK/Pages.Admin.da-DK.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/da-DK/Pages.Admin.da-DK.resx +++ b/Site5/App_GlobalResources/da-DK/Pages.Admin.da-DK.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/da-DK/Pages.Ledgers.da-DK.resx b/Site5/App_GlobalResources/da-DK/Pages.Ledgers.da-DK.resx index 00ab7279..aa53215a 100644 --- a/Site5/App_GlobalResources/da-DK/Pages.Ledgers.da-DK.resx +++ b/Site5/App_GlobalResources/da-DK/Pages.Ledgers.da-DK.resx @@ -243,6 +243,9 @@ + + + diff --git a/Site5/App_GlobalResources/da-DK/Pages.Security.da-DK.resx b/Site5/App_GlobalResources/da-DK/Pages.Security.da-DK.resx index 54e8eb04..71d741ae 100644 --- a/Site5/App_GlobalResources/da-DK/Pages.Security.da-DK.resx +++ b/Site5/App_GlobalResources/da-DK/Pages.Security.da-DK.resx @@ -137,6 +137,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/de-DE/Global.de-DE.resx b/Site5/App_GlobalResources/de-DE/Global.de-DE.resx index 6cca6605..376b4bfe 100644 --- a/Site5/App_GlobalResources/de-DE/Global.de-DE.resx +++ b/Site5/App_GlobalResources/de-DE/Global.de-DE.resx @@ -250,6 +250,7 @@ + diff --git a/Site5/App_GlobalResources/de-DE/Menu5.de-DE.resx b/Site5/App_GlobalResources/de-DE/Menu5.de-DE.resx index 7f416937..376f8fc5 100644 --- a/Site5/App_GlobalResources/de-DE/Menu5.de-DE.resx +++ b/Site5/App_GlobalResources/de-DE/Menu5.de-DE.resx @@ -125,6 +125,7 @@ + Kommunikation diff --git a/Site5/App_GlobalResources/de-DE/Pages.Admin.de-DE.resx b/Site5/App_GlobalResources/de-DE/Pages.Admin.de-DE.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/de-DE/Pages.Admin.de-DE.resx +++ b/Site5/App_GlobalResources/de-DE/Pages.Admin.de-DE.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/de-DE/Pages.Ledgers.de-DE.resx b/Site5/App_GlobalResources/de-DE/Pages.Ledgers.de-DE.resx index 00ab7279..aa53215a 100644 --- a/Site5/App_GlobalResources/de-DE/Pages.Ledgers.de-DE.resx +++ b/Site5/App_GlobalResources/de-DE/Pages.Ledgers.de-DE.resx @@ -243,6 +243,9 @@ + + + diff --git a/Site5/App_GlobalResources/de-DE/Pages.Security.de-DE.resx b/Site5/App_GlobalResources/de-DE/Pages.Security.de-DE.resx index 54e8eb04..71d741ae 100644 --- a/Site5/App_GlobalResources/de-DE/Pages.Security.de-DE.resx +++ b/Site5/App_GlobalResources/de-DE/Pages.Security.de-DE.resx @@ -137,6 +137,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/es-ES/Global.es-ES.resx b/Site5/App_GlobalResources/es-ES/Global.es-ES.resx index f96b6c55..92a72704 100644 --- a/Site5/App_GlobalResources/es-ES/Global.es-ES.resx +++ b/Site5/App_GlobalResources/es-ES/Global.es-ES.resx @@ -238,6 +238,7 @@ + diff --git a/Site5/App_GlobalResources/es-ES/Menu5.es-ES.resx b/Site5/App_GlobalResources/es-ES/Menu5.es-ES.resx index fb40a8e3..bd41b2b7 100644 --- a/Site5/App_GlobalResources/es-ES/Menu5.es-ES.resx +++ b/Site5/App_GlobalResources/es-ES/Menu5.es-ES.resx @@ -208,6 +208,7 @@ + diff --git a/Site5/App_GlobalResources/es-ES/Pages.Admin.es-ES.resx b/Site5/App_GlobalResources/es-ES/Pages.Admin.es-ES.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/es-ES/Pages.Admin.es-ES.resx +++ b/Site5/App_GlobalResources/es-ES/Pages.Admin.es-ES.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/es-ES/Pages.Ledgers.es-ES.resx b/Site5/App_GlobalResources/es-ES/Pages.Ledgers.es-ES.resx index 00ab7279..aa53215a 100644 --- a/Site5/App_GlobalResources/es-ES/Pages.Ledgers.es-ES.resx +++ b/Site5/App_GlobalResources/es-ES/Pages.Ledgers.es-ES.resx @@ -243,6 +243,9 @@ + + + diff --git a/Site5/App_GlobalResources/es-ES/Pages.Security.es-ES.resx b/Site5/App_GlobalResources/es-ES/Pages.Security.es-ES.resx index 54e8eb04..71d741ae 100644 --- a/Site5/App_GlobalResources/es-ES/Pages.Security.es-ES.resx +++ b/Site5/App_GlobalResources/es-ES/Pages.Security.es-ES.resx @@ -137,6 +137,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/fi-FI/Global.fi-FI.resx b/Site5/App_GlobalResources/fi-FI/Global.fi-FI.resx index f96b6c55..92a72704 100644 --- a/Site5/App_GlobalResources/fi-FI/Global.fi-FI.resx +++ b/Site5/App_GlobalResources/fi-FI/Global.fi-FI.resx @@ -238,6 +238,7 @@ + diff --git a/Site5/App_GlobalResources/fi-FI/Menu5.fi-FI.resx b/Site5/App_GlobalResources/fi-FI/Menu5.fi-FI.resx index c95674bb..43a63a24 100644 --- a/Site5/App_GlobalResources/fi-FI/Menu5.fi-FI.resx +++ b/Site5/App_GlobalResources/fi-FI/Menu5.fi-FI.resx @@ -195,6 +195,7 @@ + diff --git a/Site5/App_GlobalResources/fi-FI/Pages.Admin.fi-FI.resx b/Site5/App_GlobalResources/fi-FI/Pages.Admin.fi-FI.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/fi-FI/Pages.Admin.fi-FI.resx +++ b/Site5/App_GlobalResources/fi-FI/Pages.Admin.fi-FI.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/fi-FI/Pages.Ledgers.fi-FI.resx b/Site5/App_GlobalResources/fi-FI/Pages.Ledgers.fi-FI.resx index 00ab7279..aa53215a 100644 --- a/Site5/App_GlobalResources/fi-FI/Pages.Ledgers.fi-FI.resx +++ b/Site5/App_GlobalResources/fi-FI/Pages.Ledgers.fi-FI.resx @@ -243,6 +243,9 @@ + + + diff --git a/Site5/App_GlobalResources/fi-FI/Pages.Security.fi-FI.resx b/Site5/App_GlobalResources/fi-FI/Pages.Security.fi-FI.resx index 54e8eb04..71d741ae 100644 --- a/Site5/App_GlobalResources/fi-FI/Pages.Security.fi-FI.resx +++ b/Site5/App_GlobalResources/fi-FI/Pages.Security.fi-FI.resx @@ -137,6 +137,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/fr-FR/Global.fr-FR.resx b/Site5/App_GlobalResources/fr-FR/Global.fr-FR.resx index f96b6c55..92a72704 100644 --- a/Site5/App_GlobalResources/fr-FR/Global.fr-FR.resx +++ b/Site5/App_GlobalResources/fr-FR/Global.fr-FR.resx @@ -238,6 +238,7 @@ + diff --git a/Site5/App_GlobalResources/fr-FR/Menu5.fr-FR.resx b/Site5/App_GlobalResources/fr-FR/Menu5.fr-FR.resx index b70b0077..6669fa0a 100644 --- a/Site5/App_GlobalResources/fr-FR/Menu5.fr-FR.resx +++ b/Site5/App_GlobalResources/fr-FR/Menu5.fr-FR.resx @@ -139,6 +139,7 @@ + diff --git a/Site5/App_GlobalResources/fr-FR/Pages.Admin.fr-FR.resx b/Site5/App_GlobalResources/fr-FR/Pages.Admin.fr-FR.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/fr-FR/Pages.Admin.fr-FR.resx +++ b/Site5/App_GlobalResources/fr-FR/Pages.Admin.fr-FR.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/fr-FR/Pages.Ledgers.fr-FR.resx b/Site5/App_GlobalResources/fr-FR/Pages.Ledgers.fr-FR.resx index 00ab7279..aa53215a 100644 --- a/Site5/App_GlobalResources/fr-FR/Pages.Ledgers.fr-FR.resx +++ b/Site5/App_GlobalResources/fr-FR/Pages.Ledgers.fr-FR.resx @@ -243,6 +243,9 @@ + + + diff --git a/Site5/App_GlobalResources/fr-FR/Pages.Security.fr-FR.resx b/Site5/App_GlobalResources/fr-FR/Pages.Security.fr-FR.resx index 54e8eb04..71d741ae 100644 --- a/Site5/App_GlobalResources/fr-FR/Pages.Security.fr-FR.resx +++ b/Site5/App_GlobalResources/fr-FR/Pages.Security.fr-FR.resx @@ -137,6 +137,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/hi-IN/Global.hi-IN.resx b/Site5/App_GlobalResources/hi-IN/Global.hi-IN.resx index f96b6c55..92a72704 100644 --- a/Site5/App_GlobalResources/hi-IN/Global.hi-IN.resx +++ b/Site5/App_GlobalResources/hi-IN/Global.hi-IN.resx @@ -238,6 +238,7 @@ + diff --git a/Site5/App_GlobalResources/hi-IN/Menu5.hi-IN.resx b/Site5/App_GlobalResources/hi-IN/Menu5.hi-IN.resx index fb40a8e3..bd41b2b7 100644 --- a/Site5/App_GlobalResources/hi-IN/Menu5.hi-IN.resx +++ b/Site5/App_GlobalResources/hi-IN/Menu5.hi-IN.resx @@ -208,6 +208,7 @@ + diff --git a/Site5/App_GlobalResources/hi-IN/Pages.Admin.hi-IN.resx b/Site5/App_GlobalResources/hi-IN/Pages.Admin.hi-IN.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/hi-IN/Pages.Admin.hi-IN.resx +++ b/Site5/App_GlobalResources/hi-IN/Pages.Admin.hi-IN.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/hi-IN/Pages.Ledgers.hi-IN.resx b/Site5/App_GlobalResources/hi-IN/Pages.Ledgers.hi-IN.resx index 00ab7279..aa53215a 100644 --- a/Site5/App_GlobalResources/hi-IN/Pages.Ledgers.hi-IN.resx +++ b/Site5/App_GlobalResources/hi-IN/Pages.Ledgers.hi-IN.resx @@ -243,6 +243,9 @@ + + + diff --git a/Site5/App_GlobalResources/hi-IN/Pages.Security.hi-IN.resx b/Site5/App_GlobalResources/hi-IN/Pages.Security.hi-IN.resx index 54e8eb04..71d741ae 100644 --- a/Site5/App_GlobalResources/hi-IN/Pages.Security.hi-IN.resx +++ b/Site5/App_GlobalResources/hi-IN/Pages.Security.hi-IN.resx @@ -137,6 +137,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/is-IS/Global.is-IS.resx b/Site5/App_GlobalResources/is-IS/Global.is-IS.resx index f96b6c55..92a72704 100644 --- a/Site5/App_GlobalResources/is-IS/Global.is-IS.resx +++ b/Site5/App_GlobalResources/is-IS/Global.is-IS.resx @@ -238,6 +238,7 @@ + diff --git a/Site5/App_GlobalResources/is-IS/Menu5.is-IS.resx b/Site5/App_GlobalResources/is-IS/Menu5.is-IS.resx index fb40a8e3..bd41b2b7 100644 --- a/Site5/App_GlobalResources/is-IS/Menu5.is-IS.resx +++ b/Site5/App_GlobalResources/is-IS/Menu5.is-IS.resx @@ -208,6 +208,7 @@ + diff --git a/Site5/App_GlobalResources/is-IS/Pages.Admin.is-IS.resx b/Site5/App_GlobalResources/is-IS/Pages.Admin.is-IS.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/is-IS/Pages.Admin.is-IS.resx +++ b/Site5/App_GlobalResources/is-IS/Pages.Admin.is-IS.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/is-IS/Pages.Ledgers.is-IS.resx b/Site5/App_GlobalResources/is-IS/Pages.Ledgers.is-IS.resx index 00ab7279..aa53215a 100644 --- a/Site5/App_GlobalResources/is-IS/Pages.Ledgers.is-IS.resx +++ b/Site5/App_GlobalResources/is-IS/Pages.Ledgers.is-IS.resx @@ -243,6 +243,9 @@ + + + diff --git a/Site5/App_GlobalResources/is-IS/Pages.Security.is-IS.resx b/Site5/App_GlobalResources/is-IS/Pages.Security.is-IS.resx index 54e8eb04..71d741ae 100644 --- a/Site5/App_GlobalResources/is-IS/Pages.Security.is-IS.resx +++ b/Site5/App_GlobalResources/is-IS/Pages.Security.is-IS.resx @@ -137,6 +137,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/it-IT/Global.it-IT.resx b/Site5/App_GlobalResources/it-IT/Global.it-IT.resx index f96b6c55..92a72704 100644 --- a/Site5/App_GlobalResources/it-IT/Global.it-IT.resx +++ b/Site5/App_GlobalResources/it-IT/Global.it-IT.resx @@ -238,6 +238,7 @@ + diff --git a/Site5/App_GlobalResources/it-IT/Menu5.it-IT.resx b/Site5/App_GlobalResources/it-IT/Menu5.it-IT.resx index fb40a8e3..bd41b2b7 100644 --- a/Site5/App_GlobalResources/it-IT/Menu5.it-IT.resx +++ b/Site5/App_GlobalResources/it-IT/Menu5.it-IT.resx @@ -208,6 +208,7 @@ + diff --git a/Site5/App_GlobalResources/it-IT/Pages.Admin.it-IT.resx b/Site5/App_GlobalResources/it-IT/Pages.Admin.it-IT.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/it-IT/Pages.Admin.it-IT.resx +++ b/Site5/App_GlobalResources/it-IT/Pages.Admin.it-IT.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/it-IT/Pages.Ledgers.it-IT.resx b/Site5/App_GlobalResources/it-IT/Pages.Ledgers.it-IT.resx index 00ab7279..aa53215a 100644 --- a/Site5/App_GlobalResources/it-IT/Pages.Ledgers.it-IT.resx +++ b/Site5/App_GlobalResources/it-IT/Pages.Ledgers.it-IT.resx @@ -243,6 +243,9 @@ + + + diff --git a/Site5/App_GlobalResources/it-IT/Pages.Security.it-IT.resx b/Site5/App_GlobalResources/it-IT/Pages.Security.it-IT.resx index 54e8eb04..71d741ae 100644 --- a/Site5/App_GlobalResources/it-IT/Pages.Security.it-IT.resx +++ b/Site5/App_GlobalResources/it-IT/Pages.Security.it-IT.resx @@ -137,6 +137,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/nb-NO/Global.nb-NO.resx b/Site5/App_GlobalResources/nb-NO/Global.nb-NO.resx index 3d2381ab..e60e7a02 100644 --- a/Site5/App_GlobalResources/nb-NO/Global.nb-NO.resx +++ b/Site5/App_GlobalResources/nb-NO/Global.nb-NO.resx @@ -339,6 +339,7 @@ + diff --git a/Site5/App_GlobalResources/nb-NO/Menu5.nb-NO.resx b/Site5/App_GlobalResources/nb-NO/Menu5.nb-NO.resx index 4b9d0368..9862786c 100644 --- a/Site5/App_GlobalResources/nb-NO/Menu5.nb-NO.resx +++ b/Site5/App_GlobalResources/nb-NO/Menu5.nb-NO.resx @@ -129,6 +129,7 @@ Geografitre + Kommunikasjon diff --git a/Site5/App_GlobalResources/nb-NO/Pages.Admin.nb-NO.resx b/Site5/App_GlobalResources/nb-NO/Pages.Admin.nb-NO.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/nb-NO/Pages.Admin.nb-NO.resx +++ b/Site5/App_GlobalResources/nb-NO/Pages.Admin.nb-NO.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/nb-NO/Pages.Ledgers.nb-NO.resx b/Site5/App_GlobalResources/nb-NO/Pages.Ledgers.nb-NO.resx index 5618a0ee..52eecdad 100644 --- a/Site5/App_GlobalResources/nb-NO/Pages.Ledgers.nb-NO.resx +++ b/Site5/App_GlobalResources/nb-NO/Pages.Ledgers.nb-NO.resx @@ -277,6 +277,9 @@ + + + diff --git a/Site5/App_GlobalResources/nb-NO/Pages.Security.nb-NO.resx b/Site5/App_GlobalResources/nb-NO/Pages.Security.nb-NO.resx index 385ebcfb..b3062f67 100644 --- a/Site5/App_GlobalResources/nb-NO/Pages.Security.nb-NO.resx +++ b/Site5/App_GlobalResources/nb-NO/Pages.Security.nb-NO.resx @@ -144,6 +144,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/nl-NL/Global.nl-NL.resx b/Site5/App_GlobalResources/nl-NL/Global.nl-NL.resx index 38c0d8c5..f5952aa5 100644 --- a/Site5/App_GlobalResources/nl-NL/Global.nl-NL.resx +++ b/Site5/App_GlobalResources/nl-NL/Global.nl-NL.resx @@ -394,6 +394,7 @@ + diff --git a/Site5/App_GlobalResources/nl-NL/Menu5.nl-NL.resx b/Site5/App_GlobalResources/nl-NL/Menu5.nl-NL.resx index 1dbe9e0b..4dec4f78 100644 --- a/Site5/App_GlobalResources/nl-NL/Menu5.nl-NL.resx +++ b/Site5/App_GlobalResources/nl-NL/Menu5.nl-NL.resx @@ -131,6 +131,7 @@ Organisatieclusters + Communicatie diff --git a/Site5/App_GlobalResources/nl-NL/Pages.Admin.nl-NL.resx b/Site5/App_GlobalResources/nl-NL/Pages.Admin.nl-NL.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/nl-NL/Pages.Admin.nl-NL.resx +++ b/Site5/App_GlobalResources/nl-NL/Pages.Admin.nl-NL.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/nl-NL/Pages.Ledgers.nl-NL.resx b/Site5/App_GlobalResources/nl-NL/Pages.Ledgers.nl-NL.resx index 232b40e7..360cb6cd 100644 --- a/Site5/App_GlobalResources/nl-NL/Pages.Ledgers.nl-NL.resx +++ b/Site5/App_GlobalResources/nl-NL/Pages.Ledgers.nl-NL.resx @@ -319,6 +319,9 @@ + + + diff --git a/Site5/App_GlobalResources/nl-NL/Pages.Security.nl-NL.resx b/Site5/App_GlobalResources/nl-NL/Pages.Security.nl-NL.resx index 7acf1512..a40efe11 100644 --- a/Site5/App_GlobalResources/nl-NL/Pages.Security.nl-NL.resx +++ b/Site5/App_GlobalResources/nl-NL/Pages.Security.nl-NL.resx @@ -144,6 +144,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/pl-PL/Global.pl-PL.resx b/Site5/App_GlobalResources/pl-PL/Global.pl-PL.resx index f96b6c55..92a72704 100644 --- a/Site5/App_GlobalResources/pl-PL/Global.pl-PL.resx +++ b/Site5/App_GlobalResources/pl-PL/Global.pl-PL.resx @@ -238,6 +238,7 @@ + diff --git a/Site5/App_GlobalResources/pl-PL/Menu5.pl-PL.resx b/Site5/App_GlobalResources/pl-PL/Menu5.pl-PL.resx index fb40a8e3..bd41b2b7 100644 --- a/Site5/App_GlobalResources/pl-PL/Menu5.pl-PL.resx +++ b/Site5/App_GlobalResources/pl-PL/Menu5.pl-PL.resx @@ -208,6 +208,7 @@ + diff --git a/Site5/App_GlobalResources/pl-PL/Pages.Admin.pl-PL.resx b/Site5/App_GlobalResources/pl-PL/Pages.Admin.pl-PL.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/pl-PL/Pages.Admin.pl-PL.resx +++ b/Site5/App_GlobalResources/pl-PL/Pages.Admin.pl-PL.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/pl-PL/Pages.Ledgers.pl-PL.resx b/Site5/App_GlobalResources/pl-PL/Pages.Ledgers.pl-PL.resx index 00ab7279..aa53215a 100644 --- a/Site5/App_GlobalResources/pl-PL/Pages.Ledgers.pl-PL.resx +++ b/Site5/App_GlobalResources/pl-PL/Pages.Ledgers.pl-PL.resx @@ -243,6 +243,9 @@ + + + diff --git a/Site5/App_GlobalResources/pl-PL/Pages.Security.pl-PL.resx b/Site5/App_GlobalResources/pl-PL/Pages.Security.pl-PL.resx index 54e8eb04..71d741ae 100644 --- a/Site5/App_GlobalResources/pl-PL/Pages.Security.pl-PL.resx +++ b/Site5/App_GlobalResources/pl-PL/Pages.Security.pl-PL.resx @@ -137,6 +137,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/pt-BR/Global.pt-BR.resx b/Site5/App_GlobalResources/pt-BR/Global.pt-BR.resx index f96b6c55..92a72704 100644 --- a/Site5/App_GlobalResources/pt-BR/Global.pt-BR.resx +++ b/Site5/App_GlobalResources/pt-BR/Global.pt-BR.resx @@ -238,6 +238,7 @@ + diff --git a/Site5/App_GlobalResources/pt-BR/Menu5.pt-BR.resx b/Site5/App_GlobalResources/pt-BR/Menu5.pt-BR.resx index fb40a8e3..bd41b2b7 100644 --- a/Site5/App_GlobalResources/pt-BR/Menu5.pt-BR.resx +++ b/Site5/App_GlobalResources/pt-BR/Menu5.pt-BR.resx @@ -208,6 +208,7 @@ + diff --git a/Site5/App_GlobalResources/pt-BR/Pages.Admin.pt-BR.resx b/Site5/App_GlobalResources/pt-BR/Pages.Admin.pt-BR.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/pt-BR/Pages.Admin.pt-BR.resx +++ b/Site5/App_GlobalResources/pt-BR/Pages.Admin.pt-BR.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/pt-BR/Pages.Ledgers.pt-BR.resx b/Site5/App_GlobalResources/pt-BR/Pages.Ledgers.pt-BR.resx index 00ab7279..aa53215a 100644 --- a/Site5/App_GlobalResources/pt-BR/Pages.Ledgers.pt-BR.resx +++ b/Site5/App_GlobalResources/pt-BR/Pages.Ledgers.pt-BR.resx @@ -243,6 +243,9 @@ + + + diff --git a/Site5/App_GlobalResources/pt-BR/Pages.Security.pt-BR.resx b/Site5/App_GlobalResources/pt-BR/Pages.Security.pt-BR.resx index 54e8eb04..71d741ae 100644 --- a/Site5/App_GlobalResources/pt-BR/Pages.Security.pt-BR.resx +++ b/Site5/App_GlobalResources/pt-BR/Pages.Security.pt-BR.resx @@ -137,6 +137,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/ru-RU/GeographyNames.ru-RU.resx b/Site5/App_GlobalResources/ru-RU/GeographyNames.ru-RU.resx index 74b4465f..e7d1bb4d 100644 --- a/Site5/App_GlobalResources/ru-RU/GeographyNames.ru-RU.resx +++ b/Site5/App_GlobalResources/ru-RU/GeographyNames.ru-RU.resx @@ -117,32 +117,88 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Центральная Европа + + + Дания + + + Финляндия + + + Гана + + + Нидерланды + + + Норвегия + + + Швеция + + + Восточная Европа + + + Европа + + + Карликовые государства + Like Monaco, San Marino, Andorra, Vatican City, etc. + + + Скандинавские страны + (Finland Denmark Norway Sweden Iceland) + + + Северная Европа + + + Южная Европа + + + Центральный Северо-Восток + + + Центральный Юго-Восток + + + Средняя-Атлантика + + + Средний Запад + + + Горы + + + Новая Англия + + + Северо-Восток + + + Тихий океан + + + Юг + + + Южная Атлантика + + + Запад + + + Центральный Северо-Запад + + + Центральный Юго-Запад + + + Западная Европа + diff --git a/Site5/App_GlobalResources/ru-RU/Global.ru-RU.resx b/Site5/App_GlobalResources/ru-RU/Global.ru-RU.resx index 7963be1c..c0d8f040 100644 --- a/Site5/App_GlobalResources/ru-RU/Global.ru-RU.resx +++ b/Site5/App_GlobalResources/ru-RU/Global.ru-RU.resx @@ -244,7 +244,10 @@ Загрузить файл Displayed on "Submit" button next to file upload controls. - + + Загрузить файл в Swarmops + Used as header above upload sections. + Пожалуйста, выберите файл для загрузки. Error message. Displayed when the used has clicked "Upload" without selecting a file to upload. @@ -306,6 +309,10 @@ Сегодня + + Проект + Tagging costs/income to projects + @@ -315,57 +322,174 @@ + + Срок сдачи + For invoices and similar + + + Поставщик + + + Английский (США) + Replace with THIS language, EXPRESSED IN this language. Examples: "Español", "Français", "Svenska", etc. + + + Нет + For yes/no options + + + Да + For yes/no options + + + Активы + + + Расходы + + + + + -- Выберите -- + Shown in dropdowns when selection required + + + - отсутствует - + When a record or similar is missing. Used in grids. + + + - несколько - + When there are multiple candidates for something. Synonym: "several". Used in grids. + + + Выкл + Off (as opposed to On) + + + Вкл + On (as opposed to Off) + + + Коммерческая + A commercial organization (for-profit enterprise) + + + Государственная + Organization that's part of government somehow + + + Некоммерческая + Non-profit (activist, political parties) + + + Географическое местоположение + As in "location" - on any scale and anywhere from "World" to a named city + + + Действие + Header over a column of possible actions (signified by icons) in a datagrid. + + + Электронная почта + Somebody's email address. + + + Название + A plain person's first and last name + + + Примечания + Small notes in a grid, maybe in icon form + + + Телефон + Somebody's telephone number. Mobile assumed. + + + Пользовательское + As in "show me the advanced options" + + + Создать + Like "Create Organization" + + + Все + + + Описание + As a general header of any description field + + + 1 Квартал + First quarter of the year + + + 2 Квартал + Second quarter of the year + + + 3 Квартал + Third quarter of the year + + + 4 Квартал + Fourth quarter of the year + + + + Баланс + As in 'account balance', not as in staying upright + + + + + Организация + + + Помощь + + + Жен. + Legal gender + + + Муж. + Legal gender + + + + ММ/ДД/ГГГГ + Adapt format for culture, then translate to human-readability, not machine-readability. E.g. ÅÅÅÅ-MM-DD for Swedish. + + + МММ д, ГГГГ + Convert the formatting only - this is machine interpreted. Example: "December 23, 1921". + + + пятилетка + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Адрес + As in physical location + + + Город + + + Страна + As in the nation-state geographic boundary, not as in the music style + + + Дата рождения + Population data record entry, rather than celebration day ("birthday") + + + Почтовый индекс + diff --git a/Site5/App_GlobalResources/ru-RU/Menu5.ru-RU.resx b/Site5/App_GlobalResources/ru-RU/Menu5.ru-RU.resx index 9452e60e..b1fad2b8 100644 --- a/Site5/App_GlobalResources/ru-RU/Menu5.ru-RU.resx +++ b/Site5/App_GlobalResources/ru-RU/Menu5.ru-RU.resx @@ -123,7 +123,12 @@ Списки управления доступом - + + Создать Новую Организацию + + + Редактировать Организацию + @@ -144,7 +149,9 @@ - + + Массовая Рассылка Сообщений + @@ -222,7 +229,9 @@ - + + Выгрузка банковских файлов + Организация @@ -238,7 +247,9 @@ Пресс-релизы - + + Лента новостей + Статистика Участника @@ -256,7 +267,9 @@ Добавить участников - + + Список/Поиск Людей + Список участников @@ -272,7 +285,9 @@ Новая Конференция - + + Роли и Обязанности + diff --git a/Site5/App_GlobalResources/ru-RU/Pages.Admin.ru-RU.resx b/Site5/App_GlobalResources/ru-RU/Pages.Admin.ru-RU.resx index b98247a4..7da123a3 100644 --- a/Site5/App_GlobalResources/ru-RU/Pages.Admin.ru-RU.resx +++ b/Site5/App_GlobalResources/ru-RU/Pages.Admin.ru-RU.resx @@ -120,7 +120,26 @@ + + Создать новую организацию как... + + + Используемая денежная единица + + + Название новой организации + + + Создать Новую Организацию + + + + + + + Редактировать Организацию + diff --git a/Site5/App_GlobalResources/ru-RU/Pages.Comms.ru-RU.resx b/Site5/App_GlobalResources/ru-RU/Pages.Comms.ru-RU.resx index e56ca6ea..a2d686ae 100644 --- a/Site5/App_GlobalResources/ru-RU/Pages.Comms.ru-RU.resx +++ b/Site5/App_GlobalResources/ru-RU/Pages.Comms.ru-RU.resx @@ -117,15 +117,40 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - + + Вы находитесь в + + + Ваше Сообщение + + + Отправьте сообщение группе людей в организации. Вы можете отправить сообщение по электронной почте (подойдет для ленты новостей и основной информации) или по СМС (что довольно дорого и навязчиво). + + + Это сообщение будет отправлено получателям. В настоящее время это макет интерфейса. + + + Нет Получателей|1 Получатель|{0:N0} Получатель(я)(ей) + Vertical bar divides none|one|many + + + Отправить всем массовое сообщение + + + ОТПР + Keep SHORT - it's a small button. 6-7 letters max + + + Ваше сообщение в данный момент рассылается получателям. Когда рассылка закончится, Вы будете оповещены. + + + Тест + Keep SHORT- it's a small button. 6-7 letters max + + + Просмотрите сообщение перед отправкой. + + + Массовая Рассылка Сообщений + diff --git a/Site5/App_GlobalResources/ru-RU/Pages.Ledgers.ru-RU.resx b/Site5/App_GlobalResources/ru-RU/Pages.Ledgers.ru-RU.resx index 7116558a..f8d32eca 100644 --- a/Site5/App_GlobalResources/ru-RU/Pages.Ledgers.ru-RU.resx +++ b/Site5/App_GlobalResources/ru-RU/Pages.Ledgers.ru-RU.resx @@ -280,6 +280,9 @@ + + + diff --git a/Site5/App_GlobalResources/ru-RU/Pages.Security.ru-RU.resx b/Site5/App_GlobalResources/ru-RU/Pages.Security.ru-RU.resx index 869597c5..29b36ccf 100644 --- a/Site5/App_GlobalResources/ru-RU/Pages.Security.ru-RU.resx +++ b/Site5/App_GlobalResources/ru-RU/Pages.Security.ru-RU.resx @@ -144,6 +144,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/App_GlobalResources/sv-SE/GeographyNames.sv-SE.resx b/Site5/App_GlobalResources/sv-SE/GeographyNames.sv-SE.resx index eeec83ba..f127097a 100644 --- a/Site5/App_GlobalResources/sv-SE/GeographyNames.sv-SE.resx +++ b/Site5/App_GlobalResources/sv-SE/GeographyNames.sv-SE.resx @@ -189,7 +189,7 @@ Västeuropa - Världen + Globalt Root geography diff --git a/Site5/App_GlobalResources/sv-SE/Global.sv-SE.resx b/Site5/App_GlobalResources/sv-SE/Global.sv-SE.resx index 9f81aadc..6b89881f 100644 --- a/Site5/App_GlobalResources/sv-SE/Global.sv-SE.resx +++ b/Site5/App_GlobalResources/sv-SE/Global.sv-SE.resx @@ -546,4 +546,7 @@ Postnummer + + Ett allmänt och odefinierat fel uppstod när Swarmopsservern kontaktades. Fungerar fortfarande nätverket, och är servern fortfarande tillgänglig? + diff --git a/Site5/App_GlobalResources/sv-SE/Menu5.sv-SE.resx b/Site5/App_GlobalResources/sv-SE/Menu5.sv-SE.resx index 9d75410a..8b2b380a 100644 --- a/Site5/App_GlobalResources/sv-SE/Menu5.sv-SE.resx +++ b/Site5/App_GlobalResources/sv-SE/Menu5.sv-SE.resx @@ -135,6 +135,9 @@ Organisationskluster + + Systeminställningar + Kommunikation diff --git a/Site5/App_GlobalResources/sv-SE/Pages.Admin.sv-SE.resx b/Site5/App_GlobalResources/sv-SE/Pages.Admin.sv-SE.resx index a1d2129b..e3f9d6d2 100644 --- a/Site5/App_GlobalResources/sv-SE/Pages.Admin.sv-SE.resx +++ b/Site5/App_GlobalResources/sv-SE/Pages.Admin.sv-SE.resx @@ -192,4 +192,31 @@ Förnyelse kostar (i {0}) The {0} is the operating currency (USD etc). + + SMTP-porten måste vara ett nummer. Det gick inte att förstå hostnamn:port. + + + Det gick inte att parsa användare, pass, hostnamn eller port. (Endast hostnamn krävs.) + + + Externt åtkomlig URL + + + Olika tekniska inställningar för den här Swarmopsinstallationen. Inte specifika för någon organisation eller person, utan systemtäckande. + + + Installationsnamn + + + Systeminställningar + + + SMTP-server (user:pass@host:port) + + + Swarmops har skickat ett testmail för att kontrollera dina nya SMTP-serverinställningar. + + + Du borde verkligen, VERKLIGEN använda HTTPS för en sådan här webbsite. Men det visste du väl redan? + diff --git a/Site5/App_GlobalResources/sv-SE/Pages.Ledgers.sv-SE.resx b/Site5/App_GlobalResources/sv-SE/Pages.Ledgers.sv-SE.resx index fd4b408b..95061e10 100644 --- a/Site5/App_GlobalResources/sv-SE/Pages.Ledgers.sv-SE.resx +++ b/Site5/App_GlobalResources/sv-SE/Pages.Ledgers.sv-SE.resx @@ -134,7 +134,7 @@ Balansräkning för {0}, - {0} is the organization name. The year follows immediately. + {0} is the organization name. The year follows immediately, so keep ending comma. Just nu @@ -550,4 +550,16 @@ Ingångssaldo (in i året {0}), {1} {0} is the first ledger year in Swarmops. {1} is the currency code. + + Visa inaktiva konton (<span id="SpanInactiveCount">{0:N0}</span>) + The {0} is the number of inactive accounts. + + + Budgeterad förlust {0} + "Projected" as in "Budgeted". {0} is year. + + + Budgeterad vinst {0} + "Projected" as in "Budgeted". {0} is year. + diff --git a/Site5/App_GlobalResources/sv-SE/Pages.Security.sv-SE.resx b/Site5/App_GlobalResources/sv-SE/Pages.Security.sv-SE.resx index 4350e938..8ec75fe1 100644 --- a/Site5/App_GlobalResources/sv-SE/Pages.Security.sv-SE.resx +++ b/Site5/App_GlobalResources/sv-SE/Pages.Security.sv-SE.resx @@ -138,7 +138,9 @@ Ny organisation - + + Du deltar inte i några andra organisationer på denna Swarmops-installation, så du inte kan byta till något annat. Därför går vi tillbaka till Översikten istället. + Byt organisation @@ -157,10 +159,23 @@ <p>En omedelbart förestående databasuppgradering hindrar din tillgång till denna sida. <strong>Detta är ett tillfälligt fel</strong> och Swarmops servrar borde redan arbeta på uppgraderingen ifråga.</p> <p>Försök ladda om sidan om några minuter. Om det här felet kvarstår i mer än femton minuter, så kontakta din systemadministratör.</p> + + Kontot <strong>har inte låsts</strong> utan är fortfarande öppet för användning. Det finns inget sådant konto, låskoden var felaktig, eller låskoden var för gammal. Om du fortfarande vill låsa detta konto, kontakta administratörerna för denna Swarmopsinstallation. + + + + + Kontot <strong>är nu låst</strong> och nu avslutas alla aktiva sessioner. + + + Låsningskod + <strong>Tvåfaktorslogin med BitId är nu påslaget.</strong><br/><br/>Från och med nu kan du använda din bitcoinplånbok för att logga in (och <strong>behöver</strong> göra det). Tack för att du ökar säkerheten.<br/><br/>Kom ihåg att lösenordsskydda din telefon också om du inte redan gjort det. - + + 2FA + Ange din kod från Google Authenticator. @@ -173,7 +188,9 @@ Logga in till Swarmops med en bitcoinplånbok som stöder BitID. Du behöver inte ha några pengar i den. Om du inte har en BitID-kapabel bitcoinplånbok, så kan du logga in manuellt med ett klassiskt användarnamn och lösenord. (Ditt användarnamn är ditt namn eller e-post.) - + + Loggar in, vänta... + Manuell inloggning @@ -192,4 +209,46 @@ Namn + + Ange din mailadress igen + + + Det finns ingen giltig lösenordsåterställningskod för denna mailadress, adressen finns inte, återställningskoden är ogiltig, eller så har den har gått ut.<br/><br/><strong>Det gick inte att återställa lösenordet.</strong> + + + Du sätter ett nytt lösenord för ett användarkonto. Ange det nya lösenordet två gånger för att lagra det och logga in. (Om du försöker påbörja processen med återställning av lösenord, så behöver du en återställningskod först. <a href="/Security/RequestPasswordReset">Skapa en återställningskod.</a>) + + + Ange din mailadress för att skicka instruktioner till den adressen om hur du går vidare med återställning av lösenord. Den kommer att innehålla en unik återställningskod som du behöver för att gå vidare. + + + De två lösenorden matchar inte. Försök igen. + + + Det nya lösenordet får inte vara tomt. + + + Återställ lösenord + + + Nytt lösenord + + + Upprepa nytt lösenord + + + Du kan återställa lösenordet som är kopplat till en viss mailadress. En länk med en återställningskod kommer att skickas till den adressen, som du sedan måste följa för att återställa ditt lösenord. + + + Återställ + + + Ditt lösenord har ändrats och du har loggats in på Swarmops med ditt nya lösenord. + + + Återställningskod + + + Om mailadressen var kopplad till ett konto på denna Swarmopsinstallation, så <strong>har en återställningskod skickats dit.</strong> Öppna det mailet och klicka på länken för att återställa ditt lösenord. (Om mailadressen inte fanns, så skickades ingenting.)<br/><br/>Du kan stänga detta browserfönster. Det behövs inte längre. + diff --git a/Site5/App_GlobalResources/zh-CN/Global.zh-CN.resx b/Site5/App_GlobalResources/zh-CN/Global.zh-CN.resx index f96b6c55..92a72704 100644 --- a/Site5/App_GlobalResources/zh-CN/Global.zh-CN.resx +++ b/Site5/App_GlobalResources/zh-CN/Global.zh-CN.resx @@ -238,6 +238,7 @@ + diff --git a/Site5/App_GlobalResources/zh-CN/Menu5.zh-CN.resx b/Site5/App_GlobalResources/zh-CN/Menu5.zh-CN.resx index fb40a8e3..bd41b2b7 100644 --- a/Site5/App_GlobalResources/zh-CN/Menu5.zh-CN.resx +++ b/Site5/App_GlobalResources/zh-CN/Menu5.zh-CN.resx @@ -208,6 +208,7 @@ + diff --git a/Site5/App_GlobalResources/zh-CN/Pages.Admin.zh-CN.resx b/Site5/App_GlobalResources/zh-CN/Pages.Admin.zh-CN.resx index b98247a4..6485fe5b 100644 --- a/Site5/App_GlobalResources/zh-CN/Pages.Admin.zh-CN.resx +++ b/Site5/App_GlobalResources/zh-CN/Pages.Admin.zh-CN.resx @@ -129,6 +129,15 @@ + + + + + + + + + diff --git a/Site5/App_GlobalResources/zh-CN/Pages.Ledgers.zh-CN.resx b/Site5/App_GlobalResources/zh-CN/Pages.Ledgers.zh-CN.resx index 00ab7279..aa53215a 100644 --- a/Site5/App_GlobalResources/zh-CN/Pages.Ledgers.zh-CN.resx +++ b/Site5/App_GlobalResources/zh-CN/Pages.Ledgers.zh-CN.resx @@ -243,6 +243,9 @@ + + + diff --git a/Site5/App_GlobalResources/zh-CN/Pages.Security.zh-CN.resx b/Site5/App_GlobalResources/zh-CN/Pages.Security.zh-CN.resx index 54e8eb04..71d741ae 100644 --- a/Site5/App_GlobalResources/zh-CN/Pages.Security.zh-CN.resx +++ b/Site5/App_GlobalResources/zh-CN/Pages.Security.zh-CN.resx @@ -137,6 +137,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Site5/Default.aspx b/Site5/Default.aspx index a429ee15..c9173d57 100644 --- a/Site5/Default.aspx +++ b/Site5/Default.aspx @@ -9,7 +9,7 @@

What you see here is the new interface being rewritten on top of the already-running engine. It runs on Debian/Ubuntu servers for frontend and backend.

This notice will be replaced with a proper Dashboard when all the basic functions are in place. You can see functions appear as they are implemented in the menu.

A rough roadmap says that basic financials are implemented first, then member registry functions, then communications, then responsibilities, then governance. For more on the specific roadmap, go to the SCRUM planning for Swarmops.

-

Look at the Swarmops code on Github (and feel free to contribute)! Current line count: 102,576.

+

Look at the Swarmops code on Github (and feel free to contribute)! Current line count: 103,994.

Use this form to report bugs for these early builds.

diff --git a/Site5/SprintName.txt b/Site5/SprintName.txt index bb5f7a1f..794feb2a 100644 --- a/Site5/SprintName.txt +++ b/Site5/SprintName.txt @@ -1 +1 @@ -Red-0 +Red-1