marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +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-06-04 02:34:51 +00:00
parent b700c71eb6
commit bd586b5fc1
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

@ -69,7 +69,7 @@ Description[eo]=Sistemaj politikoj malhelpas vin konservi la agordojn de dato/te
Description[es]=Las políticas del sistema le impiden guardar las preferencias de fecha y hora.
Description[eu]=Sistemako gidalerroek data/ordu ezarpenak gordetzea eragozten dizute.
Description[fi]=Järjestelmäkäytäntö estää sinua tallentamasta aika-asetuksia.
Description[fr]=La politique du système vous empêche d’enregistrer la configuration pour la date et l'heure.
Description[fr]=La politique du système vous empêche d'enregistrer la configuration pour la date et l'heure.
Description[ia]=Le politicas de systema preveni te ex salveguardar le preferentias de tempore/data.
Description[it]=Le politiche del sistema ti impediscono di salvare le impostazioni di data e ora.
Description[ka]=სისტემის წესები გიკრძალავთ დროის/თარიღის პარამეტრების შენახვას.