mirror of
https://github.com/KDE/konsole.git
synced 2025-12-23 15:28:03 -05: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:
@@ -33,6 +33,7 @@
|
||||
"Description[pl]": "Dostęp do wiersza poleceń",
|
||||
"Description[pt]": "Acesso à linha de comandos",
|
||||
"Description[pt_BR]": "Acesso à linha de comandos",
|
||||
"Description[ro]": "Acces în linie de comandă",
|
||||
"Description[ru]": "Доступ к командной строке",
|
||||
"Description[sa]": "आदेशपङ्क्तिप्रवेशः",
|
||||
"Description[sk]": "Prístup na príkazový riadok",
|
||||
@@ -76,6 +77,7 @@
|
||||
"Name[pl]": "Emulator terminala",
|
||||
"Name[pt]": "Emulador de Terminal",
|
||||
"Name[pt_BR]": "Emulador de terminal",
|
||||
"Name[ro]": "Emulator de terminal",
|
||||
"Name[ru]": "Эмулятор терминала",
|
||||
"Name[sa]": "टर्मिनल एमुलेटर",
|
||||
"Name[sk]": "Emulátor terminálu",
|
||||
|
||||
Reference in New Issue
Block a user