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
6eae1b55d9
commit
d0f4389608
9 changed files with 11 additions and 11 deletions
|
@ -546,7 +546,7 @@ Name[es]=Ping recibido
|
|||
Name[et]=Pingi saamine
|
||||
Name[eu]=Ping jaso da
|
||||
Name[fi]=Saatiin tiedustelupaketti
|
||||
Name[fr]=Ping reçu
|
||||
Name[fr]=Réception du ping
|
||||
Name[gl]=Recibiuse un ping
|
||||
Name[he]=התקבל פינג
|
||||
Name[hu]=Ping érkezett
|
||||
|
@ -597,7 +597,7 @@ Comment[es]=Ping recibido
|
|||
Comment[et]=Pingi saamine
|
||||
Comment[eu]=Ping jaso da
|
||||
Comment[fi]=Saatiin tiedustelupaketti
|
||||
Comment[fr]=Ping reçu
|
||||
Comment[fr]=Réception du ping
|
||||
Comment[gl]=Recibiuse un “ping”.
|
||||
Comment[he]=התקבל פינג
|
||||
Comment[hu]=Ping érkezett
|
||||
|
|
|
@ -15,7 +15,7 @@ Name[es]=SMS de KDE Connect
|
|||
Name[et]=KDE Connecti SMS
|
||||
Name[eu]=KDE Connect SMS
|
||||
Name[fi]=KDE Connectin tekstiviestit
|
||||
Name[fr]=KDE Connect SMS
|
||||
Name[fr]=SMS par KDEConnect
|
||||
Name[gl]=SMS de KDE Connect
|
||||
Name[he]=מסרונים עם KDE Connect
|
||||
Name[hu]=KDE Connect SMS
|
||||
|
|
Loading…
Reference in a new issue