marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 09:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2023-03-24 02:23:55 +00:00
parent 4d8c79ffd8
commit b9aad6286f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcms/time/clockconfig_actions.actions
View file

@ -16,7 +16,7 @@ Name[nl]=Controlemodule van datum en tijd
Name[nn]=Kontrollmodul for dato og klokkeslett Name[nn]=Kontrollmodul for dato og klokkeslett
Name[pt_BR]=Módulo de controle da data e hora Name[pt_BR]=Módulo de controle da data e hora
Name[sl]=Kontrolni modul datuma in časa Name[sl]=Kontrolni modul datuma in časa
Name[tr]=Tarih ve Saat Denetim Modülü Name[tr]=Tarih ve Zaman Denetim Modülü
Name[uk]=Модуль керування датою і часом Name[uk]=Модуль керування датою і часом
Name[x-test]=xxDate and Time Control Modulexx Name[x-test]=xxDate and Time Control Modulexx
Icon=preferences-system-time Icon=preferences-system-time