mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-03 15:55:46 +00:00
Code Issues Releases Wiki Activity

Merge Fix hotkey conflict in utils de.po and id.po

Browse Source 
This is needed to catch conflicts between uppercase and lowercase hotkeys of the same letter, as seen with `(B)enannt` and `A(b)lehnen` in the german utils translations.

Also fix conflicting hotkeys in utils de.po, id.po and sv.po.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/675
Acked-by: John Johansen <john.johansen@canonical.com>
(cherry picked from commit e57174589c)
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2020-11-01 09:25:18 +00:00
committed by John Johansen
parent cd464446b6
commit c4150a1659
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/po/de.po
View File

@@ -1079,11 +1079,11 @@ msgstr "(C)hild sauber ausführen"
#: ../apparmor/ui.py:239 #: ../apparmor/ui.py:239
msgid "(N)amed" msgid "(N)amed"
msgstr "(B)enannt" msgstr "Be(n)annt"
#: ../apparmor/ui.py:240 #: ../apparmor/ui.py:240
msgid "(N)amed Clean Exec" msgid "(N)amed Clean Exec"
msgstr "(B)enannte sauber ausführen" msgstr "Be(n)annte sauber ausführen"
#: ../apparmor/ui.py:241 #: ../apparmor/ui.py:241
msgid "(U)nconfined" msgid "(U)nconfined"
@@ -1111,11 +1111,11 @@ msgstr "(C)hild vererbt saubere Ausführung"
#: ../apparmor/ui.py:247 #: ../apparmor/ui.py:247
msgid "(N)amed Inherit" msgid "(N)amed Inherit"
msgstr "(B)enannte Vererbung" msgstr "Be(n)annte Vererbung"
#: ../apparmor/ui.py:248 #: ../apparmor/ui.py:248
msgid "(N)amed Inherit Clean Exec" msgid "(N)amed Inherit Clean Exec"
msgstr "(B)enannte Vererbung sauber ausführen" msgstr "Be(n)annte Vererbung sauber ausführen"
#: ../apparmor/ui.py:249 #: ../apparmor/ui.py:249
msgid "(X) ix On" msgid "(X) ix On"

8
utils/po/id.po
View File

@@ -1147,11 +1147,11 @@ msgstr "(B)aru"
#: ../apparmor/ui.py:254 #: ../apparmor/ui.py:254
msgid "(G)lob" msgid "(G)lob"
msgstr "(G)umpal" msgstr "G(u)mpal"
#: ../apparmor/ui.py:255 #: ../apparmor/ui.py:255
msgid "Glob with (E)xtension" msgid "Glob with (E)xtension"
msgstr "Gumpal dengan (E)kstensi" msgstr "Gumpal dengan E(k)stensi"
#: ../apparmor/ui.py:256 #: ../apparmor/ui.py:256
msgid "(A)dd Requested Hat" msgid "(A)dd Requested Hat"
@@ -1159,7 +1159,7 @@ msgstr "(T)ambahkan Topi yang Diminta"
#: ../apparmor/ui.py:257 #: ../apparmor/ui.py:257
msgid "(U)se Default Hat" msgid "(U)se Default Hat"
msgstr "(G)unakan Topi Default" msgstr "Gunakan Topi (D)efault"
#: ../apparmor/ui.py:258 #: ../apparmor/ui.py:258
msgid "(S)can system log for AppArmor events" msgid "(S)can system log for AppArmor events"
@@ -1175,7 +1175,7 @@ msgstr "(L)ihat Profil"
#: ../apparmor/ui.py:261 #: ../apparmor/ui.py:261
msgid "(U)se Profile" msgid "(U)se Profile"
msgstr "(G)unakan Profil" msgstr "Gunakan (P)rofil"
#: ../apparmor/ui.py:262 #: ../apparmor/ui.py:262
msgid "(C)reate New Profile" msgid "(C)reate New Profile"

2
utils/po/sv.po
View File

@@ -1004,7 +1004,7 @@ msgstr ""
#: ../apparmor/ui.py:223 #: ../apparmor/ui.py:223
msgid "(A)llow" msgid "(A)llow"
msgstr "(T)illåt" msgstr "Ti(l)låt"
#: ../apparmor/ui.py:224 #: ../apparmor/ui.py:224
msgid "(M)ore" msgid "(M)ore"

2
utils/test/test-translations.py
View File

@@ -61,7 +61,7 @@ class TestHotkeyConflicts(AATest):
keys = dict() keys = dict()
for key in params: for key in params:
text = t.gettext(CMDS[key]) text = t.gettext(CMDS[key])
hotkey = get_translated_hotkey(text) hotkey = get_translated_hotkey(text).lower()
if keys.get(hotkey): if keys.get(hotkey):
raise Exception("Hotkey conflict: '%s' and '%s' in language %s" % (keys[hotkey], text, language)) raise Exception("Hotkey conflict: '%s' and '%s' in language %s" % (keys[hotkey], text, language))