Commit ec24d08f 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 e0bee718
Pipeline #81344 skipped
......@@ -82,7 +82,7 @@ Name[uz@cyrillic]=Ҳисоблар
Name[vi]=Danh khoản
Name[wa]=Contes
Name[x-test]=xxAccountsxx
Name[zh_CN]=
Name[zh_CN]=
Name[zh_HK]=帳號
Name[zh_TW]=帳號
Comment=Manage Your Accounts and Identities
......
......@@ -149,7 +149,7 @@ Comment[tr]=Diğer dillerden ana dilinize çevrilen mesajlar
Comment[uk]=Перекладає повідомлення з вашої рідної мови на якусь іншу мову
Comment[vi]=Dịch các tin nhắn từ ngôn ngữ mẹ đẻ sang ngôn ngữ khác
Comment[x-test]=xxTranslates messages from your native language to another languagexx
Comment[zh_CN]=将消息从您的母语翻译成其语言
Comment[zh_CN]=将消息从您的母语翻译成其语言
Comment[zh_HK]=將您母語的訊息翻譯為另一種語言
Comment[zh_TW]=將訊息從您的母語翻成其他語言
......
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