mirror of
https://invent.kde.org/plasma/plasma-desktop.git
synced 2026-11-03 22:59:45 -09:00
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"
This commit is contained in:
parent
b90b0015f4
commit
a6e32b4c5f
2 changed files with 2 additions and 2 deletions
|
|
@ -128,7 +128,7 @@
|
|||
"Name[fi]": "Oletuspaneeli",
|
||||
"Name[fr]": "Tableau de bord par défaut",
|
||||
"Name[gl]": "Panel predeterminado",
|
||||
"Name[he]": "לוחות ברירת־מחדל",
|
||||
"Name[he]": "לוחות ברירת מחדל",
|
||||
"Name[hu]": "Alapértelmezett panel",
|
||||
"Name[ia]": "Pannello predefinite",
|
||||
"Name[id]": "Panel Bawaan",
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@
|
|||
"Name[fi]": "Paneelin työkalupakki",
|
||||
"Name[fr]": "Boîte à outils de tableau de bord",
|
||||
"Name[gl]": "Caixa de ferramentas de panel",
|
||||
"Name[he]": "ארגז־הכלים של הלוח",
|
||||
"Name[he]": "ארגז הכלים של הלוח",
|
||||
"Name[hu]": "Panel eszköztár",
|
||||
"Name[ia]": "Instrumentario de pannello",
|
||||
"Name[id]": "Perkakas Panel",
|
||||
|
|
|
|||
Loading…
Reference in a new issue