Commit a41c0f82 authored by Script Kiddy's avatar Script Kiddy

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 25a03e7c
Pipeline #24283 skipped
......@@ -26,6 +26,7 @@ Name[sl]=Keysmith
Name[sv]=Keysmith
Name[tg]=Keysmith
Name[uk]=Keysmith
Name[x-test]=xxKeysmithxx
Name[zh_TW]=Keysmith
Comment=Manage your OTP tokens for two factor authentication (2fa)
Comment[ca]=Gestiona els vostres símbols OTP per a una autenticació de dos factors (2fa)
......@@ -45,6 +46,7 @@ Comment[sl]=Upravljajte vaših enkratnih gesel žetonov za dvo-faktorsko overjan
Comment[sv]=Hantera OTP-symboler för tvåfaktorsbehörighetskontroll (2fa)
Comment[tg]=Нишонҳои OTP-и худро барои санҷиши ҳаққонияти дуомила идора намоед (2fa)
Comment[uk]=Керування вашими ключами OTP для двофакторного розпізнавання (2fa)
Comment[x-test]=xxManage your OTP tokens for two factor authentication (2fa)xx
Comment[zh_TW]=管理兩步驟驗證 (2FA) 的 OTP 憑證
Version=1.0
Exec=keysmith
......
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