Germany, Poland's biggest trade partner, has said all financial claims linked to the war had been settled.

Polish Foreign Minister Zbigniew Rau has signed a diplomatic note to Germany concerning reparations for World War Two, he said on Monday, formalising Poland's demand for compensation ahead of a visit by Berlin's top diplomat.

"(The note) expresses the position of the Polish minister of foreign affairs that the parties should take immediate steps to permanently and effectively... settle the issue of the consequences of aggression and German occupation," Mr Rau told a news conference.

Foreign ministry spokesman Lukasz Jasina told reporters that Mr Rau would raise the issue with his German counterpart Annalena Baerbock during her visit to Warsaw on Tuesday.

Some six million Poles, including three million Polish Jews, were killed during the war and Warsaw was razed to the ground following a 1944 uprising in which about 200,000 civilians died.

In 1953, Poland's then-communist rulers relinquished all claims to war reparations under pressure from the Soviet Union, which wanted to free East Germany, also a Soviet satellite, from any liabilities.

Poland's ruling nationalists Law and Justice (PiS) say that agreement is invalid because Poland was unable to negotiate fair compensation.

It has revived calls for compensation since it took power in 2015 and has made the promotion of Poland's wartime victimhood a central plank of its appeal to nationalism.

The ruling Law and Justice (PiS) has repeated calls for compensation several times since it took power in 2015, but Poland was yet to officially demand reparations.

Last month, Jaroslaw Kaczynski, leader of Law and Justice (PiS), estimated losses caused by Germany at 6.2trillion zlotys (£1.2trillion).

He told a news conference: "The sum that was presented was adopted using the most limited, conservative method, it would be possible to increase it."