.woodpecker/.continuous-deployment.yml

@@ -13,8 +13,6 @@ pipeline:
       - git checkout $CI_COMMIT_BRANCH
     when:
       repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
   clone_friendica_addon:
     image: alpine/git
     commands:
@@ -27,8 +25,6 @@ pipeline:
       - git merge $CI_COMMIT_SHA
     when:
       repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
   restore_cache:
     image: meltwater/drone-cache:dev
     settings:
@@ -42,8 +38,6 @@ pipeline:
       - /tmp/drone-cache:/tmp/cache
     when:
       repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
   composer_install:
     image: friendicaci/php7.4:php7.4.18
     commands:
@@ -54,8 +48,6 @@ pipeline:
       - /etc/hosts:/etc/hosts
     when:
       repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
   create_artifacts:
     image: debian
     commands:
@@ -82,8 +74,6 @@ pipeline:
       - sha256sum "$ARTIFACT"
     when:
       repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
   sign_artifacts:
     image: plugins/gpgsign
     settings:
@@ -98,8 +88,6 @@ pipeline:
       detach_sign: true
     when:
       repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
   publish_artifacts:
     image: alpine
     commands:
@@ -108,5 +96,3 @@ pipeline:
       - files:/tmp/friendica_files
     when:
       repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push

diaspora/diaspora.php

@@ -94,7 +94,7 @@ function diaspora_settings(App $a, array &$data)
 	$html = Renderer::replaceMacros($t, [
 		'$l10n' => [
 			'info_header'  => DI::l10n()->t('Information'),
-			'error_header' => DI::l10n()->t('Error'),
+			'error_header' => DI::l10n()->tt('Error', 'Errors', 1),
 		],
 
 		'$info'  => $info,