Commit 1a2b5b3f authored by Script Kiddy's avatar Script Kiddy
Browse files

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent bd773449
Pipeline #57954 skipped
......@@ -658,8 +658,6 @@ is-expired=true
is-revoked=false
id=not-de-vs-expired-filter
Name=Not VS-NfD Compliant (Expired)
Name[de]=Nicht VS-NfD-konform (Abgelaufen)
Name[x-test]=xxNot VS-NfD Compliant (Expired)xx
background-color=250,233,235
[Key Filter #13]
......@@ -668,6 +666,4 @@ is-de-vs=false
is-revoked=true
id=not-de-vs-revoked-filter
Name=Not VS-NfD Compliant (Revoked)
Name[de]=Nicht VS-NfD-konform (Widerrufen)
Name[x-test]=xxNot VS-NfD Compliant (Revoked)xx
background-color=250,233,235
......@@ -782,8 +782,6 @@ is-expired=true
is-revoked=false
id=not-de-vs-expired-filter
Name=Not VS-NfD Compliant (Expired)
Name[de]=Nicht VS-NfD-konform (Abgelaufen)
Name[x-test]=xxNot VS-NfD Compliant (Expired)xx
background-color=250,233,235
[Key Filter #13]
......@@ -792,6 +790,4 @@ is-de-vs=false
is-revoked=true
id=not-de-vs-revoked-filter
Name=Not VS-NfD Compliant (Revoked)
Name[de]=Nicht VS-NfD-konform (Widerrufen)
Name[x-test]=xxNot VS-NfD Compliant (Revoked)xx
background-color=250,233,235
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment